Skip to content

Commit

Permalink
Upgrade Bootstrap v3.2.0 for base-bs3
Browse files Browse the repository at this point in the history
  • Loading branch information
khanhlh committed Jul 24, 2014
1 parent 11013fd commit b9e5ee8
Show file tree
Hide file tree
Showing 69 changed files with 4,848 additions and 3,651 deletions.
97 changes: 96 additions & 1 deletion source/plg_system_t3/base-bs3/bootstrap/css/bootstrap-theme.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

5,062 changes: 2,740 additions & 2,322 deletions source/plg_system_t3/base-bs3/bootstrap/css/bootstrap.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions source/plg_system_t3/base-bs3/bootstrap/css/bootstrap.min.css

Large diffs are not rendered by default.

615 changes: 389 additions & 226 deletions source/plg_system_t3/base-bs3/bootstrap/js/bootstrap.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions source/plg_system_t3/base-bs3/bootstrap/js/bootstrap.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions source/plg_system_t3/base-bs3/bootstrap/less/.csscomb.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"always-semicolon": true,
"block-indent": 2,
"colon-space": true,
"colon-space": [0, 1],
"color-case": "lower",
"color-shorthand": true,
"combinator-space": true,
Expand All @@ -10,7 +10,7 @@
"leading-zero": false,
"remove-empty-rulesets": true,
"rule-indent": 2,
"stick-brace": true,
"stick-brace": " ",
"strip-spaces": true,
"unitless-zero": true,
"vendor-prefix-align": true,
Expand Down
7 changes: 4 additions & 3 deletions source/plg_system_t3/base-bs3/bootstrap/less/alerts.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
}
}

// Dismissable alerts
// Dismissible alerts
//
// Expand the right padding and account for the close button's positioning.

.alert-dismissable {
padding-right: (@alert-padding + 20);
.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.
.alert-dismissible {
padding-right: (@alert-padding + 20);

// Adjust close link position
.close {
Expand Down
36 changes: 18 additions & 18 deletions source/plg_system_t3/base-bs3/bootstrap/less/badges.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// --------------------------------------------------


// Base classes
// Base class
.badge {
display: inline-block;
min-width: 10px;
Expand Down Expand Up @@ -32,24 +32,24 @@
top: 0;
padding: 1px 5px;
}
}

// Hover state, but only for links
a.badge {
&:hover,
&:focus {
color: @badge-link-hover-color;
text-decoration: none;
cursor: pointer;
// Hover state, but only for links
a& {
&:hover,
&:focus {
color: @badge-link-hover-color;
text-decoration: none;
cursor: pointer;
}
}
}

// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: @badge-active-color;
background-color: @badge-active-bg;
}
.nav-pills > li > a > .badge {
margin-left: 3px;
// Account for badges in navs
a.list-group-item.active > &,
.nav-pills > .active > a > & {
color: @badge-active-color;
background-color: @badge-active-bg;
}
.nav-pills > li > a > & {
margin-left: 3px;
}
}
5 changes: 3 additions & 2 deletions source/plg_system_t3/base-bs3/bootstrap/less/bootstrap.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
@import "variables.less";
@import "mixins.less";

// Reset
// Reset and dependencies
@import "normalize.less";
@import "print.less";
@import "glyphicons.less";

// Core CSS
@import "scaffolding.less";
Expand All @@ -17,7 +18,6 @@

// Components
@import "component-animations.less";
@import "glyphicons.less";
@import "dropdowns.less";
@import "button-groups.less";
@import "input-groups.less";
Expand All @@ -35,6 +35,7 @@
@import "media.less";
@import "list-group.less";
@import "panels.less";
@import "responsive-embed.less";
@import "wells.less";
@import "close.less";

Expand Down
18 changes: 16 additions & 2 deletions source/plg_system_t3/base-bs3/bootstrap/less/button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
&:focus {
// Remove focus outline when dropdown JS adds it after closing the menu
outline: none;
outline: 0;
}
}
}
Expand Down Expand Up @@ -216,11 +216,25 @@
> .btn-group .btn {
width: 100%;
}

> .btn-group .dropdown-menu {
left: auto;
}
}


// Checkbox and radio options
//
// In order to support the browser's form validation feedback, powered by the
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
// This way, we ensure a DOM element is visible to position the popover from.
//
// See https://github.com/twbs/bootstrap/pull/12794 for more.

[data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none;
position: absolute;
z-index: -1;
.opacity(0);
}
2 changes: 0 additions & 2 deletions source/plg_system_t3/base-bs3/bootstrap/less/buttons.less
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@
.btn-block {
display: block;
width: 100%;
padding-left: 0;
padding-right: 0;
}

// Vertically space out multiple block buttons
Expand Down
19 changes: 15 additions & 4 deletions source/plg_system_t3/base-bs3/bootstrap/less/carousel.less
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@

> .active,
> .next,
> .prev { display: block; }
> .prev {
display: block;
}

> .active {
left: 0;
Expand Down Expand Up @@ -91,7 +93,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
outline: 0;
color: @carousel-control-color;
text-decoration: none;
.opacity(.9);
Expand All @@ -110,20 +112,22 @@
.icon-prev,
.glyphicon-chevron-left {
left: 50%;
margin-left: -10px;
}
.icon-next,
.glyphicon-chevron-right {
right: 50%;
margin-right: -10px;
}
.icon-prev,
.icon-next {
width: 20px;
height: 20px;
margin-top: -10px;
margin-left: -10px;
font-family: serif;
}


.icon-prev {
&:before {
content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
Expand Down Expand Up @@ -213,9 +217,16 @@
width: 30px;
height: 30px;
margin-top: -15px;
margin-left: -15px;
font-size: 30px;
}
.glyphicon-chevron-left,
.icon-prev {
margin-left: -15px;
}
.glyphicon-chevron-right,
.icon-next {
margin-right: -15px;
}
}

// Show and left align the captions
Expand Down
7 changes: 6 additions & 1 deletion source/plg_system_t3/base-bs3/bootstrap/less/code.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ code {
font-size: 90%;
color: @code-color;
background-color: @code-bg;
white-space: nowrap;
border-radius: @border-radius-base;
}

Expand All @@ -29,6 +28,12 @@ kbd {
background-color: @kbd-bg;
border-radius: @border-radius-small;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);

kbd {
padding: 0;
font-size: 100%;
box-shadow: none;
}
}

// Blocks of code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Heads up!
//
// We don't use the `.opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.

.fade {
opacity: 0;
Expand All @@ -17,10 +17,12 @@

.collapse {
display: none;
&.in {
display: block;
}

&.in { display: block; }
tr&.in { display: table-row; }
tbody&.in { display: table-row-group; }
}

.collapsing {
position: relative;
height: 0;
Expand Down
2 changes: 2 additions & 0 deletions source/plg_system_t3/base-bs3/bootstrap/less/dropdowns.less
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
margin: 2px 0 0; // override default ul
list-style: none;
font-size: @font-size-base;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border;
Expand Down Expand Up @@ -154,6 +155,7 @@
font-size: @font-size-small;
line-height: @line-height-base;
color: @dropdown-header-color;
white-space: nowrap; // as with > li > a
}

// Backdrop to catch body clicks on mobile, etc.
Expand Down
Loading

0 comments on commit b9e5ee8

Please sign in to comment.