]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b011daf)
add shell of tests page, lighten form actions background and give it a variable
authorMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 04:08:41 +0000 (21:08 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 04:08:41 +0000 (21:08 -0700)
docs/assets/bootstrap.zip patch | blob | blame | history
docs/assets/css/bootstrap.css patch | blob | blame | history
docs/css-tests.html [new file with mode: 0644] patch | blob
docs/less.html patch | blob | blame | history
docs/templates/pages/css-tests.mustache [new file with mode: 0644] patch | blob
docs/templates/pages/less.mustache patch | blob | blame | history
less/forms.less patch | blob | blame | history
less/tables.less patch | blob | blame | history
less/variables.less patch | blob | blame | history

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7246485c9dd04287ef308f59e995c20671547444..01d89c88e5a186a75292a475ec88ddcac7096684 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 393d9e60660b6435e54b850442dc3972bdf4593f..8b22f8928b76635f8da7986af8a64a4aa684bac3 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -938,7 +938,7 @@ select:focus:required:invalid:focus {
   padding: 17px 20px 18px;
   margin-top: 18px;
   margin-bottom: 18px;
-  background-color: #eeeeee;
+  background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   *zoom: 1;
 }
@@ -1208,6 +1208,8 @@ table {
 .table thead th {
   vertical-align: bottom;
 }
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
 .table colgroup + thead tr:first-child th,
 .table colgroup + thead tr:first-child td,
 .table thead:first-child tr:first-child th,
diff --git a/docs/css-tests.html b/docs/css-tests.html
new file mode 100644 (file)
index 0000000..3eeac59
--- /dev/null
+++ b/docs/css-tests.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Css ยท Twitter Bootstrap</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="assets/css/bootstrap.css" rel="stylesheet">
+    <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="assets/css/docs.css" rel="stylesheet">
+    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="assets/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
+  </head>
+
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
+
+
+  <!-- Navbar
+    ================================================== -->
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="./index.html">Bootstrap</a>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</a>
+              </li>
+              <li class="">
+                <a href="./scaffolding.html">Scaffolding</a>
+              </li>
+              <li class="">
+                <a href="./base-css.html">Base CSS</a>
+              </li>
+              <li class="">
+                <a href="./components.html">Components</a>
+              </li>
+              <li class="">
+                <a href="./javascript.html">Javascript plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="divider-vertical"></li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+              <li class="">
+                <a href="./examples.html">Examples</a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+  <h1>Tests</h1>
+  <p class="lead"></p>
+</header>
+
+
+     <!-- Footer
+      ================================================== -->
+      <footer class="footer">
+        <p class="pull-right"><a href="#">Back to top</a></p>
+        <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
+        <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+      </footer>
+
+    </div><!-- /container -->
+
+
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+    <script src="assets/js/jquery.js"></script>
+    <script src="assets/js/google-code-prettify/prettify.js"></script>
+    <script src="assets/js/bootstrap-transition.js"></script>
+    <script src="assets/js/bootstrap-alert.js"></script>
+    <script src="assets/js/bootstrap-modal.js"></script>
+    <script src="assets/js/bootstrap-dropdown.js"></script>
+    <script src="assets/js/bootstrap-scrollspy.js"></script>
+    <script src="assets/js/bootstrap-tab.js"></script>
+    <script src="assets/js/bootstrap-tooltip.js"></script>
+    <script src="assets/js/bootstrap-popover.js"></script>
+    <script src="assets/js/bootstrap-button.js"></script>
+    <script src="assets/js/bootstrap-collapse.js"></script>
+    <script src="assets/js/bootstrap-carousel.js"></script>
+    <script src="assets/js/bootstrap-typeahead.js"></script>
+    <script src="assets/js/application.js"></script>
+
+
+  </body>
+</html>
diff --git a/docs/less.html b/docs/less.html
index 19b2b2235f65d164304a0bcaeb798ded901b6b7e..08987d1280704405bc3297efa07c90d70868b33d 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -454,6 +454,10 @@
             <td><code>@inputDisabledBackground</code></td>
             <td><code>@grayLighter</code></td>
           </tr>
+          <tr>
+            <td><code>@formActionsBackground</code></td>
+            <td><code>#f5f5f5</code></td>
+          </tr>
         </tbody>
       </table>
       <h4>Form states and alerts</h4>
diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache
new file mode 100644 (file)
index 0000000..6455039
--- /dev/null
+++ b/docs/templates/pages/css-tests.mustache
@@ -0,0 +1,6 @@
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+  <h1>{{_i}}Tests{{/i}}</h1>
+  <p class="lead">{{_i}}{{/i}}</p>
+</header>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 129c76e9c03437ffd8ec33d85e15c34bdc150f1f..263ec7fce62e97b567ed4ddfdc2dbe47cd80f64f 100644 (file)
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -378,6 +378,10 @@
             <td><code>@inputDisabledBackground</code></td>
             <td><code>@grayLighter</code></td>
           </tr>
+          <tr>
+            <td><code>@formActionsBackground</code></td>
+            <td><code>#f5f5f5</code></td>
+          </tr>
         </tbody>
       </table>
       <h4>{{_i}}Form states and alerts{{/i}}</h4>
diff --git a/less/forms.less b/less/forms.less
index ffd1983725274ba95ebf70556815d8632651dfc3..5ce8b0c1c635d45ad36da793751d04c590d3e6d2 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -314,7 +314,7 @@ select:focus:required:invalid {
   padding: (@baseLineHeight - 1) 20px @baseLineHeight;
   margin-top: @baseLineHeight;
   margin-bottom: @baseLineHeight;
-  background-color: @grayLighter;
+  background-color: @formActionsBackground;
   border-top: 1px solid #ddd;
   .clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
diff --git a/less/tables.less b/less/tables.less
index 7111cb806a77271a348b423cebda22d8cc74f19d..5ce876f4a03cc54749d328045acf31e20db01d82 100644 (file)
--- a/less/tables.less
+++ b/less/tables.less
@@ -37,6 +37,8 @@ table {
     vertical-align: bottom;
   }
   // Remove top border from thead by default
+  caption + thead tr:first-child th,
+  caption + thead tr:first-child td,
   colgroup + thead tr:first-child th,
   colgroup + thead tr:first-child td,
   thead:first-child tr:first-child th,
diff --git a/less/variables.less b/less/variables.less
index c8e2a3c0df05e862d181fa85b85e72e303adbcf7..35fa11265d757aae400b6bd3a06f3198a386e0d7 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -97,7 +97,7 @@
 @inputBackground:               @white;
 @inputBorder:                   #ccc;
 @inputDisabledBackground:       @grayLighter;
-
+@formActionsBackground:         #f5f5f5;
 
 // Dropdowns
 // -------------------------
@@ -188,7 +188,6 @@
 
 
 
-
 // GRID
 // --------------------------------------------------
 
Mirror of https://github.com/twbs/bootstrap.git