Update to Bootstrap v2.2.0
This commit is contained in:
Ben Word
@@ -1,4 +1,5 @@
|
|||||||
### HEAD
|
### HEAD
|
||||||
|
* Update to Bootstrap 2.2.0
|
||||||
* Return instead of echo class names in `roots_main_class` and `roots_sidebar_class`
|
* Return instead of echo class names in `roots_main_class` and `roots_sidebar_class`
|
||||||
* Move nav customizations into `lib/nav.php`
|
* Move nav customizations into `lib/nav.php`
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
.accordion-group {
|
.accordion-group {
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
border: 1px solid #e5e5e5;
|
border: 1px solid #e5e5e5;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
.accordion-heading {
|
.accordion-heading {
|
||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
||||||
background-color: @warningBackground;
|
background-color: @warningBackground;
|
||||||
border: 1px solid @warningBorder;
|
border: 1px solid @warningBorder;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
color: @warningText;
|
color: @warningText;
|
||||||
}
|
}
|
||||||
.alert h4 {
|
.alert h4 {
|
||||||
|
|||||||
3
assets/css/less/bootstrap/bootstrap.less
vendored
3
assets/css/less/bootstrap/bootstrap.less
vendored
@@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Bootstrap v2.1.1
|
* Bootstrap v2.2.0
|
||||||
*
|
*
|
||||||
* Copyright 2012 Twitter, Inc
|
* Copyright 2012 Twitter, Inc
|
||||||
* Licensed under the Apache License v2.0
|
* Licensed under the Apache License v2.0
|
||||||
@@ -52,6 +52,7 @@
|
|||||||
|
|
||||||
// Components: Misc
|
// Components: Misc
|
||||||
@import "thumbnails.less";
|
@import "thumbnails.less";
|
||||||
|
@import "media.less";
|
||||||
@import "labels-badges.less";
|
@import "labels-badges.less";
|
||||||
@import "progress-bars.less";
|
@import "progress-bars.less";
|
||||||
@import "accordion.less";
|
@import "accordion.less";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
margin: 0 0 @baseLineHeight;
|
margin: 0 0 @baseLineHeight;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
li {
|
li {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
.ie7-inline-block();
|
.ie7-inline-block();
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
// Make the div behave like a button
|
// Make the div behave like a button
|
||||||
.btn-group {
|
.btn-group {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
.ie7-inline-block();
|
||||||
font-size: 0; // remove as part 1 of font-size inline-block hack
|
font-size: 0; // remove as part 1 of font-size inline-block hack
|
||||||
vertical-align: middle; // match .btn alignment given font-size hack above
|
vertical-align: middle; // match .btn alignment given font-size hack above
|
||||||
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
|
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
|
||||||
@@ -22,10 +24,6 @@
|
|||||||
font-size: 0; // Hack to remove whitespace that results from using inline-block
|
font-size: 0; // Hack to remove whitespace that results from using inline-block
|
||||||
margin-top: @baseLineHeight / 2;
|
margin-top: @baseLineHeight / 2;
|
||||||
margin-bottom: @baseLineHeight / 2;
|
margin-bottom: @baseLineHeight / 2;
|
||||||
.btn-group {
|
|
||||||
display: inline-block;
|
|
||||||
.ie7-inline-block();
|
|
||||||
}
|
|
||||||
.btn + .btn,
|
.btn + .btn,
|
||||||
.btn-group + .btn,
|
.btn-group + .btn,
|
||||||
.btn + .btn-group {
|
.btn + .btn-group {
|
||||||
@@ -120,7 +118,7 @@
|
|||||||
.btn-group > .btn + .dropdown-toggle {
|
.btn-group > .btn + .dropdown-toggle {
|
||||||
padding-left: 8px;
|
padding-left: 8px;
|
||||||
padding-right: 8px;
|
padding-right: 8px;
|
||||||
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
|
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
|
||||||
*padding-top: 5px;
|
*padding-top: 5px;
|
||||||
*padding-bottom: 5px;
|
*padding-bottom: 5px;
|
||||||
}
|
}
|
||||||
@@ -147,7 +145,7 @@
|
|||||||
// Remove the gradient and set the same inset shadow as the :active state
|
// Remove the gradient and set the same inset shadow as the :active state
|
||||||
.dropdown-toggle {
|
.dropdown-toggle {
|
||||||
background-image: none;
|
background-image: none;
|
||||||
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
|
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keep the hover's background when dropdown is open
|
// Keep the hover's background when dropdown is open
|
||||||
@@ -193,8 +191,7 @@
|
|||||||
}
|
}
|
||||||
// Upside down carets for .dropup
|
// Upside down carets for .dropup
|
||||||
.dropup .btn-large .caret {
|
.dropup .btn-large .caret {
|
||||||
border-bottom: 5px solid @black;
|
border-bottom-width: 5px;
|
||||||
border-top: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
.btn {
|
.btn {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
.ie7-inline-block();
|
.ie7-inline-block();
|
||||||
padding: 4px 14px;
|
padding: 4px 12px;
|
||||||
margin-bottom: 0; // For input.btn
|
margin-bottom: 0; // For input.btn
|
||||||
font-size: @baseFontSize;
|
font-size: @baseFontSize;
|
||||||
line-height: @baseLineHeight;
|
line-height: @baseLineHeight;
|
||||||
@@ -22,9 +22,9 @@
|
|||||||
border: 1px solid @btnBorder;
|
border: 1px solid @btnBorder;
|
||||||
*border: 0; // Remove the border to prevent IE7's black border on input:focus
|
*border: 0; // Remove the border to prevent IE7's black border on input:focus
|
||||||
border-bottom-color: darken(@btnBorder, 10%);
|
border-bottom-color: darken(@btnBorder, 10%);
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
.ie7-restore-left-whitespace(); // Give IE7 some love
|
.ie7-restore-left-whitespace(); // Give IE7 some love
|
||||||
.box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
|
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
|
||||||
|
|
||||||
// Hover state
|
// Hover state
|
||||||
&:hover {
|
&:hover {
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
background-color: darken(@white, 15%) e("\9");
|
background-color: darken(@white, 15%) e("\9");
|
||||||
background-image: none;
|
background-image: none;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
|
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disabled state
|
// Disabled state
|
||||||
@@ -73,30 +73,31 @@
|
|||||||
|
|
||||||
// Large
|
// Large
|
||||||
.btn-large {
|
.btn-large {
|
||||||
padding: 9px 14px;
|
padding: @paddingLarge;
|
||||||
font-size: @baseFontSize + 2px;
|
font-size: @fontSizeLarge;
|
||||||
line-height: normal;
|
.border-radius(@borderRadiusLarge);
|
||||||
.border-radius(5px);
|
|
||||||
}
|
}
|
||||||
.btn-large [class^="icon-"] {
|
.btn-large [class^="icon-"],
|
||||||
|
.btn-large [class*=" icon-"] {
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Small
|
// Small
|
||||||
.btn-small {
|
.btn-small {
|
||||||
padding: 3px 9px;
|
padding: @paddingSmall;
|
||||||
font-size: @baseFontSize - 2px;
|
font-size: @fontSizeSmall;
|
||||||
line-height: @baseLineHeight - 2px;
|
.border-radius(@borderRadiusSmall);
|
||||||
}
|
}
|
||||||
.btn-small [class^="icon-"] {
|
.btn-small [class^="icon-"],
|
||||||
|
.btn-small [class*=" icon-"] {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mini
|
// Mini
|
||||||
.btn-mini {
|
.btn-mini {
|
||||||
padding: 2px 6px;
|
padding: @paddingMini;
|
||||||
font-size: @baseFontSize - 3px;
|
font-size: @fontSizeMini;
|
||||||
line-height: @baseLineHeight - 3px;
|
.border-radius(@borderRadiusSmall);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ pre {
|
|||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
border: 1px solid #ccc; // fallback for IE7-8
|
border: 1px solid #ccc; // fallback for IE7-8
|
||||||
border: 1px solid rgba(0,0,0,.15);
|
border: 1px solid rgba(0,0,0,.15);
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
|
|
||||||
// Make prettyprint styles more spaced out for readability
|
// Make prettyprint styles more spaced out for readability
|
||||||
&.prettyprint {
|
&.prettyprint {
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Links within the dropdown menu
|
// Links within the dropdown menu
|
||||||
a {
|
li > a {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 3px 20px;
|
padding: 3px 20px;
|
||||||
clear: both;
|
clear: both;
|
||||||
@@ -90,7 +90,6 @@
|
|||||||
.dropdown-submenu:hover > a {
|
.dropdown-submenu:hover > a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: @dropdownLinkColorHover;
|
color: @dropdownLinkColorHover;
|
||||||
background-color: @dropdownLinkBackgroundHover;
|
|
||||||
#gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
|
#gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,10 +97,9 @@
|
|||||||
// ------------
|
// ------------
|
||||||
.dropdown-menu .active > a,
|
.dropdown-menu .active > a,
|
||||||
.dropdown-menu .active > a:hover {
|
.dropdown-menu .active > a:hover {
|
||||||
color: @dropdownLinkColorHover;
|
color: @dropdownLinkColorActive;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
background-color: @dropdownLinkBackgroundActive;
|
|
||||||
#gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
|
#gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,6 +114,7 @@
|
|||||||
.dropdown-menu .disabled > a:hover {
|
.dropdown-menu .disabled > a:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
background-image: none; // Remove CSS gradient
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,6 +162,7 @@
|
|||||||
.dropdown-submenu {
|
.dropdown-submenu {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
// Default dropdowns
|
||||||
.dropdown-submenu > .dropdown-menu {
|
.dropdown-submenu > .dropdown-menu {
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 100%;
|
left: 100%;
|
||||||
@@ -176,6 +176,18 @@
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dropups
|
||||||
|
.dropup .dropdown-submenu > .dropdown-menu {
|
||||||
|
top: auto;
|
||||||
|
bottom: 0;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: -2px;
|
||||||
|
-webkit-border-radius: 5px 5px 5px 0;
|
||||||
|
-moz-border-radius: 5px 5px 5px 0;
|
||||||
|
border-radius: 5px 5px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caret to indicate there is a submenu
|
||||||
.dropdown-submenu > a:after {
|
.dropdown-submenu > a:after {
|
||||||
display: block;
|
display: block;
|
||||||
content: " ";
|
content: " ";
|
||||||
@@ -193,6 +205,21 @@
|
|||||||
border-left-color: @dropdownLinkColorHover;
|
border-left-color: @dropdownLinkColorHover;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Left aligned submenus
|
||||||
|
.dropdown-submenu.pull-left {
|
||||||
|
// Undo the float
|
||||||
|
// Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
|
||||||
|
float: none;
|
||||||
|
|
||||||
|
// Positioning the submenu
|
||||||
|
> .dropdown-menu {
|
||||||
|
left: -100%;
|
||||||
|
margin-left: 10px;
|
||||||
|
-webkit-border-radius: 6px 0 6px 6px;
|
||||||
|
-moz-border-radius: 6px 0 6px 6px;
|
||||||
|
border-radius: 6px 0 6px 6px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Tweak nav headers
|
// Tweak nav headers
|
||||||
// -----------------
|
// -----------------
|
||||||
@@ -206,5 +233,5 @@
|
|||||||
// ---------
|
// ---------
|
||||||
.typeahead {
|
.typeahead {
|
||||||
margin-top: 2px; // give it some space to breathe
|
margin-top: 2px; // give it some space to breathe
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,11 +81,12 @@ input[type="color"],
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: @baseLineHeight;
|
height: @baseLineHeight;
|
||||||
padding: 4px 6px;
|
padding: 4px 6px;
|
||||||
margin-bottom: 9px;
|
margin-bottom: @baseLineHeight / 2;
|
||||||
font-size: @baseFontSize;
|
font-size: @baseFontSize;
|
||||||
line-height: @baseLineHeight;
|
line-height: @baseLineHeight;
|
||||||
color: @gray;
|
color: @gray;
|
||||||
.border-radius(@inputBorderRadius);
|
.border-radius(@inputBorderRadius);
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset appearance properties for textual inputs and textarea
|
// Reset appearance properties for textual inputs and textarea
|
||||||
@@ -126,7 +127,7 @@ input[type="color"],
|
|||||||
border-color: rgba(82,168,236,.8);
|
border-color: rgba(82,168,236,.8);
|
||||||
outline: 0;
|
outline: 0;
|
||||||
outline: thin dotted \9; /* IE6-9 */
|
outline: thin dotted \9; /* IE6-9 */
|
||||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
|
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,9 +155,9 @@ input[type="checkbox"] {
|
|||||||
// Set the height of select and file controls to match text inputs
|
// Set the height of select and file controls to match text inputs
|
||||||
select,
|
select,
|
||||||
input[type="file"] {
|
input[type="file"] {
|
||||||
height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
|
height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
|
||||||
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
|
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
|
||||||
line-height: 30px;
|
line-height: @inputHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make select elements obey height by applying a border
|
// Make select elements obey height by applying a border
|
||||||
@@ -210,7 +211,7 @@ input[type="checkbox"]:focus {
|
|||||||
// Placeholder
|
// Placeholder
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
|
||||||
// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
|
// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
|
||||||
input,
|
input,
|
||||||
textarea {
|
textarea {
|
||||||
.placeholder();
|
.placeholder();
|
||||||
@@ -223,13 +224,13 @@ textarea {
|
|||||||
// Indent the labels to position radios/checkboxes as hanging
|
// Indent the labels to position radios/checkboxes as hanging
|
||||||
.radio,
|
.radio,
|
||||||
.checkbox {
|
.checkbox {
|
||||||
min-height: 18px; // clear the floating input if there is no label text
|
min-height: @baseLineHeight; // clear the floating input if there is no label text
|
||||||
padding-left: 18px;
|
padding-left: 20px;
|
||||||
}
|
}
|
||||||
.radio input[type="radio"],
|
.radio input[type="radio"],
|
||||||
.checkbox input[type="checkbox"] {
|
.checkbox input[type="checkbox"] {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: -18px;
|
margin-left: -20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Move the options list down to align with labels
|
// Move the options list down to align with labels
|
||||||
@@ -304,8 +305,17 @@ textarea[class*="span"],
|
|||||||
.controls-row {
|
.controls-row {
|
||||||
.clearfix(); // Clear the float from controls
|
.clearfix(); // Clear the float from controls
|
||||||
}
|
}
|
||||||
.controls-row [class*="span"] {
|
|
||||||
float: left; // Float to collapse white-space for proper grid alignment
|
// Float to collapse white-space for proper grid alignment
|
||||||
|
.controls-row [class*="span"],
|
||||||
|
// Redeclare the fluid grid collapse since we undo the float for inputs
|
||||||
|
.row-fluid .controls-row [class*="span"] {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
// Explicity set top padding on all checkboxes/radios, not just first-child
|
||||||
|
.controls-row .checkbox[class*="span"],
|
||||||
|
.controls-row .radio[class*="span"] {
|
||||||
|
padding-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -364,7 +374,8 @@ select:focus:required:invalid {
|
|||||||
border-color: #ee5f5b;
|
border-color: #ee5f5b;
|
||||||
&:focus {
|
&:focus {
|
||||||
border-color: darken(#ee5f5b, 10%);
|
border-color: darken(#ee5f5b, 10%);
|
||||||
.box-shadow(0 0 6px lighten(#ee5f5b, 20%));
|
@shadow: 0 0 6px lighten(#ee5f5b, 20%);
|
||||||
|
.box-shadow(@shadow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,16 +424,23 @@ select:focus:required:invalid {
|
|||||||
.input-append,
|
.input-append,
|
||||||
.input-prepend {
|
.input-prepend {
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
font-size: 0;
|
font-size: 0; // white space collapse hack
|
||||||
white-space: nowrap; // Prevent span and input from separating
|
white-space: nowrap; // Prevent span and input from separating
|
||||||
|
|
||||||
|
// Reset the white space collapse hack
|
||||||
|
input,
|
||||||
|
select,
|
||||||
|
.uneditable-input,
|
||||||
|
.dropdown-menu {
|
||||||
|
font-size: @baseFontSize;
|
||||||
|
}
|
||||||
|
|
||||||
input,
|
input,
|
||||||
select,
|
select,
|
||||||
.uneditable-input {
|
.uneditable-input {
|
||||||
position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
|
position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
|
||||||
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
|
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
|
||||||
*margin-left: 0;
|
*margin-left: 0;
|
||||||
font-size: @baseFontSize;
|
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||||
// Make input on top when focused so blue border and shadow always show
|
// Make input on top when focused so blue border and shadow always show
|
||||||
@@ -454,6 +472,7 @@ select:focus:required:invalid {
|
|||||||
border-color: @green;
|
border-color: @green;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-prepend {
|
.input-prepend {
|
||||||
.add-on,
|
.add-on,
|
||||||
.btn {
|
.btn {
|
||||||
@@ -461,17 +480,23 @@ select:focus:required:invalid {
|
|||||||
}
|
}
|
||||||
.add-on:first-child,
|
.add-on:first-child,
|
||||||
.btn:first-child {
|
.btn:first-child {
|
||||||
|
// FYI, `.btn:first-child` accounts for a button group that's prepended
|
||||||
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
|
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-append {
|
.input-append {
|
||||||
input,
|
input,
|
||||||
select,
|
select,
|
||||||
.uneditable-input {
|
.uneditable-input {
|
||||||
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
|
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
|
||||||
|
+ .btn-group .btn {
|
||||||
|
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.add-on,
|
.add-on,
|
||||||
.btn {
|
.btn,
|
||||||
|
.btn-group {
|
||||||
margin-left: -1px;
|
margin-left: -1px;
|
||||||
}
|
}
|
||||||
.add-on:last-child,
|
.add-on:last-child,
|
||||||
@@ -479,12 +504,16 @@ select:focus:required:invalid {
|
|||||||
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove all border-radius for inputs with both prepend and append
|
// Remove all border-radius for inputs with both prepend and append
|
||||||
.input-prepend.input-append {
|
.input-prepend.input-append {
|
||||||
input,
|
input,
|
||||||
select,
|
select,
|
||||||
.uneditable-input {
|
.uneditable-input {
|
||||||
.border-radius(0);
|
.border-radius(0);
|
||||||
|
+ .btn-group .btn {
|
||||||
|
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.add-on:first-child,
|
.add-on:first-child,
|
||||||
.btn:first-child {
|
.btn:first-child {
|
||||||
@@ -496,10 +525,14 @@ select:focus:required:invalid {
|
|||||||
margin-left: -1px;
|
margin-left: -1px;
|
||||||
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
|
||||||
}
|
}
|
||||||
|
.btn-group:first-child {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// SEARCH FORM
|
// SEARCH FORM
|
||||||
// -----------
|
// -----------
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,10 @@
|
|||||||
.hero-unit {
|
.hero-unit {
|
||||||
padding: 60px;
|
padding: 60px;
|
||||||
margin-bottom: 30px;
|
margin-bottom: 30px;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 200;
|
||||||
|
line-height: @baseLineHeight * 1.5;
|
||||||
|
color: @heroUnitLeadColor;
|
||||||
background-color: @heroUnitBackground;
|
background-color: @heroUnitBackground;
|
||||||
.border-radius(6px);
|
.border-radius(6px);
|
||||||
h1 {
|
h1 {
|
||||||
@@ -15,10 +19,7 @@
|
|||||||
color: @heroUnitHeadingColor;
|
color: @heroUnitHeadingColor;
|
||||||
letter-spacing: -1px;
|
letter-spacing: -1px;
|
||||||
}
|
}
|
||||||
p {
|
li {
|
||||||
font-size: 18px;
|
line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less
|
||||||
font-weight: 200;
|
|
||||||
line-height: @baseLineHeight * 1.5;
|
|
||||||
color: @heroUnitLeadColor;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
// Base classes
|
// Base classes
|
||||||
.label,
|
.label,
|
||||||
.badge {
|
.badge {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 2px 4px;
|
||||||
font-size: @baseFontSize * .846;
|
font-size: @baseFontSize * .846;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
line-height: 14px; // ensure proper line-height if floated
|
line-height: 14px; // ensure proper line-height if floated
|
||||||
@@ -17,11 +19,11 @@
|
|||||||
}
|
}
|
||||||
// Set unique padding and border-radii
|
// Set unique padding and border-radii
|
||||||
.label {
|
.label {
|
||||||
padding: 1px 4px 2px;
|
|
||||||
.border-radius(3px);
|
.border-radius(3px);
|
||||||
}
|
}
|
||||||
.badge {
|
.badge {
|
||||||
padding: 1px 9px 2px;
|
padding-left: 9px;
|
||||||
|
padding-right: 9px;
|
||||||
.border-radius(9px);
|
.border-radius(9px);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
55
assets/css/less/bootstrap/media.less
Executable file
55
assets/css/less/bootstrap/media.less
Executable file
@@ -0,0 +1,55 @@
|
|||||||
|
// Media objects
|
||||||
|
// Source: http://stubbornella.org/content/?p=497
|
||||||
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
// Common styles
|
||||||
|
// -------------------------
|
||||||
|
|
||||||
|
// Clear the floats
|
||||||
|
.media,
|
||||||
|
.media-body {
|
||||||
|
overflow: hidden;
|
||||||
|
*overflow: visible;
|
||||||
|
zoom: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Proper spacing between instances of .media
|
||||||
|
.media,
|
||||||
|
.media .media {
|
||||||
|
margin-top: 15px;
|
||||||
|
}
|
||||||
|
.media:first-child {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// For images and videos, set to block
|
||||||
|
.media-object {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset margins on headings for tighter default spacing
|
||||||
|
.media-heading {
|
||||||
|
margin: 0 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Media image alignment
|
||||||
|
// -------------------------
|
||||||
|
|
||||||
|
.media .pull-left {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
.media .pull-right {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Media list variation
|
||||||
|
// -------------------------
|
||||||
|
|
||||||
|
// Undo default ul/ol styles
|
||||||
|
.media-list {
|
||||||
|
margin-left: 0;
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
.input-block-level {
|
.input-block-level {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 30px; // Make inputs at least the height of their button counterpart
|
min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
|
||||||
.box-sizing(border-box); // Makes inputs behave like true block-level elements
|
.box-sizing(border-box); // Makes inputs behave like true block-level elements
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,7 +183,8 @@
|
|||||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
|
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
|
||||||
&:focus {
|
&:focus {
|
||||||
border-color: darken(@borderColor, 10%);
|
border-color: darken(@borderColor, 10%);
|
||||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%));
|
@shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
|
||||||
|
.box-shadow(@shadow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Give a small background color for input-prepend/-append
|
// Give a small background color for input-prepend/-append
|
||||||
@@ -248,12 +249,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Drop shadows
|
// Drop shadows
|
||||||
.box-shadow(@shadowA, @shadowB:X, ...){
|
.box-shadow(@shadow) {
|
||||||
// Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/
|
-webkit-box-shadow: @shadow;
|
||||||
@props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`;
|
-moz-box-shadow: @shadow;
|
||||||
-webkit-box-shadow: @props;
|
box-shadow: @shadow;
|
||||||
-moz-box-shadow: @props;
|
|
||||||
box-shadow: @props;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Transitions
|
// Transitions
|
||||||
@@ -298,6 +297,7 @@
|
|||||||
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
|
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
|
||||||
-o-transform: skew(@x, @y);
|
-o-transform: skew(@x, @y);
|
||||||
transform: skew(@x, @y);
|
transform: skew(@x, @y);
|
||||||
|
-webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
|
||||||
}
|
}
|
||||||
.translate3d(@x, @y, @z) {
|
.translate3d(@x, @y, @z) {
|
||||||
-webkit-transform: translate3d(@x, @y, @z);
|
-webkit-transform: translate3d(@x, @y, @z);
|
||||||
@@ -325,7 +325,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Background sizing
|
// Background sizing
|
||||||
.background-size(@size){
|
.background-size(@size) {
|
||||||
-webkit-background-size: @size;
|
-webkit-background-size: @size;
|
||||||
-moz-background-size: @size;
|
-moz-background-size: @size;
|
||||||
-o-background-size: @size;
|
-o-background-size: @size;
|
||||||
@@ -447,7 +447,7 @@
|
|||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
|
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
|
||||||
}
|
}
|
||||||
.radial(@innerColor: #555, @outerColor: #333) {
|
.radial(@innerColor: #555, @outerColor: #333) {
|
||||||
background-color: @outerColor;
|
background-color: @outerColor;
|
||||||
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
|
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
|
||||||
background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
|
background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
|
||||||
@@ -643,6 +643,11 @@
|
|||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Space grid-sized controls properly if multiple per line
|
||||||
|
.controls-row [class*="span"] + [class*="span"] {
|
||||||
|
margin-left: @fluidGridGutterWidth;
|
||||||
|
}
|
||||||
|
|
||||||
// generate .spanX and .offsetX
|
// generate .spanX and .offsetX
|
||||||
.spanX (@gridColumns);
|
.spanX (@gridColumns);
|
||||||
.offsetX (@gridColumns);
|
.offsetX (@gridColumns);
|
||||||
|
|||||||
@@ -2,16 +2,6 @@
|
|||||||
// Modals
|
// Modals
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
// Recalculate z-index where appropriate,
|
|
||||||
// but only apply to elements within modal
|
|
||||||
.modal-open .modal {
|
|
||||||
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
|
|
||||||
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
|
|
||||||
.popover { z-index: @zindexPopover + @zindexModal; }
|
|
||||||
.tooltip { z-index: @zindexTooltip + @zindexModal; }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Background
|
// Background
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@@ -36,7 +26,6 @@
|
|||||||
top: 50%;
|
top: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
z-index: @zindexModal;
|
z-index: @zindexModal;
|
||||||
overflow: auto;
|
|
||||||
width: 560px;
|
width: 560px;
|
||||||
margin: -250px 0 0 -280px;
|
margin: -250px 0 0 -280px;
|
||||||
background-color: @white;
|
background-color: @white;
|
||||||
@@ -46,6 +35,9 @@
|
|||||||
.border-radius(6px);
|
.border-radius(6px);
|
||||||
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
|
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
|
||||||
.background-clip(padding-box);
|
.background-clip(padding-box);
|
||||||
|
// Remove focus outline from opened modal
|
||||||
|
outline: none;
|
||||||
|
|
||||||
&.fade {
|
&.fade {
|
||||||
.transition(e('opacity .3s linear, top .3s ease-out'));
|
.transition(e('opacity .3s linear, top .3s ease-out'));
|
||||||
top: -25%;
|
top: -25%;
|
||||||
@@ -95,4 +87,8 @@
|
|||||||
.btn-group .btn + .btn {
|
.btn-group .btn + .btn {
|
||||||
margin-left: -1px;
|
margin-left: -1px;
|
||||||
}
|
}
|
||||||
|
// and override it for block buttons as well
|
||||||
|
.btn-block + .btn-block {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
|
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
|
||||||
border: 1px solid @navbarBorder;
|
border: 1px solid @navbarBorder;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
.box-shadow(0 1px 4px rgba(0,0,0,.065));
|
.box-shadow(0 1px 4px rgba(0,0,0,.065));
|
||||||
|
|
||||||
// Prevent floats from breaking the navbar
|
// Prevent floats from breaking the navbar
|
||||||
@@ -41,6 +41,7 @@
|
|||||||
// Override the default collapsed state
|
// Override the default collapsed state
|
||||||
.nav-collapse.collapse {
|
.nav-collapse.collapse {
|
||||||
height: auto;
|
height: auto;
|
||||||
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -152,7 +153,6 @@
|
|||||||
|
|
||||||
.navbar-static-top {
|
.navbar-static-top {
|
||||||
position: static;
|
position: static;
|
||||||
width: 100%;
|
|
||||||
margin-bottom: 0; // remove 18px margin for default navbar
|
margin-bottom: 0; // remove 18px margin for default navbar
|
||||||
.navbar-inner {
|
.navbar-inner {
|
||||||
.border-radius(0);
|
.border-radius(0);
|
||||||
@@ -202,7 +202,7 @@
|
|||||||
.navbar-fixed-top,
|
.navbar-fixed-top,
|
||||||
.navbar-static-top {
|
.navbar-static-top {
|
||||||
.navbar-inner {
|
.navbar-inner {
|
||||||
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1));
|
.box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,7 +210,7 @@
|
|||||||
.navbar-fixed-bottom {
|
.navbar-fixed-bottom {
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
.navbar-inner {
|
.navbar-inner {
|
||||||
.box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1));
|
.box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,7 +274,7 @@
|
|||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
.buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
|
.buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
|
||||||
.box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
|
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
|
||||||
}
|
}
|
||||||
.navbar .btn-navbar .icon-bar {
|
.navbar .btn-navbar .icon-bar {
|
||||||
display: block;
|
display: block;
|
||||||
@@ -446,7 +446,7 @@
|
|||||||
color: @white;
|
color: @white;
|
||||||
background-color: @navbarInverseSearchBackground;
|
background-color: @navbarInverseSearchBackground;
|
||||||
border-color: @navbarInverseSearchBorder;
|
border-color: @navbarInverseSearchBorder;
|
||||||
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
|
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
|
||||||
.transition(none);
|
.transition(none);
|
||||||
.placeholder(@navbarInverseSearchPlaceholderColor);
|
.placeholder(@navbarInverseSearchPlaceholderColor);
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,8 @@
|
|||||||
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
|
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
|
||||||
background-color: @linkColor;
|
background-color: @linkColor;
|
||||||
}
|
}
|
||||||
.nav-list [class^="icon-"] {
|
.nav-list [class^="icon-"],
|
||||||
|
.nav-list [class*=" icon-"] {
|
||||||
margin-right: 2px;
|
margin-right: 2px;
|
||||||
}
|
}
|
||||||
// Dividers (basically an hr) within the dropdown
|
// Dividers (basically an hr) within the dropdown
|
||||||
@@ -123,7 +124,7 @@
|
|||||||
.nav-tabs > .active > a,
|
.nav-tabs > .active > a,
|
||||||
.nav-tabs > .active > a:hover {
|
.nav-tabs > .active > a:hover {
|
||||||
color: @gray;
|
color: @gray;
|
||||||
background-color: @white;
|
background-color: @bodyBackground;
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
border-bottom-color: transparent;
|
border-bottom-color: transparent;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|||||||
@@ -12,28 +12,29 @@
|
|||||||
.pager li {
|
.pager li {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
.pager a,
|
.pager li > a,
|
||||||
.pager span {
|
.pager li > span {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding: 5px 14px;
|
padding: 5px 14px;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
.border-radius(15px);
|
.border-radius(15px);
|
||||||
}
|
}
|
||||||
.pager a:hover {
|
.pager li > a:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
}
|
}
|
||||||
.pager .next a,
|
.pager .next > a,
|
||||||
.pager .next span {
|
.pager .next > span {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
.pager .previous a {
|
.pager .previous > a,
|
||||||
|
.pager .previous > span {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
.pager .disabled a,
|
.pager .disabled > a,
|
||||||
.pager .disabled a:hover,
|
.pager .disabled > a:hover,
|
||||||
.pager .disabled span {
|
.pager .disabled > span {
|
||||||
color: @grayLight;
|
color: @grayLight;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|||||||
@@ -2,27 +2,30 @@
|
|||||||
// Pagination (multiple pages)
|
// Pagination (multiple pages)
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
// Space out pagination from surrounding content
|
||||||
.pagination {
|
.pagination {
|
||||||
height: @baseLineHeight * 2;
|
|
||||||
margin: @baseLineHeight 0;
|
margin: @baseLineHeight 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pagination ul {
|
.pagination ul {
|
||||||
|
// Allow for text-based alignment
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
.ie7-inline-block();
|
.ie7-inline-block();
|
||||||
|
// Reset default ul styles
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
.border-radius(3px);
|
// Visuals
|
||||||
|
.border-radius(@baseBorderRadius);
|
||||||
.box-shadow(0 1px 2px rgba(0,0,0,.05));
|
.box-shadow(0 1px 2px rgba(0,0,0,.05));
|
||||||
}
|
}
|
||||||
.pagination ul > li {
|
.pagination ul > li {
|
||||||
display: inline;
|
display: inline; // Remove list-style and block-level defaults
|
||||||
}
|
}
|
||||||
.pagination ul > li > a,
|
.pagination ul > li > a,
|
||||||
.pagination ul > li > span {
|
.pagination ul > li > span {
|
||||||
float: left;
|
float: left; // Collapse white-space
|
||||||
padding: 0 14px;
|
padding: 4px 12px;
|
||||||
line-height: (@baseLineHeight * 2) - 2;
|
line-height: @baseLineHeight;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: @paginationBackground;
|
background-color: @paginationBackground;
|
||||||
border: 1px solid @paginationBorder;
|
border: 1px solid @paginationBorder;
|
||||||
@@ -31,7 +34,7 @@
|
|||||||
.pagination ul > li > a:hover,
|
.pagination ul > li > a:hover,
|
||||||
.pagination ul > .active > a,
|
.pagination ul > .active > a,
|
||||||
.pagination ul > .active > span {
|
.pagination ul > .active > span {
|
||||||
background-color: #f5f5f5;
|
background-color: @paginationActiveBackground;
|
||||||
}
|
}
|
||||||
.pagination ul > .active > a,
|
.pagination ul > .active > a,
|
||||||
.pagination ul > .active > span {
|
.pagination ul > .active > span {
|
||||||
@@ -48,17 +51,71 @@
|
|||||||
.pagination ul > li:first-child > a,
|
.pagination ul > li:first-child > a,
|
||||||
.pagination ul > li:first-child > span {
|
.pagination ul > li:first-child > span {
|
||||||
border-left-width: 1px;
|
border-left-width: 1px;
|
||||||
.border-radius(3px 0 0 3px);
|
.border-left-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
.pagination ul > li:last-child > a,
|
.pagination ul > li:last-child > a,
|
||||||
.pagination ul > li:last-child > span {
|
.pagination ul > li:last-child > span {
|
||||||
.border-radius(0 3px 3px 0);
|
.border-right-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Centered
|
|
||||||
|
// Alignment
|
||||||
|
// --------------------------------------------------
|
||||||
|
|
||||||
.pagination-centered {
|
.pagination-centered {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.pagination-right {
|
.pagination-right {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Sizing
|
||||||
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
// Large
|
||||||
|
.pagination-large {
|
||||||
|
ul > li > a,
|
||||||
|
ul > li > span {
|
||||||
|
padding: @paddingLarge;
|
||||||
|
font-size: @fontSizeLarge;
|
||||||
|
}
|
||||||
|
ul > li:first-child > a,
|
||||||
|
ul > li:first-child > span {
|
||||||
|
.border-left-radius(@borderRadiusLarge);
|
||||||
|
}
|
||||||
|
ul > li:last-child > a,
|
||||||
|
ul > li:last-child > span {
|
||||||
|
.border-right-radius(@borderRadiusLarge);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Small and mini
|
||||||
|
.pagination-mini,
|
||||||
|
.pagination-small {
|
||||||
|
ul > li:first-child > a,
|
||||||
|
ul > li:first-child > span {
|
||||||
|
.border-left-radius(@borderRadiusSmall);
|
||||||
|
}
|
||||||
|
ul > li:last-child > a,
|
||||||
|
ul > li:last-child > span {
|
||||||
|
.border-right-radius(@borderRadiusSmall);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Small
|
||||||
|
.pagination-small {
|
||||||
|
ul > li > a,
|
||||||
|
ul > li > span {
|
||||||
|
padding: @paddingSmall;
|
||||||
|
font-size: @fontSizeSmall;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Mini
|
||||||
|
.pagination-mini {
|
||||||
|
ul > li > a,
|
||||||
|
ul > li > span {
|
||||||
|
padding: @paddingMini;
|
||||||
|
font-size: @fontSizeMini;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -21,10 +21,10 @@
|
|||||||
.box-shadow(0 5px 10px rgba(0,0,0,.2));
|
.box-shadow(0 5px 10px rgba(0,0,0,.2));
|
||||||
|
|
||||||
// Offset the popover to account for the popover arrow
|
// Offset the popover to account for the popover arrow
|
||||||
&.top { margin-bottom: 10px; }
|
&.top { margin-top: -10px; }
|
||||||
&.right { margin-left: 10px; }
|
&.right { margin-left: 10px; }
|
||||||
&.bottom { margin-top: 10px; }
|
&.bottom { margin-top: 10px; }
|
||||||
&.left { margin-right: 10px; }
|
&.left { margin-left: -10px; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
margin-bottom: @baseLineHeight;
|
margin-bottom: @baseLineHeight;
|
||||||
#gradient > .vertical(#f5f5f5, #f9f9f9);
|
#gradient > .vertical(#f5f5f5, #f9f9f9);
|
||||||
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bar of progress
|
// Bar of progress
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
.transition(width .6s ease);
|
.transition(width .6s ease);
|
||||||
}
|
}
|
||||||
.progress .bar + .bar {
|
.progress .bar + .bar {
|
||||||
.box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
|
.box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Striped bars
|
// Striped bars
|
||||||
|
|||||||
@@ -88,7 +88,8 @@ img {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Prevent max-width from affecting Google Maps
|
// Prevent max-width from affecting Google Maps
|
||||||
#map_canvas img {
|
#map_canvas img,
|
||||||
|
.google-maps img {
|
||||||
max-width: none;
|
max-width: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
|
|||||||
border: 0;
|
border: 0;
|
||||||
}
|
}
|
||||||
button,
|
button,
|
||||||
input[type="button"],
|
html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
|
||||||
input[type="reset"],
|
input[type="reset"],
|
||||||
input[type="submit"] {
|
input[type="submit"] {
|
||||||
cursor: pointer; // Cursors on all buttons applied consistently
|
-webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
|
||||||
-webkit-appearance: button; // Style clickable inputs in iOS
|
cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
|
||||||
}
|
}
|
||||||
input[type="search"] { // Appearance in Safari/Chrome
|
input[type="search"] { // Appearance in Safari/Chrome
|
||||||
-webkit-box-sizing: content-box;
|
-webkit-box-sizing: content-box;
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
}
|
}
|
||||||
// Make all grid-sized elements block level again
|
// Make all grid-sized elements block level again
|
||||||
[class*="span"],
|
[class*="span"],
|
||||||
|
.uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
|
||||||
.row-fluid [class*="span"] {
|
.row-fluid [class*="span"] {
|
||||||
float: none;
|
float: none;
|
||||||
display: block;
|
display: block;
|
||||||
@@ -70,6 +71,9 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
.box-sizing(border-box);
|
.box-sizing(border-box);
|
||||||
}
|
}
|
||||||
|
.row-fluid [class*="offset"]:first-child {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
// FORM FIELDS
|
// FORM FIELDS
|
||||||
// -----------
|
// -----------
|
||||||
@@ -103,7 +107,8 @@
|
|||||||
right: 20px;
|
right: 20px;
|
||||||
width: auto;
|
width: auto;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
&.fade.in { top: auto; }
|
&.fade { top: -100px; }
|
||||||
|
&.fade.in { top: 20px; }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -155,6 +160,20 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Medias
|
||||||
|
// Reset float and spacing to stack
|
||||||
|
.media .pull-left,
|
||||||
|
.media .pull-right {
|
||||||
|
float: none;
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
// Remove side margins since we stack instead of indent
|
||||||
|
.media-object {
|
||||||
|
margin-right: 0;
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Modals
|
// Modals
|
||||||
.modal {
|
.modal {
|
||||||
top: 10px;
|
top: 10px;
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
.nav-collapse .btn {
|
.nav-collapse .btn {
|
||||||
padding: 4px 10px 4px;
|
padding: 4px 10px 4px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
.nav-collapse .dropdown-menu li + li a {
|
.nav-collapse .dropdown-menu li + li a {
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
@@ -84,6 +84,10 @@
|
|||||||
.nav-collapse .dropdown-menu a:hover {
|
.nav-collapse .dropdown-menu a:hover {
|
||||||
background-color: @navbarBackground;
|
background-color: @navbarBackground;
|
||||||
}
|
}
|
||||||
|
.navbar-inverse .nav-collapse .nav > li > a,
|
||||||
|
.navbar-inverse .nav-collapse .dropdown-menu a {
|
||||||
|
color: @navbarInverseLinkColor;
|
||||||
|
}
|
||||||
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
||||||
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
|
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
|
||||||
background-color: @navbarInverseBackground;
|
background-color: @navbarInverseBackground;
|
||||||
@@ -99,7 +103,7 @@
|
|||||||
top: auto;
|
top: auto;
|
||||||
left: auto;
|
left: auto;
|
||||||
float: none;
|
float: none;
|
||||||
display: block;
|
display: none;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
margin: 0 15px;
|
margin: 0 15px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
@@ -108,6 +112,10 @@
|
|||||||
.border-radius(0);
|
.border-radius(0);
|
||||||
.box-shadow(none);
|
.box-shadow(none);
|
||||||
}
|
}
|
||||||
|
.nav-collapse .open > .dropdown-menu {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
.nav-collapse .dropdown-menu:before,
|
.nav-collapse .dropdown-menu:before,
|
||||||
.nav-collapse .dropdown-menu:after {
|
.nav-collapse .dropdown-menu:after {
|
||||||
display: none;
|
display: none;
|
||||||
@@ -129,7 +137,7 @@
|
|||||||
margin: (@baseLineHeight / 2) 0;
|
margin: (@baseLineHeight / 2) 0;
|
||||||
border-top: 1px solid @navbarBackground;
|
border-top: 1px solid @navbarBackground;
|
||||||
border-bottom: 1px solid @navbarBackground;
|
border-bottom: 1px solid @navbarBackground;
|
||||||
.box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
|
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
|
||||||
}
|
}
|
||||||
.navbar-inverse .nav-collapse .navbar-form,
|
.navbar-inverse .nav-collapse .navbar-form,
|
||||||
.navbar-inverse .nav-collapse .navbar-search {
|
.navbar-inverse .nav-collapse .navbar-search {
|
||||||
@@ -166,7 +174,7 @@
|
|||||||
// DEFAULT DESKTOP
|
// DEFAULT DESKTOP
|
||||||
// ---------------
|
// ---------------
|
||||||
|
|
||||||
@media (min-width: 980px) {
|
@media (min-width: @navbarCollapseDesktopWidth) {
|
||||||
|
|
||||||
// Required to make the collapsing navbar work on regular desktops
|
// Required to make the collapsing navbar work on regular desktops
|
||||||
.nav-collapse.collapse {
|
.nav-collapse.collapse {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Bootstrap Responsive v2.1.1
|
* Bootstrap Responsive v2.2.0
|
||||||
*
|
*
|
||||||
* Copyright 2012 Twitter, Inc
|
* Copyright 2012 Twitter, Inc
|
||||||
* Licensed under the Apache License v2.0
|
* Licensed under the Apache License v2.0
|
||||||
|
|||||||
@@ -30,8 +30,6 @@
|
|||||||
|
|
||||||
/* White icons with optional class, or on hover/active states of certain elements */
|
/* White icons with optional class, or on hover/active states of certain elements */
|
||||||
.icon-white,
|
.icon-white,
|
||||||
.nav-tabs > .active > a > [class^="icon-"],
|
|
||||||
.nav-tabs > .active > a > [class*=" icon-"],
|
|
||||||
.nav-pills > .active > a > [class^="icon-"],
|
.nav-pills > .active > a > [class^="icon-"],
|
||||||
.nav-pills > .active > a > [class*=" icon-"],
|
.nav-pills > .active > a > [class*=" icon-"],
|
||||||
.nav-list > .active > a > [class^="icon-"],
|
.nav-list > .active > a > [class^="icon-"],
|
||||||
@@ -41,7 +39,9 @@
|
|||||||
.dropdown-menu > li > a:hover > [class^="icon-"],
|
.dropdown-menu > li > a:hover > [class^="icon-"],
|
||||||
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
||||||
.dropdown-menu > .active > a > [class^="icon-"],
|
.dropdown-menu > .active > a > [class^="icon-"],
|
||||||
.dropdown-menu > .active > a > [class*=" icon-"] {
|
.dropdown-menu > .active > a > [class*=" icon-"],
|
||||||
|
.dropdown-submenu:hover > a > [class^="icon-"],
|
||||||
|
.dropdown-submenu:hover > a > [class*=" icon-"] {
|
||||||
background-image: url("@{iconWhiteSpritePath}");
|
background-image: url("@{iconWhiteSpritePath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ table {
|
|||||||
border-collapse: separate; // Done so we can round those corners!
|
border-collapse: separate; // Done so we can round those corners!
|
||||||
*border-collapse: collapse; // IE7 can't round corners anyway
|
*border-collapse: collapse; // IE7 can't round corners anyway
|
||||||
border-left: 0;
|
border-left: 0;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
th,
|
th,
|
||||||
td {
|
td {
|
||||||
border-left: 1px solid @tableBorder;
|
border-left: 1px solid @tableBorder;
|
||||||
@@ -133,7 +133,7 @@ table {
|
|||||||
colgroup + tbody tr:first-child td:last-child {
|
colgroup + tbody tr:first-child td:last-child {
|
||||||
-webkit-border-top-right-radius: 4px;
|
-webkit-border-top-right-radius: 4px;
|
||||||
border-top-right-radius: 4px;
|
border-top-right-radius: 4px;
|
||||||
-moz-border-radius-topleft: 4px;
|
-moz-border-radius-topright: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -172,39 +172,30 @@ table {
|
|||||||
// -----------------
|
// -----------------
|
||||||
|
|
||||||
// Reset default grid behavior
|
// Reset default grid behavior
|
||||||
table [class*=span],
|
table td[class*="span"],
|
||||||
.row-fluid table [class*=span] {
|
table th[class*="span"],
|
||||||
|
.row-fluid table td[class*="span"],
|
||||||
|
.row-fluid table th[class*="span"] {
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
float: none; // undo default grid column styles
|
float: none; // undo default grid column styles
|
||||||
margin-left: 0; // undo default grid column styles
|
margin-left: 0; // undo default grid column styles
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change the column widths to account for td/th padding
|
// Change the column widths to account for td/th padding
|
||||||
.table {
|
.table td,
|
||||||
.span1 { .tableColumns(1); }
|
.table th {
|
||||||
.span2 { .tableColumns(2); }
|
&.span1 { .tableColumns(1); }
|
||||||
.span3 { .tableColumns(3); }
|
&.span2 { .tableColumns(2); }
|
||||||
.span4 { .tableColumns(4); }
|
&.span3 { .tableColumns(3); }
|
||||||
.span5 { .tableColumns(5); }
|
&.span4 { .tableColumns(4); }
|
||||||
.span6 { .tableColumns(6); }
|
&.span5 { .tableColumns(5); }
|
||||||
.span7 { .tableColumns(7); }
|
&.span6 { .tableColumns(6); }
|
||||||
.span8 { .tableColumns(8); }
|
&.span7 { .tableColumns(7); }
|
||||||
.span9 { .tableColumns(9); }
|
&.span8 { .tableColumns(8); }
|
||||||
.span10 { .tableColumns(10); }
|
&.span9 { .tableColumns(9); }
|
||||||
.span11 { .tableColumns(11); }
|
&.span10 { .tableColumns(10); }
|
||||||
.span12 { .tableColumns(12); }
|
&.span11 { .tableColumns(11); }
|
||||||
.span13 { .tableColumns(13); }
|
&.span12 { .tableColumns(12); }
|
||||||
.span14 { .tableColumns(14); }
|
|
||||||
.span15 { .tableColumns(15); }
|
|
||||||
.span16 { .tableColumns(16); }
|
|
||||||
.span17 { .tableColumns(17); }
|
|
||||||
.span18 { .tableColumns(18); }
|
|
||||||
.span19 { .tableColumns(19); }
|
|
||||||
.span20 { .tableColumns(20); }
|
|
||||||
.span21 { .tableColumns(21); }
|
|
||||||
.span22 { .tableColumns(22); }
|
|
||||||
.span23 { .tableColumns(23); }
|
|
||||||
.span24 { .tableColumns(24); }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
padding: 4px;
|
padding: 4px;
|
||||||
line-height: @baseLineHeight;
|
line-height: @baseLineHeight;
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
.box-shadow(0 1px 3px rgba(0,0,0,.055));
|
.box-shadow(0 1px 3px rgba(0,0,0,.055));
|
||||||
.transition(all .2s ease-in-out);
|
.transition(all .2s ease-in-out);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: @tooltipBackground;
|
background-color: @tooltipBackground;
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Arrows
|
// Arrows
|
||||||
|
|||||||
@@ -37,18 +37,17 @@ cite {
|
|||||||
.muted {
|
.muted {
|
||||||
color: @grayLight;
|
color: @grayLight;
|
||||||
}
|
}
|
||||||
.text-warning {
|
.text-warning { color: @warningText; }
|
||||||
color: @warningText;
|
a.text-warning:hover { color: darken(@warningText, 10%); }
|
||||||
}
|
|
||||||
.text-error {
|
.text-error { color: @errorText; }
|
||||||
color: @errorText;
|
a.text-error:hover { color: darken(@errorText, 10%); }
|
||||||
}
|
|
||||||
.text-info {
|
.text-info { color: @infoText; }
|
||||||
color: @infoText;
|
a.text-info:hover { color: darken(@infoText, 10%); }
|
||||||
}
|
|
||||||
.text-success {
|
.text-success { color: @successText; }
|
||||||
color: @successText;
|
a.text-success:hover { color: darken(@successText, 10%); }
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Headings
|
// Headings
|
||||||
@@ -58,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
|
|||||||
margin: (@baseLineHeight / 2) 0;
|
margin: (@baseLineHeight / 2) 0;
|
||||||
font-family: @headingsFontFamily;
|
font-family: @headingsFontFamily;
|
||||||
font-weight: @headingsFontWeight;
|
font-weight: @headingsFontWeight;
|
||||||
line-height: 1;
|
line-height: @baseLineHeight;
|
||||||
color: @headingsColor;
|
color: @headingsColor;
|
||||||
text-rendering: optimizelegibility; // Fix the character spacing for headings
|
text-rendering: optimizelegibility; // Fix the character spacing for headings
|
||||||
small {
|
small {
|
||||||
@@ -67,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
|
|||||||
color: @grayLight;
|
color: @grayLight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
h1 { font-size: 36px; line-height: 40px; }
|
|
||||||
h2 { font-size: 30px; line-height: 40px; }
|
|
||||||
h3 { font-size: 24px; line-height: 40px; }
|
|
||||||
h4 { font-size: 18px; line-height: 20px; }
|
|
||||||
h5 { font-size: 14px; line-height: 20px; }
|
|
||||||
h6 { font-size: 12px; line-height: 20px; }
|
|
||||||
|
|
||||||
h1 small { font-size: 24px; }
|
h1,
|
||||||
h2 small { font-size: 18px; }
|
h2,
|
||||||
h3 small { font-size: 14px; }
|
h3 { line-height: @baseLineHeight * 2; }
|
||||||
h4 small { font-size: 14px; }
|
|
||||||
|
h1 { font-size: @baseFontSize * 2.75; } // ~38px
|
||||||
|
h2 { font-size: @baseFontSize * 2.25; } // ~32px
|
||||||
|
h3 { font-size: @baseFontSize * 1.75; } // ~24px
|
||||||
|
h4 { font-size: @baseFontSize * 1.25; } // ~18px
|
||||||
|
h5 { font-size: @baseFontSize; }
|
||||||
|
h6 { font-size: @baseFontSize * 0.85; } // ~12px
|
||||||
|
|
||||||
|
h1 small { font-size: @baseFontSize * 1.75; } // ~24px
|
||||||
|
h2 small { font-size: @baseFontSize * 1.25; } // ~18px
|
||||||
|
h3 small { font-size: @baseFontSize; }
|
||||||
|
h4 small { font-size: @baseFontSize; }
|
||||||
|
|
||||||
|
|
||||||
// Page header
|
// Page header
|
||||||
@@ -155,7 +159,9 @@ hr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Abbreviations and acronyms
|
// Abbreviations and acronyms
|
||||||
abbr[title] {
|
abbr[title],
|
||||||
|
// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
|
||||||
|
abbr[data-original-title] {
|
||||||
cursor: help;
|
cursor: help;
|
||||||
border-bottom: 1px dotted @grayLight;
|
border-bottom: 1px dotted @grayLight;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,24 @@
|
|||||||
@headingsFontWeight: bold; // instead of browser default, bold
|
@headingsFontWeight: bold; // instead of browser default, bold
|
||||||
@headingsColor: inherit; // empty to use BS default, @textColor
|
@headingsColor: inherit; // empty to use BS default, @textColor
|
||||||
|
|
||||||
|
|
||||||
|
// Component sizing
|
||||||
|
// -------------------------
|
||||||
|
// Based on 14px font-size and 20px line-height
|
||||||
|
|
||||||
|
@fontSizeLarge: @baseFontSize * 1.25; // ~18px
|
||||||
|
@fontSizeSmall: @baseFontSize * 0.85; // ~12px
|
||||||
|
@fontSizeMini: @baseFontSize * 0.75; // ~11px
|
||||||
|
|
||||||
|
@paddingLarge: 11px 19px; // 44px
|
||||||
|
@paddingSmall: 2px 10px; // 26px
|
||||||
|
@paddingMini: 1px 6px; // 24px
|
||||||
|
|
||||||
|
@baseBorderRadius: 4px;
|
||||||
|
@borderRadiusLarge: 6px;
|
||||||
|
@borderRadiusSmall: 3px;
|
||||||
|
|
||||||
|
|
||||||
// Tables
|
// Tables
|
||||||
// -------------------------
|
// -------------------------
|
||||||
@tableBackground: transparent; // overall background-color
|
@tableBackground: transparent; // overall background-color
|
||||||
@@ -93,9 +111,11 @@
|
|||||||
// -------------------------
|
// -------------------------
|
||||||
@inputBackground: @white;
|
@inputBackground: @white;
|
||||||
@inputBorder: #ccc;
|
@inputBorder: #ccc;
|
||||||
@inputBorderRadius: 3px;
|
@inputBorderRadius: @baseBorderRadius;
|
||||||
@inputDisabledBackground: @grayLighter;
|
@inputDisabledBackground: @grayLighter;
|
||||||
@formActionsBackground: #f5f5f5;
|
@formActionsBackground: #f5f5f5;
|
||||||
|
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
|
||||||
|
|
||||||
|
|
||||||
// Dropdowns
|
// Dropdowns
|
||||||
// -------------------------
|
// -------------------------
|
||||||
@@ -116,6 +136,7 @@
|
|||||||
// COMPONENT VARIABLES
|
// COMPONENT VARIABLES
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
// Z-index master list
|
// Z-index master list
|
||||||
// -------------------------
|
// -------------------------
|
||||||
// Used for a bird's eye view of components dependent on the z-axis
|
// Used for a bird's eye view of components dependent on the z-axis
|
||||||
@@ -157,6 +178,7 @@
|
|||||||
// Navbar
|
// Navbar
|
||||||
// -------------------------
|
// -------------------------
|
||||||
@navbarCollapseWidth: 979px;
|
@navbarCollapseWidth: 979px;
|
||||||
|
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
|
||||||
|
|
||||||
@navbarHeight: 40px;
|
@navbarHeight: 40px;
|
||||||
@navbarBackgroundHighlight: #ffffff;
|
@navbarBackgroundHighlight: #ffffff;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
background-color: @wellBackground;
|
background-color: @wellBackground;
|
||||||
border: 1px solid darken(@wellBackground, 7%);
|
border: 1px solid darken(@wellBackground, 7%);
|
||||||
.border-radius(4px);
|
.border-radius(@baseBorderRadius);
|
||||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
|
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
|
||||||
blockquote {
|
blockquote {
|
||||||
border-color: #ddd;
|
border-color: #ddd;
|
||||||
@@ -21,9 +21,9 @@
|
|||||||
// Sizes
|
// Sizes
|
||||||
.well-large {
|
.well-large {
|
||||||
padding: 24px;
|
padding: 24px;
|
||||||
.border-radius(6px);
|
.border-radius(@borderRadiusLarge);
|
||||||
}
|
}
|
||||||
.well-small {
|
.well-small {
|
||||||
padding: 9px;
|
padding: 9px;
|
||||||
.border-radius(3px);
|
.border-radius(@borderRadiusSmall);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
8
assets/css/main.min.css
vendored
8
assets/css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-affix.js v2.1.1
|
* bootstrap-affix.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#affix
|
* http://twitter.github.com/bootstrap/javascript.html#affix
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -28,7 +28,9 @@
|
|||||||
|
|
||||||
var Affix = function (element, options) {
|
var Affix = function (element, options) {
|
||||||
this.options = $.extend({}, $.fn.affix.defaults, options)
|
this.options = $.extend({}, $.fn.affix.defaults, options)
|
||||||
this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
|
this.$window = $(window)
|
||||||
|
.on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
|
||||||
|
.on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
|
||||||
this.$element = $(element)
|
this.$element = $(element)
|
||||||
this.checkPosition()
|
this.checkPosition()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-alert.js v2.1.1
|
* bootstrap-alert.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -83,8 +83,6 @@
|
|||||||
/* ALERT DATA-API
|
/* ALERT DATA-API
|
||||||
* ============== */
|
* ============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
12
assets/js/plugins/bootstrap/bootstrap-button.js
vendored
12
assets/js/plugins/bootstrap/bootstrap-button.js
vendored
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-button.js v2.1.1
|
* bootstrap-button.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -85,12 +85,10 @@
|
|||||||
/* BUTTON DATA-API
|
/* BUTTON DATA-API
|
||||||
* =============== */
|
* =============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
|
||||||
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
|
var $btn = $(e.target)
|
||||||
var $btn = $(e.target)
|
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
|
||||||
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
|
$btn.button('toggle')
|
||||||
$btn.button('toggle')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-carousel.js v2.1.1
|
* bootstrap-carousel.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -94,9 +94,7 @@
|
|||||||
, direction = type == 'next' ? 'left' : 'right'
|
, direction = type == 'next' ? 'left' : 'right'
|
||||||
, fallback = type == 'next' ? 'first' : 'last'
|
, fallback = type == 'next' ? 'first' : 'last'
|
||||||
, that = this
|
, that = this
|
||||||
, e = $.Event('slide', {
|
, e
|
||||||
relatedTarget: $next[0]
|
|
||||||
})
|
|
||||||
|
|
||||||
this.sliding = true
|
this.sliding = true
|
||||||
|
|
||||||
@@ -104,6 +102,10 @@
|
|||||||
|
|
||||||
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
|
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
|
||||||
|
|
||||||
|
e = $.Event('slide', {
|
||||||
|
relatedTarget: $next[0]
|
||||||
|
})
|
||||||
|
|
||||||
if ($next.hasClass('active')) return
|
if ($next.hasClass('active')) return
|
||||||
|
|
||||||
if ($.support.transition && this.$element.hasClass('slide')) {
|
if ($.support.transition && this.$element.hasClass('slide')) {
|
||||||
@@ -163,14 +165,12 @@
|
|||||||
/* CAROUSEL DATA-API
|
/* CAROUSEL DATA-API
|
||||||
* ================= */
|
* ================= */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||||
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
|
var $this = $(this), href
|
||||||
var $this = $(this), href
|
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
|
||||||
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
|
$target.carousel(options)
|
||||||
$target.carousel(options)
|
e.preventDefault()
|
||||||
e.preventDefault()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-collapse.js v2.1.1
|
* bootstrap-collapse.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -143,16 +143,14 @@
|
|||||||
/* COLLAPSIBLE DATA-API
|
/* COLLAPSIBLE DATA-API
|
||||||
* ==================== */
|
* ==================== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
|
||||||
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
|
var $this = $(this), href
|
||||||
var $this = $(this), href
|
, target = $this.attr('data-target')
|
||||||
, target = $this.attr('data-target')
|
|| e.preventDefault()
|
||||||
|| e.preventDefault()
|
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
||||||
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
, option = $(target).data('collapse') ? 'toggle' : $this.data()
|
||||||
, option = $(target).data('collapse') ? 'toggle' : $this.data()
|
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
|
||||||
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
|
$(target).collapse(option)
|
||||||
$(target).collapse(option)
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-dropdown.js v2.1.1
|
* bootstrap-dropdown.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -100,8 +100,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearMenus() {
|
function clearMenus() {
|
||||||
getParent($(toggle))
|
$(toggle).each(function () {
|
||||||
.removeClass('open')
|
getParent($(this)).removeClass('open')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function getParent($this) {
|
function getParent($this) {
|
||||||
@@ -138,13 +139,10 @@
|
|||||||
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
||||||
* =================================== */
|
* =================================== */
|
||||||
|
|
||||||
$(function () {
|
$(document)
|
||||||
$('html')
|
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
|
||||||
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
|
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
||||||
$('body')
|
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
||||||
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||||
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
|
||||||
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
45
assets/js/plugins/bootstrap/bootstrap-modal.js
vendored
45
assets/js/plugins/bootstrap/bootstrap-modal.js
vendored
@@ -1,5 +1,5 @@
|
|||||||
/* =========================================================
|
/* =========================================================
|
||||||
* bootstrap-modal.js v2.1.1
|
* bootstrap-modal.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#modals
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
||||||
* =========================================================
|
* =========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -49,8 +49,6 @@
|
|||||||
|
|
||||||
if (this.isShown || e.isDefaultPrevented()) return
|
if (this.isShown || e.isDefaultPrevented()) return
|
||||||
|
|
||||||
$('body').addClass('modal-open')
|
|
||||||
|
|
||||||
this.isShown = true
|
this.isShown = true
|
||||||
|
|
||||||
this.escape()
|
this.escape()
|
||||||
@@ -72,13 +70,12 @@
|
|||||||
that.$element
|
that.$element
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
.attr('aria-hidden', false)
|
.attr('aria-hidden', false)
|
||||||
.focus()
|
|
||||||
|
|
||||||
that.enforceFocus()
|
that.enforceFocus()
|
||||||
|
|
||||||
transition ?
|
transition ?
|
||||||
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
|
that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
|
||||||
that.$element.trigger('shown')
|
that.$element.focus().trigger('shown')
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -96,8 +93,6 @@
|
|||||||
|
|
||||||
this.isShown = false
|
this.isShown = false
|
||||||
|
|
||||||
$('body').removeClass('modal-open')
|
|
||||||
|
|
||||||
this.escape()
|
this.escape()
|
||||||
|
|
||||||
$(document).off('focusin.modal')
|
$(document).off('focusin.modal')
|
||||||
@@ -167,9 +162,11 @@
|
|||||||
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
||||||
.appendTo(document.body)
|
.appendTo(document.body)
|
||||||
|
|
||||||
if (this.options.backdrop != 'static') {
|
this.$backdrop.click(
|
||||||
this.$backdrop.click($.proxy(this.hide, this))
|
this.options.backdrop == 'static' ?
|
||||||
}
|
$.proxy(this.$element[0].focus, this.$element[0])
|
||||||
|
: $.proxy(this.hide, this)
|
||||||
|
)
|
||||||
|
|
||||||
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
||||||
|
|
||||||
@@ -219,21 +216,19 @@
|
|||||||
/* MODAL DATA-API
|
/* MODAL DATA-API
|
||||||
* ============== */
|
* ============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
|
||||||
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
|
var $this = $(this)
|
||||||
var $this = $(this)
|
, href = $this.attr('href')
|
||||||
, href = $this.attr('href')
|
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
||||||
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
, option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
|
||||||
, option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
|
|
||||||
|
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
$target
|
$target
|
||||||
.modal(option)
|
.modal(option)
|
||||||
.one('hide', function () {
|
.one('hide', function () {
|
||||||
$this.focus()
|
$this.focus()
|
||||||
})
|
})
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-popover.js v2.1.1
|
* bootstrap-popover.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-scrollspy.js v2.1.1
|
* bootstrap-scrollspy.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
|||||||
12
assets/js/plugins/bootstrap/bootstrap-tab.js
vendored
12
assets/js/plugins/bootstrap/bootstrap-tab.js
vendored
@@ -1,5 +1,5 @@
|
|||||||
/* ========================================================
|
/* ========================================================
|
||||||
* bootstrap-tab.js v2.1.1
|
* bootstrap-tab.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
||||||
* ========================================================
|
* ========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
if ( $this.parent('li').hasClass('active') ) return
|
if ( $this.parent('li').hasClass('active') ) return
|
||||||
|
|
||||||
previous = $ul.find('.active a').last()[0]
|
previous = $ul.find('.active:last a')[0]
|
||||||
|
|
||||||
e = $.Event('show', {
|
e = $.Event('show', {
|
||||||
relatedTarget: previous
|
relatedTarget: previous
|
||||||
@@ -125,11 +125,9 @@
|
|||||||
/* TAB DATA-API
|
/* TAB DATA-API
|
||||||
* ============ */
|
* ============ */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
||||||
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
e.preventDefault()
|
||||||
e.preventDefault()
|
$(this).tab('show')
|
||||||
$(this).tab('show')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
23
assets/js/plugins/bootstrap/bootstrap-tooltip.js
vendored
23
assets/js/plugins/bootstrap/bootstrap-tooltip.js
vendored
@@ -1,5 +1,5 @@
|
|||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-tooltip.js v2.1.1
|
* bootstrap-tooltip.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
@@ -119,9 +119,9 @@
|
|||||||
inside = /in/.test(placement)
|
inside = /in/.test(placement)
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.remove()
|
.detach()
|
||||||
.css({ top: 0, left: 0, display: 'block' })
|
.css({ top: 0, left: 0, display: 'block' })
|
||||||
.appendTo(inside ? this.$element : document.body)
|
.insertAfter(this.$element)
|
||||||
|
|
||||||
pos = this.getPosition(inside)
|
pos = this.getPosition(inside)
|
||||||
|
|
||||||
@@ -144,7 +144,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.css(tp)
|
.offset(tp)
|
||||||
.addClass(placement)
|
.addClass(placement)
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
}
|
}
|
||||||
@@ -166,18 +166,18 @@
|
|||||||
|
|
||||||
function removeWithAnimation() {
|
function removeWithAnimation() {
|
||||||
var timeout = setTimeout(function () {
|
var timeout = setTimeout(function () {
|
||||||
$tip.off($.support.transition.end).remove()
|
$tip.off($.support.transition.end).detach()
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|
||||||
$tip.one($.support.transition.end, function () {
|
$tip.one($.support.transition.end, function () {
|
||||||
clearTimeout(timeout)
|
clearTimeout(timeout)
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && this.$tip.hasClass('fade') ?
|
$.support.transition && this.$tip.hasClass('fade') ?
|
||||||
removeWithAnimation() :
|
removeWithAnimation() :
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
@@ -235,8 +235,9 @@
|
|||||||
this.enabled = !this.enabled
|
this.enabled = !this.enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
, toggle: function () {
|
, toggle: function (e) {
|
||||||
this[this.tip().hasClass('in') ? 'hide' : 'show']()
|
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
|
||||||
|
self[self.tip().hasClass('in') ? 'hide' : 'show']()
|
||||||
}
|
}
|
||||||
|
|
||||||
, destroy: function () {
|
, destroy: function () {
|
||||||
@@ -269,7 +270,7 @@
|
|||||||
, trigger: 'hover'
|
, trigger: 'hover'
|
||||||
, title: ''
|
, title: ''
|
||||||
, delay: 0
|
, delay: 0
|
||||||
, html: true
|
, html: false
|
||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.1.1
|
* bootstrap-transition.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -20,14 +20,14 @@
|
|||||||
|
|
||||||
!function ($) {
|
!function ($) {
|
||||||
|
|
||||||
|
"use strict"; // jshint ;_;
|
||||||
|
|
||||||
|
|
||||||
|
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
|
||||||
|
* ======================================================= */
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
"use strict"; // jshint ;_;
|
|
||||||
|
|
||||||
|
|
||||||
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
|
|
||||||
* ======================================================= */
|
|
||||||
|
|
||||||
$.support.transition = (function () {
|
$.support.transition = (function () {
|
||||||
|
|
||||||
var transitionEnd = (function () {
|
var transitionEnd = (function () {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-typeahead.js v2.1.1
|
* bootstrap-typeahead.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
.on('keypress', $.proxy(this.keypress, this))
|
.on('keypress', $.proxy(this.keypress, this))
|
||||||
.on('keyup', $.proxy(this.keyup, this))
|
.on('keyup', $.proxy(this.keyup, this))
|
||||||
|
|
||||||
if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
|
if (this.eventSupported('keydown')) {
|
||||||
this.$element.on('keydown', $.proxy(this.keydown, this))
|
this.$element.on('keydown', $.proxy(this.keydown, this))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,6 +183,15 @@
|
|||||||
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
|
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
, eventSupported: function(eventName) {
|
||||||
|
var isSupported = eventName in this.$element
|
||||||
|
if (!isSupported) {
|
||||||
|
this.$element.setAttribute(eventName, 'return;')
|
||||||
|
isSupported = typeof this.$element[eventName] === 'function'
|
||||||
|
}
|
||||||
|
return isSupported
|
||||||
|
}
|
||||||
|
|
||||||
, move: function (e) {
|
, move: function (e) {
|
||||||
if (!this.shown) return
|
if (!this.shown) return
|
||||||
|
|
||||||
@@ -221,6 +230,9 @@
|
|||||||
switch(e.keyCode) {
|
switch(e.keyCode) {
|
||||||
case 40: // down arrow
|
case 40: // down arrow
|
||||||
case 38: // up arrow
|
case 38: // up arrow
|
||||||
|
case 16: // shift
|
||||||
|
case 17: // ctrl
|
||||||
|
case 18: // alt
|
||||||
break
|
break
|
||||||
|
|
||||||
case 9: // tab
|
case 9: // tab
|
||||||
@@ -288,13 +300,11 @@
|
|||||||
/* TYPEAHEAD DATA-API
|
/* TYPEAHEAD DATA-API
|
||||||
* ================== */
|
* ================== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
|
||||||
$('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
|
var $this = $(this)
|
||||||
var $this = $(this)
|
if ($this.data('typeahead')) return
|
||||||
if ($this.data('typeahead')) return
|
e.preventDefault()
|
||||||
e.preventDefault()
|
$this.typeahead($this.data())
|
||||||
$this.typeahead($this.data())
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.1.1
|
* bootstrap-transition.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -20,14 +20,14 @@
|
|||||||
|
|
||||||
!function ($) {
|
!function ($) {
|
||||||
|
|
||||||
|
"use strict"; // jshint ;_;
|
||||||
|
|
||||||
|
|
||||||
|
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
|
||||||
|
* ======================================================= */
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
"use strict"; // jshint ;_;
|
|
||||||
|
|
||||||
|
|
||||||
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
|
|
||||||
* ======================================================= */
|
|
||||||
|
|
||||||
$.support.transition = (function () {
|
$.support.transition = (function () {
|
||||||
|
|
||||||
var transitionEnd = (function () {
|
var transitionEnd = (function () {
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-alert.js v2.1.1
|
* bootstrap-alert.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -143,13 +143,11 @@
|
|||||||
/* ALERT DATA-API
|
/* ALERT DATA-API
|
||||||
* ============== */
|
* ============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-button.js v2.1.1
|
* bootstrap-button.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -235,17 +233,15 @@
|
|||||||
/* BUTTON DATA-API
|
/* BUTTON DATA-API
|
||||||
* =============== */
|
* =============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
|
||||||
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
|
var $btn = $(e.target)
|
||||||
var $btn = $(e.target)
|
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
|
||||||
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
|
$btn.button('toggle')
|
||||||
$btn.button('toggle')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-carousel.js v2.1.1
|
* bootstrap-carousel.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -340,9 +336,7 @@
|
|||||||
, direction = type == 'next' ? 'left' : 'right'
|
, direction = type == 'next' ? 'left' : 'right'
|
||||||
, fallback = type == 'next' ? 'first' : 'last'
|
, fallback = type == 'next' ? 'first' : 'last'
|
||||||
, that = this
|
, that = this
|
||||||
, e = $.Event('slide', {
|
, e
|
||||||
relatedTarget: $next[0]
|
|
||||||
})
|
|
||||||
|
|
||||||
this.sliding = true
|
this.sliding = true
|
||||||
|
|
||||||
@@ -350,6 +344,10 @@
|
|||||||
|
|
||||||
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
|
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
|
||||||
|
|
||||||
|
e = $.Event('slide', {
|
||||||
|
relatedTarget: $next[0]
|
||||||
|
})
|
||||||
|
|
||||||
if ($next.hasClass('active')) return
|
if ($next.hasClass('active')) return
|
||||||
|
|
||||||
if ($.support.transition && this.$element.hasClass('slide')) {
|
if ($.support.transition && this.$element.hasClass('slide')) {
|
||||||
@@ -409,19 +407,17 @@
|
|||||||
/* CAROUSEL DATA-API
|
/* CAROUSEL DATA-API
|
||||||
* ================= */
|
* ================= */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
|
||||||
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
|
var $this = $(this), href
|
||||||
var $this = $(this), href
|
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
|
||||||
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
|
$target.carousel(options)
|
||||||
$target.carousel(options)
|
e.preventDefault()
|
||||||
e.preventDefault()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-collapse.js v2.1.1
|
* bootstrap-collapse.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -565,21 +561,19 @@
|
|||||||
/* COLLAPSIBLE DATA-API
|
/* COLLAPSIBLE DATA-API
|
||||||
* ==================== */
|
* ==================== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
|
||||||
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
|
var $this = $(this), href
|
||||||
var $this = $(this), href
|
, target = $this.attr('data-target')
|
||||||
, target = $this.attr('data-target')
|
|| e.preventDefault()
|
||||||
|| e.preventDefault()
|
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
||||||
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
, option = $(target).data('collapse') ? 'toggle' : $this.data()
|
||||||
, option = $(target).data('collapse') ? 'toggle' : $this.data()
|
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
|
||||||
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
|
$(target).collapse(option)
|
||||||
$(target).collapse(option)
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-dropdown.js v2.1.1
|
* bootstrap-dropdown.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -680,8 +674,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearMenus() {
|
function clearMenus() {
|
||||||
getParent($(toggle))
|
$(toggle).each(function () {
|
||||||
.removeClass('open')
|
getParent($(this)).removeClass('open')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function getParent($this) {
|
function getParent($this) {
|
||||||
@@ -718,18 +713,15 @@
|
|||||||
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
||||||
* =================================== */
|
* =================================== */
|
||||||
|
|
||||||
$(function () {
|
$(document)
|
||||||
$('html')
|
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
|
||||||
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
|
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
||||||
$('body')
|
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
||||||
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||||
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
|
||||||
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* =========================================================
|
/* =========================================================
|
||||||
* bootstrap-modal.js v2.1.1
|
* bootstrap-modal.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#modals
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
||||||
* =========================================================
|
* =========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -779,8 +771,6 @@
|
|||||||
|
|
||||||
if (this.isShown || e.isDefaultPrevented()) return
|
if (this.isShown || e.isDefaultPrevented()) return
|
||||||
|
|
||||||
$('body').addClass('modal-open')
|
|
||||||
|
|
||||||
this.isShown = true
|
this.isShown = true
|
||||||
|
|
||||||
this.escape()
|
this.escape()
|
||||||
@@ -802,13 +792,12 @@
|
|||||||
that.$element
|
that.$element
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
.attr('aria-hidden', false)
|
.attr('aria-hidden', false)
|
||||||
.focus()
|
|
||||||
|
|
||||||
that.enforceFocus()
|
that.enforceFocus()
|
||||||
|
|
||||||
transition ?
|
transition ?
|
||||||
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
|
that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
|
||||||
that.$element.trigger('shown')
|
that.$element.focus().trigger('shown')
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -826,8 +815,6 @@
|
|||||||
|
|
||||||
this.isShown = false
|
this.isShown = false
|
||||||
|
|
||||||
$('body').removeClass('modal-open')
|
|
||||||
|
|
||||||
this.escape()
|
this.escape()
|
||||||
|
|
||||||
$(document).off('focusin.modal')
|
$(document).off('focusin.modal')
|
||||||
@@ -897,9 +884,11 @@
|
|||||||
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
||||||
.appendTo(document.body)
|
.appendTo(document.body)
|
||||||
|
|
||||||
if (this.options.backdrop != 'static') {
|
this.$backdrop.click(
|
||||||
this.$backdrop.click($.proxy(this.hide, this))
|
this.options.backdrop == 'static' ?
|
||||||
}
|
$.proxy(this.$element[0].focus, this.$element[0])
|
||||||
|
: $.proxy(this.hide, this)
|
||||||
|
)
|
||||||
|
|
||||||
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
||||||
|
|
||||||
@@ -949,26 +938,25 @@
|
|||||||
/* MODAL DATA-API
|
/* MODAL DATA-API
|
||||||
* ============== */
|
* ============== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
|
||||||
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
|
var $this = $(this)
|
||||||
var $this = $(this)
|
, href = $this.attr('href')
|
||||||
, href = $this.attr('href')
|
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
||||||
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
, option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
|
||||||
, option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
|
|
||||||
|
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
$target
|
$target
|
||||||
.modal(option)
|
.modal(option)
|
||||||
.one('hide', function () {
|
.one('hide', function () {
|
||||||
$this.focus()
|
$this.focus()
|
||||||
})
|
})
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-tooltip.js v2.1.1
|
* bootstrap-tooltip.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
@@ -1088,9 +1076,9 @@
|
|||||||
inside = /in/.test(placement)
|
inside = /in/.test(placement)
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.remove()
|
.detach()
|
||||||
.css({ top: 0, left: 0, display: 'block' })
|
.css({ top: 0, left: 0, display: 'block' })
|
||||||
.appendTo(inside ? this.$element : document.body)
|
.insertAfter(this.$element)
|
||||||
|
|
||||||
pos = this.getPosition(inside)
|
pos = this.getPosition(inside)
|
||||||
|
|
||||||
@@ -1113,7 +1101,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.css(tp)
|
.offset(tp)
|
||||||
.addClass(placement)
|
.addClass(placement)
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
}
|
}
|
||||||
@@ -1135,18 +1123,18 @@
|
|||||||
|
|
||||||
function removeWithAnimation() {
|
function removeWithAnimation() {
|
||||||
var timeout = setTimeout(function () {
|
var timeout = setTimeout(function () {
|
||||||
$tip.off($.support.transition.end).remove()
|
$tip.off($.support.transition.end).detach()
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|
||||||
$tip.one($.support.transition.end, function () {
|
$tip.one($.support.transition.end, function () {
|
||||||
clearTimeout(timeout)
|
clearTimeout(timeout)
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && this.$tip.hasClass('fade') ?
|
$.support.transition && this.$tip.hasClass('fade') ?
|
||||||
removeWithAnimation() :
|
removeWithAnimation() :
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
@@ -1204,8 +1192,9 @@
|
|||||||
this.enabled = !this.enabled
|
this.enabled = !this.enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
, toggle: function () {
|
, toggle: function (e) {
|
||||||
this[this.tip().hasClass('in') ? 'hide' : 'show']()
|
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
|
||||||
|
self[self.tip().hasClass('in') ? 'hide' : 'show']()
|
||||||
}
|
}
|
||||||
|
|
||||||
, destroy: function () {
|
, destroy: function () {
|
||||||
@@ -1238,13 +1227,12 @@
|
|||||||
, trigger: 'hover'
|
, trigger: 'hover'
|
||||||
, title: ''
|
, title: ''
|
||||||
, delay: 0
|
, delay: 0
|
||||||
, html: true
|
, html: false
|
||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-popover.js v2.1.1
|
* bootstrap-popover.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -1347,7 +1335,7 @@
|
|||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-scrollspy.js v2.1.1
|
* bootstrap-scrollspy.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -1498,7 +1486,7 @@
|
|||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ========================================================
|
/* ========================================================
|
||||||
* bootstrap-tab.js v2.1.1
|
* bootstrap-tab.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
||||||
* ========================================================
|
* ========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -1548,7 +1536,7 @@
|
|||||||
|
|
||||||
if ( $this.parent('li').hasClass('active') ) return
|
if ( $this.parent('li').hasClass('active') ) return
|
||||||
|
|
||||||
previous = $ul.find('.active a').last()[0]
|
previous = $ul.find('.active:last a')[0]
|
||||||
|
|
||||||
e = $.Event('show', {
|
e = $.Event('show', {
|
||||||
relatedTarget: previous
|
relatedTarget: previous
|
||||||
@@ -1624,16 +1612,14 @@
|
|||||||
/* TAB DATA-API
|
/* TAB DATA-API
|
||||||
* ============ */
|
* ============ */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
||||||
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
e.preventDefault()
|
||||||
e.preventDefault()
|
$(this).tab('show')
|
||||||
$(this).tab('show')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-typeahead.js v2.1.1
|
* bootstrap-typeahead.js v2.2.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@@ -1808,7 +1794,7 @@
|
|||||||
.on('keypress', $.proxy(this.keypress, this))
|
.on('keypress', $.proxy(this.keypress, this))
|
||||||
.on('keyup', $.proxy(this.keyup, this))
|
.on('keyup', $.proxy(this.keyup, this))
|
||||||
|
|
||||||
if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
|
if (this.eventSupported('keydown')) {
|
||||||
this.$element.on('keydown', $.proxy(this.keydown, this))
|
this.$element.on('keydown', $.proxy(this.keydown, this))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1817,6 +1803,15 @@
|
|||||||
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
|
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
, eventSupported: function(eventName) {
|
||||||
|
var isSupported = eventName in this.$element
|
||||||
|
if (!isSupported) {
|
||||||
|
this.$element.setAttribute(eventName, 'return;')
|
||||||
|
isSupported = typeof this.$element[eventName] === 'function'
|
||||||
|
}
|
||||||
|
return isSupported
|
||||||
|
}
|
||||||
|
|
||||||
, move: function (e) {
|
, move: function (e) {
|
||||||
if (!this.shown) return
|
if (!this.shown) return
|
||||||
|
|
||||||
@@ -1855,6 +1850,9 @@
|
|||||||
switch(e.keyCode) {
|
switch(e.keyCode) {
|
||||||
case 40: // down arrow
|
case 40: // down arrow
|
||||||
case 38: // up arrow
|
case 38: // up arrow
|
||||||
|
case 16: // shift
|
||||||
|
case 17: // ctrl
|
||||||
|
case 18: // alt
|
||||||
break
|
break
|
||||||
|
|
||||||
case 9: // tab
|
case 9: // tab
|
||||||
@@ -1922,13 +1920,11 @@
|
|||||||
/* TYPEAHEAD DATA-API
|
/* TYPEAHEAD DATA-API
|
||||||
* ================== */
|
* ================== */
|
||||||
|
|
||||||
$(function () {
|
$(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
|
||||||
$('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
|
var $this = $(this)
|
||||||
var $this = $(this)
|
if ($this.data('typeahead')) return
|
||||||
if ($this.data('typeahead')) return
|
e.preventDefault()
|
||||||
e.preventDefault()
|
$this.typeahead($this.data())
|
||||||
$this.typeahead($this.data())
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|||||||
2
assets/js/scripts.min.js
vendored
2
assets/js/scripts.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function roots_scripts() {
|
function roots_scripts() {
|
||||||
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '276c177e19c5e182a0258a0b5ec46d53');
|
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'f60c3bb06fe0e1fcf0f63cd76a4ec7c9');
|
||||||
|
|
||||||
if (!is_admin()) {
|
if (!is_admin()) {
|
||||||
wp_deregister_script('jquery');
|
wp_deregister_script('jquery');
|
||||||
@@ -23,7 +23,7 @@ function roots_scripts() {
|
|||||||
wp_enqueue_script('comment-reply');
|
wp_enqueue_script('comment-reply');
|
||||||
}
|
}
|
||||||
|
|
||||||
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '451f9387735e7c266d1fe20c1c58e94a', true);
|
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'f7de8c348d616069f4e6132e96518067', true);
|
||||||
wp_enqueue_script('roots_scripts');
|
wp_enqueue_script('roots_scripts');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user