aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 01:03:26 -0800
committerMark Otto <[email protected]>2012-01-07 01:03:26 -0800
commitd6a1402f2af5111e11a87a6029b642dc0b814854 (patch)
treee00d943ecc552656c43fd240a3e3b3a792be37ed
parentbcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 (diff)
downloadbootstrap-d6a1402f2af5111e11a87a6029b642dc0b814854.tar.xz
bootstrap-d6a1402f2af5111e11a87a6029b642dc0b814854.zip
update form shadows and tweak prettyprint styles
-rw-r--r--bootstrap.css14
-rw-r--r--bootstrap.min.css4
-rw-r--r--docs/assets/js/google-code-prettify/prettify.css18
-rw-r--r--docs/base-css.html5
-rw-r--r--lib/forms.less4
5 files changed, 29 insertions, 16 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 4f086520a..a5bdf2594 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Jan 7 00:47:37 PST 2012
+ * Date: Sat Jan 7 00:50:40 PST 2012
*/
html, body {
margin: 0;
@@ -635,9 +635,9 @@ textarea {
margin-left: 10px;
}
input, textarea {
- -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-ms-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -646,9 +646,9 @@ input, textarea {
}
input:focus, textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
- -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0;
}
input[type=file]:focus, input[type=checkbox]:focus, select:focus {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 156efff59..c0b0bf104 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -110,8 +110,8 @@ textarea{height:auto;}
.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
.input-mini{width:60px;}
.input-small{width:90px;}
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index e3bbf8b6c..c2031b594 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -21,10 +21,22 @@ pre.prettyprint {
padding: 8px;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
+ -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+ -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+ box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
}
/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
-ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; }
+ol.linenums {
+ margin: 0 0 0 33px; /* IE indents via margin-left */
+}
+ol.linenums li {
+ padding-left: 7px;
+ color: #bebec5;
+ line-height: 18px;
+ text-shadow: 0 1px 0 #fff;
+}
/* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 { } \ No newline at end of file
+li.L1, li.L3, li.L5, li.L7, li.L9 {
+
+} \ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index b8a6a2f8d..5ae1790f7 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1009,8 +1009,9 @@
<hr>
<h3>Form validation</h3>
<p>It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding <code>.control-group</code>.</p>
-<pre class="prettyprint">
-&lt;fieldset class="control-group error"&gt;
+<pre class="prettyprint linenums">
+&lt;fieldset
+ class="control-group error"&gt;
...
&lt;/fieldset&gt;
</pre>
diff --git a/lib/forms.less b/lib/forms.less
index 433b1ff98..5e02b7fde 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -157,14 +157,14 @@ textarea {
input,
textarea {
- .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.1));
@transition: border linear .2s, box-shadow linear .2s;
.transition(@transition);
}
input:focus,
textarea:focus {
border-color: rgba(82,168,236,.8);
- @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+ @shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
outline: 0;
}