framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Bootstrap 2.2.2 - Close #616

Browse Source
This commit is contained in:
Ben Word
2012-12-10 17:37:46 -06:00
parent 68e2a613be
commit e3f7365ec6
24 changed files with 340 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD ### HEAD
* Update to Bootstrap 2.2.2
* Update to jQuery 1.8.3 * Update to jQuery 1.8.3
* Use `entry-summary` class for excerpts per Readability's Article Publishing Guidelines * Use `entry-summary` class for excerpts per Readability's Article Publishing Guidelines
* Cleanup/refactor `lib/activation.php` * Cleanup/refactor `lib/activation.php`

4
assets/css/bootstrap-responsive.css vendored
View File

File diff suppressed because one or more lines are too long

4
assets/css/bootstrap.css vendored
View File

File diff suppressed because one or more lines are too long

14
assets/css/less/alerts.less
View File

@@ -13,6 +13,10 @@
background-color: @warningBackground; background-color: @warningBackground;
border: 1px solid @warningBorder; border: 1px solid @warningBorder;
.border-radius(@baseBorderRadius); .border-radius(@baseBorderRadius);
}
.alert,
.alert h4 {
// Specified for the h4 to prevent conflicts of changing @headingsColor
color: @warningText; color: @warningText;
} }
.alert h4 { .alert h4 {
@@ -36,17 +40,27 @@
border-color: @successBorder; border-color: @successBorder;
color: @successText; color: @successText;
} }
.alert-success h4 {
color: @successText;
}
.alert-danger, .alert-danger,
.alert-error { .alert-error {
background-color: @errorBackground; background-color: @errorBackground;
border-color: @errorBorder; border-color: @errorBorder;
color: @errorText; color: @errorText;
} }
.alert-danger h4,
.alert-error h4 {
color: @errorText;
}
.alert-info { .alert-info {
background-color: @infoBackground; background-color: @infoBackground;
border-color: @infoBorder; border-color: @infoBorder;
color: @infoText; color: @infoText;
} }
.alert-info h4 {
color: @infoText;
}
// Block alerts // Block alerts

2
assets/css/less/bootstrap.less vendored
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v2.2.1 * Bootstrap v2.2.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0

12
assets/css/less/breadcrumbs.less
View File

@@ -9,16 +9,16 @@
list-style: none; list-style: none;
background-color: #f5f5f5; background-color: #f5f5f5;
.border-radius(@baseBorderRadius); .border-radius(@baseBorderRadius);
li { > li {
display: inline-block; display: inline-block;
.ie7-inline-block(); .ie7-inline-block();
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
> .divider {
padding: 0 5px;
color: #ccc;
}
} }
.divider { > .active {
padding: 0 5px;
color: #ccc;
}
.active {
color: @grayLight; color: @grayLight;
} }
} }

69
assets/css/less/button-groups.less
View File

@@ -24,9 +24,9 @@
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 + .btn, > .btn + .btn,
.btn-group + .btn, > .btn-group + .btn,
.btn + .btn-group { > .btn + .btn-group {
margin-left: 5px; margin-left: 5px;
} }
} }
@@ -40,59 +40,44 @@
margin-left: -1px; margin-left: -1px;
} }
.btn-group > .btn, .btn-group > .btn,
.btn-group > .dropdown-menu { .btn-group > .dropdown-menu,
.btn-group > .popover {
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
} }
// Reset fonts for other sizes // Reset fonts for other sizes
.btn-group > .btn-mini { .btn-group > .btn-mini {
font-size: 11px; font-size: @fontSizeMini;
} }
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 12px; font-size: @fontSizeSmall;
} }
.btn-group > .btn-large { .btn-group > .btn-large {
font-size: 16px; font-size: @fontSizeLarge;
} }
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
.btn-group > .btn:first-child { .btn-group > .btn:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 4px; .border-top-left-radius(@baseBorderRadius);
-moz-border-radius-topleft: 4px; .border-bottom-left-radius(@baseBorderRadius);
border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
} }
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child, .btn-group > .btn:last-child,
.btn-group > .dropdown-toggle { .btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px; .border-top-right-radius(@baseBorderRadius);
-moz-border-radius-topright: 4px; .border-bottom-right-radius(@baseBorderRadius);
border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
} }
// Reset corners for large buttons // Reset corners for large buttons
.btn-group > .btn.large:first-child { .btn-group > .btn.large:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 6px; .border-top-left-radius(@borderRadiusLarge);
-moz-border-radius-topleft: 6px; .border-bottom-left-radius(@borderRadiusLarge);
border-top-left-radius: 6px;
-webkit-border-bottom-left-radius: 6px;
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
} }
.btn-group > .btn.large:last-child, .btn-group > .btn.large:last-child,
.btn-group > .large.dropdown-toggle { .btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px; .border-top-right-radius(@borderRadiusLarge);
-moz-border-radius-topright: 6px; .border-bottom-right-radius(@borderRadiusLarge);
border-top-right-radius: 6px;
-webkit-border-bottom-right-radius: 6px;
-moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px;
} }
// On hover/focus/active, bring the proper btn to front // On hover/focus/active, bring the proper btn to front
@@ -218,25 +203,25 @@
display: inline-block; // makes buttons only take up the width they need display: inline-block; // makes buttons only take up the width they need
.ie7-inline-block(); .ie7-inline-block();
} }
.btn-group-vertical .btn { .btn-group-vertical > .btn {
display: block; display: block;
float: none; float: none;
width: 100%; max-width: 100%;
.border-radius(0); .border-radius(0);
} }
.btn-group-vertical .btn + .btn { .btn-group-vertical > .btn + .btn {
margin-left: 0; margin-left: 0;
margin-top: -1px; margin-top: -1px;
} }
.btn-group-vertical .btn:first-child { .btn-group-vertical > .btn:first-child {
.border-radius(4px 4px 0 0); .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
} }
.btn-group-vertical .btn:last-child { .btn-group-vertical > .btn:last-child {
.border-radius(0 0 4px 4px); .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
} }
.btn-group-vertical .btn-large:first-child { .btn-group-vertical > .btn-large:first-child {
.border-radius(6px 6px 0 0); .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
} }
.btn-group-vertical .btn-large:last-child { .btn-group-vertical > .btn-large:last-child {
.border-radius(0 0 6px 6px); .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
} }

12
assets/css/less/buttons.less
View File

@@ -14,7 +14,6 @@
margin-bottom: 0; // For input.btn margin-bottom: 0; // For input.btn
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
*line-height: @baseLineHeight;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
@@ -30,8 +29,6 @@
&:hover { &:hover {
color: @grayDark; color: @grayDark;
text-decoration: none; text-decoration: none;
background-color: darken(@white, 10%);
*background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
background-position: 0 -15px; background-position: 0 -15px;
// transition is only when going to hover, otherwise the background // transition is only when going to hover, otherwise the background
@@ -47,8 +44,6 @@
// Active state // Active state
&.active, &.active,
&:active { &:active {
background-color: darken(@white, 10%);
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)");
@@ -58,7 +53,6 @@
&.disabled, &.disabled,
&[disabled] { &[disabled] {
cursor: default; cursor: default;
background-color: darken(@white, 10%);
background-image: none; background-image: none;
.opacity(65); .opacity(65);
.box-shadow(none); .box-shadow(none);
@@ -79,7 +73,7 @@
} }
.btn-large [class^="icon-"], .btn-large [class^="icon-"],
.btn-large [class*=" icon-"] { .btn-large [class*=" icon-"] {
margin-top: 2px; margin-top: 4px;
} }
// Small // Small
@@ -92,6 +86,10 @@
.btn-small [class*=" icon-"] { .btn-small [class*=" icon-"] {
margin-top: 0; margin-top: 0;
} }
.btn-mini [class^="icon-"],
.btn-mini [class*=" icon-"] {
margin-top: -1px;
}
// Mini // Mini
.btn-mini { .btn-mini {

30
assets/css/less/carousel.less
View File

@@ -15,50 +15,50 @@
position: relative; position: relative;
} }
.carousel { .carousel-inner {
.item { > .item {
display: none; display: none;
position: relative; position: relative;
.transition(.6s ease-in-out left); .transition(.6s ease-in-out left);
} }
// Account for jankitude on images // Account for jankitude on images
.item > img { > .item > img {
display: block; display: block;
line-height: 1; line-height: 1;
} }
.active, > .active,
.next, > .next,
.prev { display: block; } > .prev { display: block; }
.active { > .active {
left: 0; left: 0;
} }
.next, > .next,
.prev { > .prev {
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
} }
.next { > .next {
left: 100%; left: 100%;
} }
.prev { > .prev {
left: -100%; left: -100%;
} }
.next.left, > .next.left,
.prev.right { > .prev.right {
left: 0; left: 0;
} }
.active.left { > .active.left {
left: -100%; left: -100%;
} }
.active.right { > .active.right {
left: 100%; left: 100%;
} }

3
assets/css/less/code.less
View File

@@ -19,6 +19,7 @@ code {
color: #d14; color: #d14;
background-color: #f7f7f9; background-color: #f7f7f9;
border: 1px solid #e1e1e8; border: 1px solid #e1e1e8;
white-space: nowrap;
} }
// Blocks of code // Blocks of code
@@ -46,6 +47,8 @@ pre {
code { code {
padding: 0; padding: 0;
color: inherit; color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }

14
assets/css/less/dropdowns.less
View File

@@ -115,6 +115,7 @@
text-decoration: none; text-decoration: none;
background-color: transparent; background-color: transparent;
background-image: none; // Remove CSS gradient background-image: none; // Remove CSS gradient
.reset-filter();
cursor: default; cursor: default;
} }
@@ -168,9 +169,7 @@
left: 100%; left: 100%;
margin-top: -6px; margin-top: -6px;
margin-left: -1px; margin-left: -1px;
-webkit-border-radius: 0 6px 6px 6px; .border-radius(0 6px 6px 6px);
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
} }
.dropdown-submenu:hover > .dropdown-menu { .dropdown-submenu:hover > .dropdown-menu {
display: block; display: block;
@@ -182,9 +181,7 @@
bottom: 0; bottom: 0;
margin-top: 0; margin-top: 0;
margin-bottom: -2px; margin-bottom: -2px;
-webkit-border-radius: 5px 5px 5px 0; .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 // Caret to indicate there is a submenu
@@ -215,9 +212,7 @@
> .dropdown-menu { > .dropdown-menu {
left: -100%; left: -100%;
margin-left: 10px; margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px; .border-radius(6px 0 6px 6px);
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
} }
} }
@@ -232,6 +227,7 @@
// Typeahead // Typeahead
// --------- // ---------
.typeahead { .typeahead {
z-index: 1051;
margin-top: 2px; // give it some space to breathe margin-top: 2px; // give it some space to breathe
.border-radius(@baseBorderRadius); .border-radius(@baseBorderRadius);
} }

20
assets/css/less/forms.less
View File

@@ -138,7 +138,6 @@ input[type="checkbox"] {
*margin-top: 0; /* IE7 */ *margin-top: 0; /* IE7 */
margin-top: 1px \9; /* IE8-9 */ margin-top: 1px \9; /* IE8-9 */
line-height: normal; line-height: normal;
cursor: pointer;
} }
// Reset width of input images, buttons, radios, checkboxes // Reset width of input images, buttons, radios, checkboxes
@@ -367,9 +366,9 @@ input[type="checkbox"][readonly] {
// HTML5 invalid states // HTML5 invalid states
// Shares styles with the .control-group.error above // Shares styles with the .control-group.error above
input:focus:required:invalid, input:focus:invalid,
textarea:focus:required:invalid, textarea:focus:invalid,
select:focus:required:invalid { select:focus:invalid {
color: #b94a48; color: #b94a48;
border-color: #ee5f5b; border-color: #ee5f5b;
&:focus { &:focus {
@@ -463,7 +462,8 @@ select:focus:required:invalid {
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.add-on, .add-on,
.btn { .btn,
.btn-group > .dropdown-toggle {
vertical-align: top; vertical-align: top;
.border-radius(0); .border-radius(0);
} }
@@ -490,7 +490,7 @@ select:focus:required:invalid {
select, select,
.uneditable-input { .uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+ .btn-group .btn { + .btn-group .btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
} }
} }
@@ -500,7 +500,8 @@ select:focus:required:invalid {
margin-left: -1px; margin-left: -1px;
} }
.add-on:last-child, .add-on:last-child,
.btn:last-child { .btn:last-child,
.btn-group:last-child > .dropdown-toggle {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
} }
} }
@@ -671,7 +672,10 @@ legend + .control-group {
// And apply it only to .help-block instances that follow a form control // And apply it only to .help-block instances that follow a form control
input, input,
select, select,
textarea { textarea,
.uneditable-input,
.input-prepend,
.input-append {
+ .help-block { + .help-block {
margin-top: @baseLineHeight / 2; margin-top: @baseLineHeight / 2;
} }

8
assets/css/less/labels-badges.less
View File

@@ -27,6 +27,14 @@
.border-radius(9px); .border-radius(9px);
} }
// Empty labels/badges collapse
.label,
.badge {
&:empty {
display: none;
}
}
// Hover state, but only for links // Hover state, but only for links
a { a {
&.label:hover, &.label:hover,

2
assets/css/less/mixins.less
View File

@@ -163,7 +163,7 @@
// Mixin for form field states // Mixin for form field states
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
// Set the text color // Set the text color
> label, .control-label,
.help-block, .help-block,
.help-inline { .help-inline {
color: @textColor; color: @textColor;

7
assets/css/less/modals.less
View File

@@ -23,11 +23,11 @@
// Base modal // Base modal
.modal { .modal {
position: fixed; position: fixed;
top: 50%; top: 10%;
left: 50%; left: 50%;
z-index: @zindexModal; z-index: @zindexModal;
width: 560px; width: 560px;
margin: -250px 0 0 -280px; margin-left: -280px;
background-color: @white; background-color: @white;
border: 1px solid #999; border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3); border: 1px solid rgba(0,0,0,.3);
@@ -42,7 +42,7 @@
.transition(e('opacity .3s linear, top .3s ease-out')); .transition(e('opacity .3s linear, top .3s ease-out'));
top: -25%; top: -25%;
} }
&.fade.in { top: 50%; } &.fade.in { top: 10%; }
} }
.modal-header { .modal-header {
padding: 9px 15px; padding: 9px 15px;
@@ -58,6 +58,7 @@
// Body (where all modal content resides) // Body (where all modal content resides)
.modal-body { .modal-body {
position: relative;
overflow-y: auto; overflow-y: auto;
max-height: 400px; max-height: 400px;
padding: 15px; padding: 15px;

27
assets/css/less/navbar.less
View File

@@ -10,7 +10,6 @@
.navbar { .navbar {
overflow: visible; overflow: visible;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
color: @navbarText;
// Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
*position: relative; *position: relative;
@@ -67,6 +66,7 @@
.navbar-text { .navbar-text {
margin-bottom: 0; margin-bottom: 0;
line-height: @navbarHeight; line-height: @navbarHeight;
color: @navbarText;
} }
// Janky solution for now to account for links outside the .nav // Janky solution for now to account for links outside the .nav
@@ -123,7 +123,7 @@
} }
.input-append, .input-append,
.input-prepend { .input-prepend {
margin-top: 6px; margin-top: 5px;
white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
input { input {
margin-top: 0; // remove the margin on top since it's on the parent margin-top: 0; // remove the margin on top since it's on the parent
@@ -245,6 +245,7 @@
} }
.navbar .nav .dropdown-toggle .caret { .navbar .nav .dropdown-toggle .caret {
margin-top: 8px; margin-top: 8px;
} }
// Hover // Hover
@@ -334,6 +335,12 @@
} }
} }
// Caret should match text color on hover
.navbar .nav li.dropdown > a:hover .caret {
border-top-color: @navbarLinkColorActive;
border-bottom-color: @navbarLinkColorActive;
}
// Remove background color from open dropdown // Remove background color from open dropdown
.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle,
@@ -379,7 +386,6 @@
// ------------------------- // -------------------------
.navbar-inverse { .navbar-inverse {
color: @navbarInverseText;
.navbar-inner { .navbar-inner {
#gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
@@ -395,6 +401,14 @@
} }
} }
.brand {
color: @navbarInverseBrandColor;
}
.navbar-text {
color: @navbarInverseText;
}
.nav > li > a:focus, .nav > li > a:focus,
.nav > li > a:hover { .nav > li > a:hover {
background-color: @navbarInverseLinkBackgroundHover; background-color: @navbarInverseLinkBackgroundHover;
@@ -429,6 +443,10 @@
background-color: @navbarInverseLinkBackgroundActive; background-color: @navbarInverseLinkBackgroundActive;
color: @navbarInverseLinkColorActive; color: @navbarInverseLinkColorActive;
} }
.nav li.dropdown > a:hover .caret {
border-top-color: @navbarInverseLinkColorActive;
border-bottom-color: @navbarInverseLinkColorActive;
}
.nav li.dropdown > .dropdown-toggle .caret { .nav li.dropdown > .dropdown-toggle .caret {
border-top-color: @navbarInverseLinkColor; border-top-color: @navbarInverseLinkColor;
border-bottom-color: @navbarInverseLinkColor; border-bottom-color: @navbarInverseLinkColor;
@@ -470,6 +488,3 @@
} }
} }

6
assets/css/less/navs.less
View File

@@ -21,6 +21,12 @@
background-color: @grayLighter; background-color: @grayLighter;
} }
// Prevent IE8 from misplacing imgs
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
.nav > li > a > img {
max-width: none;
}
// Redeclare pull classes because of specifity // Redeclare pull classes because of specifity
.nav > .pull-right { .nav > .pull-right {
float: right; float: right;

88
assets/css/less/popovers.less
View File

@@ -11,6 +11,7 @@
display: none; display: none;
width: 236px; width: 236px;
padding: 1px; padding: 1px;
text-align: left; // Reset given new insertion method
background-color: @popoverBackground; background-color: @popoverBackground;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding; -moz-background-clip: padding;
@@ -20,12 +21,14 @@
.border-radius(6px); .border-radius(6px);
.box-shadow(0 5px 10px rgba(0,0,0,.2)); .box-shadow(0 5px 10px rgba(0,0,0,.2));
// Overrides for proper insertion
white-space: normal;
// Offset the popover to account for the popover arrow // Offset the popover to account for the popover arrow
&.top { margin-top: -10px; } &.top { margin-top: -10px; }
&.right { margin-left: 10px; } &.right { margin-left: 10px; }
&.bottom { margin-top: 10px; } &.bottom { margin-top: 10px; }
&.left { margin-left: -10px; } &.left { margin-left: -10px; }
} }
.popover-title { .popover-title {
@@ -41,77 +44,86 @@
.popover-content { .popover-content {
padding: 9px 14px; padding: 9px 14px;
p, ul, ol {
margin-bottom: 0;
}
} }
// Arrows // Arrows
//
// .arrow is outer, .arrow:after is inner
.popover .arrow, .popover .arrow,
.popover .arrow:after { .popover .arrow:after {
position: absolute; position: absolute;
display: inline-block; display: block;
width: 0; width: 0;
height: 0; height: 0;
border-color: transparent; border-color: transparent;
border-style: solid; border-style: solid;
} }
.popover .arrow {
border-width: @popoverArrowOuterWidth;
}
.popover .arrow:after { .popover .arrow:after {
border-width: @popoverArrowWidth;
content: ""; content: "";
z-index: -1;
} }
.popover { .popover {
&.top .arrow { &.top .arrow {
bottom: -@popoverArrowWidth;
left: 50%; left: 50%;
margin-left: -@popoverArrowWidth; margin-left: -@popoverArrowOuterWidth;
border-width: @popoverArrowWidth @popoverArrowWidth 0; border-bottom-width: 0;
border-top-color: @popoverArrowColor; border-top-color: #999; // IE8 fallback
border-top-color: @popoverArrowOuterColor;
bottom: -@popoverArrowOuterWidth;
&:after { &:after {
border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; bottom: 1px;
border-top-color: @popoverArrowOuterColor; margin-left: -@popoverArrowWidth;
bottom: -1px; border-bottom-width: 0;
left: -@popoverArrowOuterWidth; border-top-color: @popoverArrowColor;
} }
} }
&.right .arrow { &.right .arrow {
top: 50%; top: 50%;
left: -@popoverArrowWidth; left: -@popoverArrowOuterWidth;
margin-top: -@popoverArrowWidth; margin-top: -@popoverArrowOuterWidth;
border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; border-left-width: 0;
border-right-color: @popoverArrowColor; border-right-color: #999; // IE8 fallback
border-right-color: @popoverArrowOuterColor;
&:after { &:after {
border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; left: 1px;
border-right-color: @popoverArrowOuterColor; bottom: -@popoverArrowWidth;
bottom: -@popoverArrowOuterWidth; border-left-width: 0;
left: -1px; border-right-color: @popoverArrowColor;
} }
} }
&.bottom .arrow { &.bottom .arrow {
top: -@popoverArrowWidth;
left: 50%; left: 50%;
margin-left: -@popoverArrowWidth; margin-left: -@popoverArrowOuterWidth;
border-width: 0 @popoverArrowWidth @popoverArrowWidth; border-top-width: 0;
border-bottom-color: @popoverArrowColor; border-bottom-color: #999; // IE8 fallback
border-bottom-color: @popoverArrowOuterColor;
top: -@popoverArrowOuterWidth;
&:after { &:after {
border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; top: 1px;
border-bottom-color: @popoverArrowOuterColor; margin-left: -@popoverArrowWidth;
top: -1px; border-top-width: 0;
left: -@popoverArrowOuterWidth; border-bottom-color: @popoverArrowColor;
} }
} }
&.left .arrow { &.left .arrow {
top: 50%; top: 50%;
right: -@popoverArrowWidth; right: -@popoverArrowOuterWidth;
margin-top: -@popoverArrowWidth; margin-top: -@popoverArrowOuterWidth;
border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; border-right-width: 0;
border-left-color: @popoverArrowColor; border-left-color: #999; // IE8 fallback
border-left-color: @popoverArrowOuterColor;
&:after { &:after {
border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; right: 1px;
border-left-color: @popoverArrowOuterColor; border-right-width: 0;
bottom: -@popoverArrowOuterWidth; border-left-color: @popoverArrowColor;
right: -1px; bottom: -@popoverArrowWidth;
} }
} }
} }

86
assets/css/less/reset.less
View File

@@ -1,5 +1,5 @@
// //
// Modals // Reset CSS
// Adapted from http://github.com/necolas/normalize.css // Adapted from http://github.com/necolas/normalize.css
// -------------------------------------------------- // --------------------------------------------------
@@ -122,10 +122,18 @@ input[type="submit"] {
-webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
} }
label,
select,
button,
input[type="button"],
input[type="reset"],
input[type="submit"],
input[type="radio"],
input[type="checkbox"] {
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; .box-sizing(content-box);
-moz-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield; -webkit-appearance: textfield;
} }
input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-decoration,
@@ -136,3 +144,73 @@ textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9 overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser vertical-align: top; // Readability and alignment cross-browser
} }
// Printing
// -------------------------
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
@media print {
* {
text-shadow: none !important;
color: #000 !important; // Black prints faster: h5bp.com/s
background: transparent !important;
box-shadow: none !important;
}
a,
a:visited {
text-decoration: underline;
}
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after {
content: " (" attr(title) ")";
}
// Don't show links for images, or javascript/internal links
.ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
}
pre,
blockquote {
border: 1px solid #999;
page-break-inside: avoid;
}
thead {
display: table-header-group; // h5bp.com/t
}
tr,
img {
page-break-inside: avoid;
}
img {
max-width: 100% !important;
}
@page {
margin: 0.5cm;
}
p,
h2,
h3 {
orphans: 3;
widows: 3;
}
h2,
h3 {
page-break-after: avoid;
}
}

11
assets/css/less/responsive.less
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap Responsive v2.2.1 * Bootstrap Responsive v2.2.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@@ -14,6 +14,15 @@
// ------------------------------------------------------------- // -------------------------------------------------------------
// IE10 Metro responsive
// Required for Windows 8 Metro split-screen snapping with IE10
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
@-ms-viewport{
width: device-width;
}
// REPEAT VARIABLES & MIXINS // REPEAT VARIABLES & MIXINS
// ------------------------- // -------------------------
// Required since we compile the responsive stuff separately // Required since we compile the responsive stuff separately

65
assets/css/less/tables.less
View File

@@ -48,6 +48,11 @@ table {
tbody + tbody { tbody + tbody {
border-top: 2px solid @tableBorder; border-top: 2px solid @tableBorder;
} }
// Nesting
.table {
background-color: @bodyBackground;
}
} }
@@ -89,51 +94,47 @@ table {
border-top: 0; border-top: 0;
} }
// For first th or td in the first row in the first thead or tbody // For first th or td in the first row in the first thead or tbody
thead:first-child tr:first-child th:first-child, thead:first-child tr:first-child > th:first-child,
tbody:first-child tr:first-child td:first-child { tbody:first-child tr:first-child > td:first-child {
-webkit-border-top-left-radius: 4px; .border-top-left-radius(@baseBorderRadius);
border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
} }
thead:first-child tr:first-child th:last-child, thead:first-child tr:first-child > th:last-child,
tbody:first-child tr:first-child td:last-child { tbody:first-child tr:first-child > td:last-child {
-webkit-border-top-right-radius: 4px; .border-top-right-radius(@baseBorderRadius);
border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
} }
// For first th or td in the first row in the first thead or tbody // For first th or td in the last row in the last thead or tbody
thead:last-child tr:last-child th:first-child, thead:last-child tr:last-child > th:first-child,
tbody:last-child tr:last-child td:first-child, tbody:last-child tr:last-child > td:first-child,
tfoot:last-child tr:last-child td:first-child { tfoot:last-child tr:last-child > td:first-child {
.border-radius(0 0 0 4px); .border-bottom-left-radius(@baseBorderRadius);
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
} }
thead:last-child tr:last-child th:last-child, thead:last-child tr:last-child > th:last-child,
tbody:last-child tr:last-child td:last-child, tbody:last-child tr:last-child > td:last-child,
tfoot:last-child tr:last-child td:last-child { tfoot:last-child tr:last-child > td:last-child {
-webkit-border-bottom-right-radius: 4px; .border-bottom-right-radius(@baseBorderRadius);
border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
} }
// Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
tfoot + tbody:last-child tr:last-child td:first-child {
.border-bottom-left-radius(0);
}
tfoot + tbody:last-child tr:last-child td:last-child {
.border-bottom-right-radius(0);
}
// Special fixes to round the left border on the first td/th // Special fixes to round the left border on the first td/th
caption + thead tr:first-child th:first-child, caption + thead tr:first-child th:first-child,
caption + tbody tr:first-child td:first-child, caption + tbody tr:first-child td:first-child,
colgroup + thead tr:first-child th:first-child, colgroup + thead tr:first-child th:first-child,
colgroup + tbody tr:first-child td:first-child { colgroup + tbody tr:first-child td:first-child {
-webkit-border-top-left-radius: 4px; .border-top-left-radius(@baseBorderRadius);
border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
} }
caption + thead tr:first-child th:last-child, caption + thead tr:first-child th:last-child,
caption + tbody tr:first-child td:last-child, caption + tbody tr:first-child td:last-child,
colgroup + thead tr:first-child th:last-child, colgroup + thead tr:first-child th:last-child,
colgroup + tbody tr:first-child td:last-child { colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px; .border-top-right-radius(@baseBorderRadius);
border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
} }
} }
@@ -147,8 +148,8 @@ table {
// Default zebra-stripe styles (alternating gray and transparent backgrounds) // Default zebra-stripe styles (alternating gray and transparent backgrounds)
.table-striped { .table-striped {
tbody { tbody {
tr:nth-child(odd) td, > tr:nth-child(odd) > td,
tr:nth-child(odd) th { > tr:nth-child(odd) > th {
background-color: @tableBackgroundAccent; background-color: @tableBackgroundAccent;
} }
} }

50
assets/css/less/type.less
View File

@@ -20,33 +20,27 @@ p {
// Emphasis & misc // Emphasis & misc
// ------------------------- // -------------------------
small { // Ex: 14px base font * 85% = about 12px
font-size: 85%; // Ex: 14px base font * 85% = about 12px small { font-size: 85%; }
}
strong { strong { font-weight: bold; }
font-weight: bold; em { font-style: italic; }
} cite { font-style: normal; }
em {
font-style: italic;
}
cite {
font-style: normal;
}
// Utility classes // Utility classes
.muted { .muted { color: @grayLight; }
color: @grayLight; a.muted:hover { color: darken(@grayLight, 10%); }
}
.text-warning { color: @warningText; } .text-warning { color: @warningText; }
a.text-warning:hover { color: darken(@warningText, 10%); } a.text-warning:hover { color: darken(@warningText, 10%); }
.text-error { color: @errorText; } .text-error { color: @errorText; }
a.text-error:hover { color: darken(@errorText, 10%); } a.text-error:hover { color: darken(@errorText, 10%); }
.text-info { color: @infoText; } .text-info { color: @infoText; }
a.text-info:hover { color: darken(@infoText, 10%); } a.text-info:hover { color: darken(@infoText, 10%); }
.text-success { color: @successText; } .text-success { color: @successText; }
a.text-success:hover { color: darken(@successText, 10%); } a.text-success:hover { color: darken(@successText, 10%); }
@@ -112,12 +106,26 @@ ol ul {
li { li {
line-height: @baseLineHeight; line-height: @baseLineHeight;
} }
// Remove default list styles
ul.unstyled, ul.unstyled,
ol.unstyled { ol.unstyled {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;
} }
// Single-line list items
ul.inline,
ol.inline {
margin-left: 0;
list-style: none;
& > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
}
// Description Lists // Description Lists
dl { dl {
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;

4
assets/css/less/variables.less
View File

@@ -68,7 +68,7 @@
@paddingLarge: 11px 19px; // 44px @paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px @paddingMini: 0 6px; // 22px
@baseBorderRadius: 4px; @baseBorderRadius: 4px;
@borderRadiusLarge: 6px; @borderRadiusLarge: 6px;
@@ -126,7 +126,7 @@
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @white;
@dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundActive: @linkColor;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;

2
assets/js/plugins.js
View File

File diff suppressed because one or more lines are too long