Skip to content
GitLab
Commit 2355fd22 authored by Mark Otto's avatar Mark Otto
Browse files

remove @shadow instances and replace with escaped values, update mixins to not... 

remove @shadow instances and replace with escaped values, update mixins to not use a default value at all
parent 56ecc6ba
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 61 deletions
+46 -61
docs/assets/bootstrap.zip
+ 0
- 0
View file @ 2355fd22
No preview for this file type
docs/assets/css/bootstrap-responsive.css
+ 3
- 3
View file @ 2355fd22
...@@ -677,9 +677,9 @@ ...@@ -677,9 +677,9 @@
margin: 9px 0; margin: 9px 0;
border-top: 1px solid #222222; border-top: 1px solid #222222;
border-bottom: 1px solid #222222; border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
} }
.navbar .nav.pull-right { .navbar .nav.pull-right {
float: none; float: none;
......
docs/assets/css/bootstrap.css
+ 24
- 24
View file @ 2355fd22
...@@ -761,9 +761,9 @@ textarea { ...@@ -761,9 +761,9 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
outline: 0; outline: 0;
outline: thin dotted \9; outline: thin dotted \9;
/* IE6-9 */ /* IE6-9 */
...@@ -2028,9 +2028,9 @@ button.close { ...@@ -2028,9 +2028,9 @@ button.close {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
cursor: pointer; cursor: pointer;
*margin-left: .3em; *margin-left: .3em;
/* Remove the border to prevent IE7's black border on input:focus */ /* Remove the border to prevent IE7's black border on input:focus */
...@@ -2075,9 +2075,9 @@ button.close { ...@@ -2075,9 +2075,9 @@ button.close {
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-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, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
background-color: #e6e6e6; background-color: #e6e6e6;
background-color: #d9d9d9 \9; background-color: #d9d9d9 \9;
outline: 0; outline: 0;
...@@ -2426,9 +2426,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2426,9 +2426,9 @@ input[type="submit"].btn.btn-mini {
.btn-group .dropdown-toggle { .btn-group .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
*padding-top: 3px; *padding-top: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
...@@ -2448,9 +2448,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2448,9 +2448,9 @@ input[type="submit"].btn.btn-mini {
} }
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
background-image: none; background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-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, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
} }
.btn-group.open .btn.dropdown-toggle { .btn-group.open .btn.dropdown-toggle {
background-color: #e6e6e6; background-color: #e6e6e6;
...@@ -2887,9 +2887,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2887,9 +2887,9 @@ input[type="submit"].btn.btn-mini {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
} }
.navbar .container { .navbar .container {
width: auto; width: auto;
...@@ -2915,9 +2915,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2915,9 +2915,9 @@ input[type="submit"].btn.btn-mini {
*background-color: #222222; *background-color: #222222;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
} }
.btn-navbar:hover, .btn-navbar:hover,
.btn-navbar:active, .btn-navbar:active,
...@@ -3034,9 +3034,9 @@ input[type="submit"].btn.btn-mini { ...@@ -3034,9 +3034,9 @@ input[type="submit"].btn.btn-mini {
color: #ffffff; color: #ffffff;
background-color: #626262; background-color: #626262;
border: 1px solid #151515; border: 1px solid #151515;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-webkit-transition: none; -webkit-transition: none;
-moz-transition: none; -moz-transition: none;
-ms-transition: none; -ms-transition: none;
......
less/button-groups.less
+ 2
- 7
View file @ 2355fd22
...@@ -93,10 +93,7 @@ ...@@ -93,10 +93,7 @@
.btn-group .dropdown-toggle { .btn-group .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
@shadow: inset 1px 0 0 rgba(255,255,255,.125), .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
*padding-top: 3px; *padding-top: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
...@@ -121,9 +118,7 @@ ...@@ -121,9 +118,7 @@
// Remove the gradient and set the same inset shadow as the :active state // Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle { .dropdown-toggle {
background-image: none; background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
} }
// Keep the hover's background when dropdown is open // Keep the hover's background when dropdown is open
......
less/buttons.less
+ 2
- 6
View file @ 2355fd22
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
border: 1px solid @btnBorder; border: 1px solid @btnBorder;
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px); .border-radius(4px);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
cursor: pointer; cursor: pointer;
// Give IE7 some love // Give IE7 some love
...@@ -56,9 +54,7 @@ ...@@ -56,9 +54,7 @@
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none; background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
outline: 0; outline: 0;
......
less/forms.less
+ 1
- 3
View file @ 2355fd22
...@@ -213,9 +213,7 @@ textarea { ...@@ -213,9 +213,7 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@shadow: inset 0 1px 1px rgba(0,0,0,.075), .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
outline: 0; outline: 0;
outline: thin dotted \9; /* IE6-9 */ outline: thin dotted \9; /* IE6-9 */
} }
......
less/mixins.less
+ 10
- 10
View file @ 2355fd22
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
// Sizing shortcuts // Sizing shortcuts
// ------------------------- // -------------------------
.size(@height: 5px, @width: 5px) { .size(@height, @width) {
width: @width; width: @width;
height: @height; height: @height;
} }
.square(@size: 5px) { .square(@size) {
.size(@size, @size); .size(@size, @size);
} }
...@@ -192,14 +192,14 @@ ...@@ -192,14 +192,14 @@
// -------------------------------------------------- // --------------------------------------------------
// Border Radius // Border Radius
.border-radius(@radius: 5px) { .border-radius(@radius) {
-webkit-border-radius: @radius; -webkit-border-radius: @radius;
-moz-border-radius: @radius; -moz-border-radius: @radius;
border-radius: @radius; border-radius: @radius;
} }
// Drop shadows // Drop shadows
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { .box-shadow(@shadow) {
-webkit-box-shadow: @shadow; -webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow; -moz-box-shadow: @shadow;
box-shadow: @shadow; box-shadow: @shadow;
...@@ -229,21 +229,21 @@ ...@@ -229,21 +229,21 @@
-o-transform: scale(@ratio); -o-transform: scale(@ratio);
transform: scale(@ratio); transform: scale(@ratio);
} }
.translate(@x: 0, @y: 0) { .translate(@x, @y) {
-webkit-transform: translate(@x, @y); -webkit-transform: translate(@x, @y);
-moz-transform: translate(@x, @y); -moz-transform: translate(@x, @y);
-ms-transform: translate(@x, @y); -ms-transform: translate(@x, @y);
-o-transform: translate(@x, @y); -o-transform: translate(@x, @y);
transform: translate(@x, @y); transform: translate(@x, @y);
} }
.skew(@x: 0, @y: 0) { .skew(@x, @y) {
-webkit-transform: skew(@x, @y); -webkit-transform: skew(@x, @y);
-moz-transform: skew(@x, @y); -moz-transform: skew(@x, @y);
-ms-transform: skew(@x, @y); -ms-transform: skew(@x, @y);
-o-transform: skew(@x, @y); -o-transform: skew(@x, @y);
transform: skew(@x, @y); transform: skew(@x, @y);
} }
.translate3d(@x: 0, @y: 0, @z: 0) { .translate3d(@x, @y, @z) {
-webkit-transform: translate(@x, @y, @z); -webkit-transform: translate(@x, @y, @z);
-moz-transform: translate(@x, @y, @z); -moz-transform: translate(@x, @y, @z);
-ms-transform: translate(@x, @y, @z); -ms-transform: translate(@x, @y, @z);
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
// Prevent browsers from flickering when using CSS 3D transforms. // Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden // Default value is `visible`, but can be changed to `hidden
// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
.backface-visibility(@visibility: visible){ .backface-visibility(@visibility){
-webkit-backface-visibility: @visibility; -webkit-backface-visibility: @visibility;
-moz-backface-visibility: @visibility; -moz-backface-visibility: @visibility;
-ms-backface-visibility: @visibility; -ms-backface-visibility: @visibility;
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
} }
// Resize anything // Resize anything
.resizable(@direction: both) { .resizable(@direction) {
resize: @direction; // Options: horizontal, vertical, both resize: @direction; // Options: horizontal, vertical, both
overflow: auto; // Safari fix overflow: auto; // Safari fix
} }
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
} }
// Opacity // Opacity
.opacity(@opacity: 100) { .opacity(@opacity) {
opacity: @opacity / 100; opacity: @opacity / 100;
filter: ~"alpha(opacity=@{opacity})"; filter: ~"alpha(opacity=@{opacity})";
} }
......
less/navbar.less
+ 3
- 6
View file @ 2355fd22
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
padding-right: 20px; padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
.border-radius(4px); .border-radius(4px);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); .box-shadow(~"0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)");
.box-shadow(@shadow);
} }
// Set width to auto for default container // Set width to auto for default container
...@@ -39,8 +38,7 @@ ...@@ -39,8 +38,7 @@
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
.buttonBackground(@navbarBackgroundHighlight, @navbarBackground); .buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
@shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
.box-shadow(@shadow);
} }
.btn-navbar .icon-bar { .btn-navbar .icon-bar {
display: block; display: block;
...@@ -143,8 +141,7 @@ ...@@ -143,8 +141,7 @@
color: @white; color: @white;
background-color: @navbarSearchBackground; background-color: @navbarSearchBackground;
border: 1px solid @navbarSearchBorder; border: 1px solid @navbarSearchBorder;
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)");
.box-shadow(@shadow);
.transition(none); .transition(none);
// Placeholder text gets special styles; can't be a grouped selector // Placeholder text gets special styles; can't be a grouped selector
......
less/responsive-navbar.less
+ 1
- 2
View file @ 2355fd22
...@@ -93,8 +93,7 @@ ...@@ -93,8 +93,7 @@
margin: (@baseLineHeight / 2) 0; margin: (@baseLineHeight / 2) 0;
border-top: 1px solid @navbarBackground; border-top: 1px solid @navbarBackground;
border-bottom: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground;
@shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
.box-shadow(@shadow);
} }
// Pull right (secondary) nav content // Pull right (secondary) nav content
.navbar .nav.pull-right { .navbar .nav.pull-right {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment