mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Swap -small and -large variables for -sm and -lg

Browse Source
This commit is contained in:
Mark Otto
2014-09-21 16:04:37 -07:00
parent 2cc9e773c5
commit d1660ad078
24 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/_buttons.less
+3 -3
View File
@@ -122,14 +122,14 @@
.btn-lg {
// line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
.button-size(@padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @line-height-lg; @border-radius-lg);
}
.btn-sm {
// line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
.button-size(@padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @line-height-sm; @border-radius-sm);
}
.btn-xs {
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-small; @border-radius-small);
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-sm; @border-radius-sm);
}
less/_code.less
+1 -1
View File
@@ -26,7 +26,7 @@ kbd {
font-size: 90%;
color: @kbd-color;
background-color: @kbd-bg;
.border-radius(@border-radius-small);
.border-radius(@border-radius-sm);
.box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25));
kbd {
less/_dropdown.less
+1 -1
View File
@@ -144,7 +144,7 @@
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: @font-size-small;
font-size: @font-size-sm;
line-height: @line-height-base;
color: @dropdown-header-color;
white-space: nowrap; // as with > li > a
less/_forms.less
+16 -16
View File
@@ -185,12 +185,12 @@ input[type="month"] {
line-height: @line-height-base ~"\0";
&.input-sm {
line-height: @input-height-small;
line-height: @line-height-small ~"\0";
line-height: @input-height-sm;
line-height: @line-height-sm ~"\0";
}
&.input-lg {
line-height: @input-height-large;
line-height: @line-height-large ~"\0";
line-height: @input-height-lg;
line-height: @line-height-lg ~"\0";
}
}
@@ -202,10 +202,10 @@ _:-ms-fullscreen, :root input[type="month"] {
line-height: @line-height-base;
&.input-sm {
line-height: @line-height-small;
line-height: @line-height-sm;
}
&.input-lg {
line-height: @line-height-large;
line-height: @line-height-lg;
}
}
@@ -328,12 +328,12 @@ input[type="checkbox"] {
.input-sm,
.form-group-sm .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
.input-size(@input-height-sm; @padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @line-height-sm; @input-border-radius-sm);
}
.input-lg,
.form-group-lg .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
.input-size(@input-height-lg; @padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @line-height-lg; @input-border-radius-lg);
}
@@ -364,14 +364,14 @@ input[type="checkbox"] {
pointer-events: none;
}
.input-lg + .form-control-feedback {
width: @input-height-large;
height: @input-height-large;
line-height: @input-height-large;
width: @input-height-lg;
height: @input-height-lg;
line-height: @input-height-lg;
}
.input-sm + .form-control-feedback {
width: @input-height-small;
height: @input-height-small;
line-height: @input-height-small;
width: @input-height-sm;
height: @input-height-sm;
line-height: @input-height-sm;
}
// Feedback states
@@ -548,14 +548,14 @@ input[type="checkbox"] {
.form-group-lg {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: ((@padding-large-vertical * @line-height-large) + 1);
padding-top: ((@padding-lg-vertical * @line-height-lg) + 1);
}
}
}
.form-group-sm {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: (@padding-small-vertical + 1);
padding-top: (@padding-sm-vertical + 1);
}
}
}
less/_input-group.less
+6 -6
View File
@@ -83,14 +83,14 @@
// Sizing
&.input-sm {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
.border-radius(@border-radius-small);
padding: @padding-sm-vertical @padding-smhorizontal;
font-size: @font-size-sm;
.border-radius(@border-radius-sm);
}
&.input-lg {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
.border-radius(@border-radius-large);
padding: @padding-lg-vertical @padding-lg-horizontal;
font-size: @font-size-lg;
.border-radius(@border-radius-lg);
}
// Nuke default margins from checkboxes and radios to vertically center within.
less/_jumbotron.less
+1 -1
View File
@@ -11,7 +11,7 @@
.container &,
.container-fluid & {
.border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container
.border-radius(@border-radius-lg); // Only round corners at higher resolutions if contained in a container
}
.container {
less/_modal.less
+1 -1
View File
@@ -52,7 +52,7 @@
position: relative;
background-color: @modal-content-bg;
border: 1px solid @modal-content-border-color;
.border-radius(@border-radius-large);
.border-radius(@border-radius-lg);
.box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box;
// Remove focus outline from opened modal
less/_navbar.less
+3 -3
View File
@@ -167,7 +167,7 @@
padding: .55rem .75rem;
margin-right: @spacer;
margin-bottom: 0; // For headings
font-size: @font-size-large;
font-size: @font-size-lg;
line-height: @line-height-computed;
/*height: @navbar-height;*/
@@ -196,7 +196,7 @@
padding: .55rem .75rem;
margin-right: @spacer;
margin-bottom: 0; // For headings
font-size: @font-size-large;
font-size: @font-size-lg;
line-height: @line-height-computed;
background: none;
border: 0;
@@ -366,7 +366,7 @@
.navbar-vertical-align(@input-height-base);
&.btn-sm {
.navbar-vertical-align(@input-height-small);
.navbar-vertical-align(@input-height-sm);
}
&.btn-xs {
.navbar-vertical-align(22);
less/_pagination.less
+2 -2
View File
@@ -79,10 +79,10 @@
// Large
.pagination-lg {
.pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);
.pagination-size(@padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @border-radius-lg);
}
// Small
.pagination-sm {
.pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);
.pagination-size(@padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @border-radius-sm);
}
less/_popover.less
+2 -2
View File
@@ -19,7 +19,7 @@
background-color: @popover-bg;
background-clip: padding-box;
border: 1px solid @popover-border-color;
.border-radius(@border-radius-large);
.border-radius(@border-radius-lg);
.box-shadow(0 5px 10px rgba(0,0,0,.2));
// Overrides for proper insertion
@@ -38,7 +38,7 @@
font-size: @font-size-base;
background-color: @popover-title-bg;
border-bottom: 1px solid darken(@popover-title-bg, 5%);
border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
border-radius: (@border-radius-lg - 1) (@border-radius-lg - 1) 0 0;
}
.popover-content {
less/_scaffolding.less
+1 -1
View File
@@ -82,7 +82,7 @@ img {
// Rounded corners
.img-rounded {
.border-radius(@border-radius-large);
.border-radius(@border-radius-lg);
}
// Image thumbnails
less/_tooltip.less
+1 -1
View File
@@ -9,7 +9,7 @@
z-index: @zindex-tooltip;
display: block;
visibility: visible;
font-size: @font-size-small;
font-size: @font-size-sm;
line-height: 1.4;
opacity: 0;
less/_type.less
+1 -1
View File
@@ -71,7 +71,7 @@ p {
// Ex: (12px small font / 14px base font) * 100% = about 85%
small,
.small {
font-size: floor((100% * @font-size-small / @font-size-base));
font-size: floor((100% * @font-size-sm / @font-size-base));
}
mark,
less/_variables.less
+14 -14
View File
@@ -62,8 +62,8 @@
@font-size-root: 16px;
//** Sets the `<body>` and more to the root pixel value.
@font-size-base: 1rem;
@font-size-large: 1.25rem;
@font-size-small: .85rem;
@font-size-lg: 1.25rem;
@font-size-sm: .85rem;
@font-size-xs: .75rem;
@font-size-h1: 3rem;
@@ -92,21 +92,21 @@
@padding-base-vertical: .5rem;
@padding-base-horizontal: .75rem;
@padding-large-vertical: .75rem;
@padding-large-horizontal: 1.5rem;
@padding-lg-vertical: .75rem;
@padding-lg-horizontal: 1.5rem;
@padding-small-vertical: .3rem;
@padding-small-horizontal: .75rem;
@padding-sm-vertical: .3rem;
@padding-smhorizontal: .75rem;
@padding-xs-vertical: .2rem;
@padding-xs-horizontal: .5rem;
@line-height-large: 1.33;
@line-height-small: 1.5;
@line-height-lg: 1.33;
@line-height-sm: 1.5;
@border-radius-base: .25rem;
@border-radius-large: .3rem;
@border-radius-small: .2rem;
@border-radius-lg: .3rem;
@border-radius-sm: .2rem;
//** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff;
@@ -191,9 +191,9 @@
//** Default `.form-control` border radius
@input-border-radius: @border-radius-base;
//** Large `.form-control` border radius
@input-border-radius-large: @border-radius-large;
@input-border-radius-lg: @border-radius-lg;
//** Small `.form-control` border radius
@input-border-radius-small: @border-radius-small;
@input-border-radius-sm: @border-radius-sm;
//** Border color for inputs on focus
@input-border-focus: #66afe9;
@@ -205,9 +205,9 @@
//** Default `.form-control` height
@input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + (@border-width * 2));
//** Large `.form-control` height
@input-height-large: ((@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + (@border-width * 2));
@input-height-lg: ((@font-size-lg * @line-height-lg) + (@padding-lg-vertical * 2) + (@border-width * 2));
//** Small `.form-control` height
@input-height-small: ((@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + (@border-width * 2));
@input-height-sm: ((@font-size-sm * @line-height-sm) + (@padding-sm-vertical * 2) + (@border-width * 2));
@legend-color: @gray-dark;
@legend-border-color: #e5e5e5;