Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2011-07-02 10:21:11 +0400
committerJacob Thornton <jacobthornton@gmail.com>2011-07-02 10:21:11 +0400
commit52dfbe65006e1be7df88d1c1d39dc151ebc672aa (patch)
tree9a1ad410971096915a113691ef9a4b4ff0552fea
parent26f9e8c4e8580c2d41f31a4fb504ee8c0fdeb145 (diff)
add "make watch" to auto watch less files - change patterns.less to use opacity method
-rw-r--r--Makefile8
-rw-r--r--bootstrap-1.0.0.css20
-rw-r--r--bootstrap-1.0.0.min.css6
-rw-r--r--lib/patterns.less8
4 files changed, 29 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 34e0d7b1da..7a962a3e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
# NOTE: you must have the less npm package installed globally to build!
-# To install run: npm install less -g
-# ProTip: watchr -e "watch('lib/.*\.less') { system 'make' }"
+# To install less package run: $npm install less -g
+# watchr -e "watch('lib/.*\.less') { system 'make' }"
build:
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress
@echo "Bootstrap successfully built! - `date`"
+watch:
+ @echo "Watching less files for changes..."
+ @watchr -e "watch('lib/.*\.less') { system 'make' }"
+
.PHONY: build \ No newline at end of file
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 3046626e70..7a74227ab2 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -1128,8 +1128,11 @@ div.topbar a.logo img {
div.topbar form {
float: left;
margin: 5px 0 0 0;
- opacity: 1;
position: relative;
+ filter: alpha(opacity=100);
+ -khtml-opacity: 1;
+ -moz-opacity: 1;
+ opacity: 1;
}
div.topbar form input {
background-color: #bfbfbf;
@@ -1225,7 +1228,10 @@ div.topbar ul li.menu a.menu:after {
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
- opacity: .5;
+ filter: alpha(opacity=50);
+ -khtml-opacity: 0.5;
+ -moz-opacity: 0.5;
+ opacity: 0.5;
}
div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover {
background-color: #00b4eb;
@@ -1359,18 +1365,24 @@ div.alert-message.info {
div.alert-message a.close {
float: right;
margin-top: -2px;
- opacity: .5;
color: #fff;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+ filter: alpha(opacity=50);
+ -khtml-opacity: 0.5;
+ -moz-opacity: 0.5;
+ opacity: 0.5;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
div.alert-message a.close:hover {
- opacity: 1;
text-decoration: none;
+ filter: alpha(opacity=50);
+ -khtml-opacity: 0.5;
+ -moz-opacity: 0.5;
+ opacity: 0.5;
}
div.block-message {
margin-bottom: 18px;
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index e066d5ba60..f76922220b 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -150,7 +150,7 @@ table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown
div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:1000;overflow:visible;-webkit-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, 0.25),inset 0 -1px 0 rgba(0, 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);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
div.topbar ul li a:hover,div.topbar ul li.active a,div.topbar a.logo:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.15);color:#ffffff;text-decoration:none;}
div.topbar a.logo{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}div.topbar a.logo img{float:left;margin-right:6px;}
-div.topbar form{float:left;margin:5px 0 0 0;opacity:1;position:relative;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;}
+div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;}
div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
@@ -159,7 +159,7 @@ div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{dis
div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
div.topbar ul.primary-nav li ul{left:0;}
div.topbar ul.secondary-nav li ul{right:0;}
-div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:7px;height:7px;display:inline-block;background:transparent url(assets/img/dropdown-arrow.gif) no-repeat top center;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;opacity:.5;}
+div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:7px;height:7px;display:inline-block;background:transparent url(assets/img/dropdown-arrow.gif) no-repeat top center;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;}
div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;}
div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
@@ -172,7 +172,7 @@ div.alert-message.error{background-color:#e06359;}
div.alert-message.warning{background-color:#ffd75a;}
div.alert-message.success{background-color:#74c474;}
div.alert-message.info{background-color:#30c0fb;}
-div.alert-message a.close{float:right;margin-top:-2px;opacity:.5;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{opacity:1;text-decoration:none;}
+div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;}
div.block-message ul{margin-bottom:0;}
div.block-message strong{display:block;}
diff --git a/lib/patterns.less b/lib/patterns.less
index 76868e0060..f3d431f53e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -50,8 +50,8 @@ div.topbar {
form {
float: left;
margin: 5px 0 0 0;
- opacity: 1;
position: relative;
+ .opacity(100);
input {
background-color: @grayLight;
background-color: rgba(255,255,255,.3);
@@ -140,7 +140,7 @@ div.topbar {
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
- opacity: .5;
+ .opacity(50);
}
}
&.open {
@@ -276,15 +276,15 @@ div.alert-message {
a.close {
float: right;
margin-top: -2px;
- opacity: .5;
color: #fff;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 rgba(0,0,0,.5);
+ .opacity(50);
.border-radius(3px);
&:hover {
- opacity: 1;
text-decoration: none;
+ .opacity(50);
}
}
}