aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-07-11 22:46:10 -0700
committerMark Otto <[email protected]>2014-07-11 22:46:10 -0700
commita63c066e3d10926089182d01dfaeac8c4dddfe59 (patch)
treec55e0ffd2813752c72efa5e5ce9cc57a33106c23 /less
parentcdbd104c7ab9d853155b776d7db66c29e48dd0c0 (diff)
downloadbootstrap-a63c066e3d10926089182d01dfaeac8c4dddfe59.tar.xz
bootstrap-a63c066e3d10926089182d01dfaeac8c4dddfe59.zip
rearrange a few things; drop compiled theme file
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less5
-rw-r--r--less/mixins/buttons.less4
-rw-r--r--less/scaffolding.less3
3 files changed, 11 insertions, 1 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 10636eba4..b10207166 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -9,6 +9,11 @@
box-shadow: @arguments;
}
+.render-gradient(@start; @end) when (@enable-gradients = true) {
+ #gradient > .vertical(@start-color: @start; @end-color: @end);
+ background-color: @end;
+}
+
// Utilities
@import "mixins/hide-text.less";
diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less
index ebcca8809..b7d397c0a 100644
--- a/less/mixins/buttons.less
+++ b/less/mixins/buttons.less
@@ -7,6 +7,8 @@
color: @color;
background-color: @background;
border-color: @border;
+ @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
+ .box-shadow(@shadow);
&:hover,
&:focus,
@@ -21,7 +23,9 @@
&:active,
&.active,
.open > .dropdown-toggle& {
+ // Remove the gradient for the pressed/active state
background-image: none;
+ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
}
&.disabled,
&[disabled],
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 970caed9c..2cbe0abb1 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -82,7 +82,7 @@ img {
// Rounded corners
.img-rounded {
- border-radius: @border-radius-large;
+ .border-radius(@border-radius-large);
}
// Image thumbnails
@@ -93,6 +93,7 @@ img {
border: 1px solid @thumbnail-border;
border-radius: @thumbnail-border-radius;
transition: all .2s ease-in-out;
+ .box-shadow(0 1px 2px rgba(0,0,0,.075));
// Keep them at most 100% wide
.img-responsive(inline-block);