mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Implement the new border-radius guard: only round things if global @enable-rounded == true

Browse Source
This commit is contained in:
Mark Otto
2014-07-08 16:25:01 -07:00
parent 86099bfb33
commit f6367bc0e4
36 changed files with 55 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/alerts.less
+1 -1
View File
@@ -10,7 +10,7 @@
padding: @alert-padding;
margin-bottom: @line-height-computed;
border: 1px solid transparent;
border-radius: @alert-border-radius;
.border-radius(@alert-border-radius);
// Headings for larger alerts
h4 {
less/badges.less
+1 -1
View File
@@ -16,7 +16,7 @@
white-space: nowrap;
text-align: center;
background-color: @badge-bg;
border-radius: @badge-border-radius;
.border-radius(@badge-border-radius);
// Empty badges collapse automatically (not available in IE8)
&:empty {
less/breadcrumbs.less
+1 -1
View File
@@ -8,7 +8,7 @@
margin-bottom: @line-height-computed;
list-style: none;
background-color: @breadcrumb-bg;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
> li {
display: inline-block;
less/code.less
+1
View File
@@ -46,6 +46,7 @@ pre {
line-height: @line-height-base;
color: @pre-color;
background-color: @pre-bg;
.border-radius(@border-radius-base);
// Account for some code outputs that place code tags in pre tags
code {
less/dropdowns.less
+1 -1
View File
@@ -44,7 +44,7 @@
background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
box-shadow: 0 6px 12px rgba(0,0,0,.175);
background-clip: padding-box;
less/forms.less
+1 -1
View File
@@ -123,7 +123,7 @@ output {
background-color: @input-bg;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border;
border-radius: @input-border-radius;
.border-radius(@input-border-radius);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
less/input-groups.less
+3 -3
View File
@@ -79,18 +79,18 @@
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
// Sizing
&.input-sm {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
.border-radius(@border-radius-small);
}
&.input-lg {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
.border-radius(@border-radius-large);
}
// Nuke default margins from checkboxes and radios to vertically center within.
less/jumbotron.less
+1 -1
View File
@@ -24,7 +24,7 @@
}
.container & {
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
.border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container
}
.container {
less/labels.less
+1 -1
View File
@@ -12,7 +12,7 @@
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em;
.border-radius();
// Add hover effects, but only for links
a& {
less/mixins.less
+9
View File
@@ -1,6 +1,15 @@
// Mixins
// --------------------------------------------------
.border-radius(@radius: .25em) when (@enable-rounded = true) {
border-radius: @radius;
}
.box-shadow(@shadow: 0 .1rem .2rem rgba(0,0,0,.1)) when (@enable-shadows = true) {
box-shadow: @shadow;
}
// Utilities
@import "mixins/hide-text.less";
@import "mixins/opacity.less";
less/mixins/buttons.less
+1 -1
View File
@@ -48,5 +48,5 @@
padding: @padding-vertical @padding-horizontal;
font-size: @font-size;
line-height: @line-height;
border-radius: @border-radius;
.border-radius(@border-radius);
}
less/mixins/forms.less
+1 -1
View File
@@ -70,7 +70,7 @@
padding: @padding-vertical @padding-horizontal;
font-size: @font-size;
line-height: @line-height;
border-radius: @border-radius;
.border-radius(@border-radius);
select& {
height: @input-height;
less/modals.less
+1 -1
View File
@@ -53,7 +53,7 @@
background-color: @modal-content-bg;
border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
border: 1px solid @modal-content-border-color;
border-radius: @border-radius-large;
.border-radius(@border-radius-large);
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
@@ -18,7 +18,7 @@
&:extend(.clearfix all);
@media (min-width: @grid-float-breakpoint) {
border-radius: @navbar-border-radius;
.border-radius(@navbar-border-radius);
}
}
@@ -200,7 +200,7 @@
background-color: transparent;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
// We remove the `outline` here, but later compensate by attaching `:hover`
// styles to `:focus`.
@@ -213,7 +213,7 @@
display: block;
width: 22px;
height: 2px;
border-radius: 1px;
.border-radius(1px);
}
.icon-bar + .icon-bar {
margin-top: 4px;
less/navs.less
+4 -4
View File
@@ -85,7 +85,7 @@
margin-right: 2px;
line-height: @line-height-base;
border: 1px solid transparent;
border-radius: @border-radius-base @border-radius-base 0 0;
.border-radius(@border-radius-base @border-radius-base 0 0);
&:hover {
border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
}
@@ -120,7 +120,7 @@
// Links rendered as pills
> a {
border-radius: @nav-pills-border-radius;
.border-radius(@nav-pills-border-radius);
}
+ li {
margin-left: 2px;
@@ -193,7 +193,7 @@
> li > a {
// Override margin from .nav-tabs
margin-right: 0;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
}
> .active > a,
@@ -205,7 +205,7 @@
@media (min-width: @screen-sm-min) {
> li > a {
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
border-radius: @border-radius-base @border-radius-base 0 0;
.border-radius(@border-radius-base @border-radius-base 0 0);
}
> .active > a,
> .active > a:hover,
less/progress-bars.less
+1 -1
View File
@@ -29,7 +29,7 @@
height: @line-height-computed;
margin-bottom: @line-height-computed;
background-color: @progress-bg;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
}
less/theme.less
+3 -3
View File
@@ -111,7 +111,7 @@
.navbar-default {
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
.reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
border-radius: @navbar-border-radius;
.border-radius(@navbar-border-radius);
box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.navbar-nav > .active > a {
@@ -144,7 +144,7 @@
.navbar-static-top,
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
.border-radius(0);
}
@@ -206,7 +206,7 @@
// --------------------------------------------------
.list-group {
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
box-shadow: 0 1px 2px rgba(0,0,0,.075);
}
.list-group-item.active,
less/tooltip.less
+1 -1
View File
@@ -28,7 +28,7 @@
text-align: center;
text-decoration: none;
background-color: @tooltip-bg;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
}
// Arrows
less/variables.less
+9
View File
@@ -36,6 +36,15 @@
@link-hover-color: darken(@link-color, 15%);
//== Global settings
//
//## Quickly modify global styling by enabling or disabling features.
@enable-rounded: true;
@enable-shadows: true;
@enable-gradients: true;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.