clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-23 19:47:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11808 from twbs/strict-math-fixes

Browse Source 
more LESS strictMath fixes
This commit is contained in:
Chris Rebert 2013-12-09 16:20:26 -08:00
commit 28d8be1634
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/dropdowns.less
View File

@ -142,7 +142,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
top: 0; top: 0;
z-index: @zindex-dropdown - 10; z-index: (@zindex-dropdown - 10);
} }
// Right aligned dropdowns // Right aligned dropdowns

2
less/forms.less
View File

@ -352,7 +352,7 @@ input[type="checkbox"],
// and other content below items // and other content below items
.radio, .radio,
.checkbox { .checkbox {
min-height: @line-height-computed + (@padding-base-vertical + 1); min-height: (@line-height-computed + (@padding-base-vertical + 1));
} }
// Make form groups behave like rows // Make form groups behave like rows

10
less/mixins.less
View File

@ -729,11 +729,11 @@
// Common styles for all sizes of grid columns, widths 1-12 // Common styles for all sizes of grid columns, widths 1-12
.col(@index) when (@index = 1) { // initial .col(@index) when (@index = 1) { // initial
@item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
.col(@index + 1, @item); .col((@index + 1), @item);
} }
.col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
@item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
.col(@index + 1, ~"@{list}, @{item}"); .col((@index + 1), ~"@{list}, @{item}");
} }
.col(@index, @list) when (@index > @grid-columns) { // terminal .col(@index, @list) when (@index > @grid-columns) { // terminal
@{list} { @{list} {
@ -751,11 +751,11 @@
.make-grid-columns-float(@class) { .make-grid-columns-float(@class) {
.col(@index) when (@index = 1) { // initial .col(@index) when (@index = 1) { // initial
@item: ~".col-@{class}-@{index}"; @item: ~".col-@{class}-@{index}";
.col(@index + 1, @item); .col((@index + 1), @item);
} }
.col(@index, @list) when (@index =< @grid-columns) { // general .col(@index, @list) when (@index =< @grid-columns) { // general
@item: ~".col-@{class}-@{index}"; @item: ~".col-@{class}-@{index}";
.col(@index + 1, ~"@{list}, @{item}"); .col((@index + 1), ~"@{list}, @{item}");
} }
.col(@index, @list) when (@index > @grid-columns) { // terminal .col(@index, @list) when (@index > @grid-columns) { // terminal
@{list} { @{list} {
@ -790,7 +790,7 @@
.make-grid(@index, @class, @type) when (@index >= 0) { .make-grid(@index, @class, @type) when (@index >= 0) {
.calc-grid(@index, @class, @type); .calc-grid(@index, @class, @type);
// next iteration // next iteration
.make-grid(@index - 1, @class, @type); .make-grid((@index - 1), @class, @type);
} }

4
less/panels.less
View File

@ -102,7 +102,7 @@
.panel-heading { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
.border-top-radius(@panel-border-radius - 1); .border-top-radius((@panel-border-radius - 1));
> .dropdown .dropdown-toggle { > .dropdown .dropdown-toggle {
color: inherit; color: inherit;
@ -126,7 +126,7 @@
padding: 10px 15px; padding: 10px 15px;
background-color: @panel-footer-bg; background-color: @panel-footer-bg;
border-top: 1px solid @panel-inner-border; border-top: 1px solid @panel-inner-border;
.border-bottom-radius(@panel-border-radius - 1); .border-bottom-radius((@panel-border-radius - 1));
} }