aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/assets/css/bootstrap.css27
-rw-r--r--docs/assets/css/docs.css2
-rw-r--r--less/mixins.less6
-rw-r--r--less/tests/css-tests.html49
4 files changed, 59 insertions, 25 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bcbe4d9da..651e764bd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1305,6 +1305,9 @@ input[type="checkbox"][readonly] {
.control-group.warning textarea {
color: #c09853;
border-color: #c09853;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.warning .checkbox:focus,
@@ -1313,9 +1316,9 @@ input[type="checkbox"][readonly] {
.control-group.warning select:focus,
.control-group.warning textarea:focus {
border-color: #a47e3c;
- -webkit-box-shadow: 0 0 6px #dbc59e;
- -moz-box-shadow: 0 0 6px #dbc59e;
- box-shadow: 0 0 6px #dbc59e;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
}
.control-group.warning .input-prepend .add-on,
@@ -1338,6 +1341,9 @@ input[type="checkbox"][readonly] {
.control-group.error textarea {
color: #b94a48;
border-color: #b94a48;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.error .checkbox:focus,
@@ -1346,9 +1352,9 @@ input[type="checkbox"][readonly] {
.control-group.error select:focus,
.control-group.error textarea:focus {
border-color: #953b39;
- -webkit-box-shadow: 0 0 6px #d59392;
- -moz-box-shadow: 0 0 6px #d59392;
- box-shadow: 0 0 6px #d59392;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
}
.control-group.error .input-prepend .add-on,
@@ -1371,6 +1377,9 @@ input[type="checkbox"][readonly] {
.control-group.success textarea {
color: #468847;
border-color: #468847;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.success .checkbox:focus,
@@ -1379,9 +1388,9 @@ input[type="checkbox"][readonly] {
.control-group.success select:focus,
.control-group.success textarea:focus {
border-color: #356635;
- -webkit-box-shadow: 0 0 6px #7aba7b;
- -moz-box-shadow: 0 0 6px #7aba7b;
- box-shadow: 0 0 6px #7aba7b;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
}
.control-group.success .input-prepend .add-on,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index aa7f08095..7ddfeb1ac 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -134,7 +134,7 @@ hr.soften {
/* Download button */
@-webkit-keyframes downloadButton {
from { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
- 50% { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 50px rgba(0,68,204,1); }
+ 50% { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); }
to { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
}
.masthead .btn {
diff --git a/less/mixins.less b/less/mixins.less
index 96ce23eca..1b2f0bcfb 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -175,9 +175,13 @@
textarea {
color: @textColor;
border-color: @borderColor;
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
border-color: darken(@borderColor, 10%);
- .box-shadow(0 0 6px lighten(@borderColor, 20%));
+ // Write out in full since the lighten() function isn't easily escaped
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
}
}
// Give a small background color for input-prepend/-append
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 8d9785187..6786454cc 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -818,6 +818,30 @@
<br>
+<h4>Fluid textarea at .span12</h4>
+<div class="row-fluid">
+ <div class="span12">
+ <textarea class="span12"></textarea>
+ </div>
+</div>
+
+
+<br>
+
+
+<h4>Selects</h4>
+<form>
+ <select class="span4">
+ <option>Option</option>
+ </select>
+</form>
+
+
+<br>
+
+
+
+
<!-- Dropdowns
================================================== -->
@@ -1009,6 +1033,7 @@
</div>
</div> <!-- /tabbable -->
+<br>
<!-- Labels
@@ -1035,13 +1060,14 @@
</div><!--/span-->
</div><!--/row-->
+<br>
<!-- Button groups
================================================== -->
<div class="page-header">
- <h1>Button groups</h1>
+ <h1>Buttons</h1>
</div>
<table class="table table-bordered">
@@ -1062,6 +1088,14 @@
</tbody>
</table>
+<h4>Mini buttons: text and icon</h4>
+<div class="btn-group">
+ <button class="btn btn-mini">Button text</button>
+ <button class="btn btn-mini"><i class="icon-cog"></i></button>
+</div>
+
+<br>
+
<!-- Responsive utility classes
@@ -1098,19 +1132,6 @@
-<br>
-<br>
-<br>
-
-
- <h4>Fluid textarea at .span12</h4>
- <div class="row-fluid">
- <div class="span12">
- <textarea class="span12"></textarea>
- </div>
- </div>
-
-
</div><!-- /container -->
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 21:25:51 +0000