From a5e62657262aa9b0ca35377cc2e2619d54249b7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 15:53:25 -0700 Subject: remove common-table class in the docs --- docs/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index ebaa5a6f3..eb3372b42 100644 --- a/docs/index.html +++ b/docs/index.html @@ -512,7 +512,7 @@ 
-<table class="common-table">
+<table>
   ...
 </table>

Example: Zebra-striped

@@ -549,7 +549,7 @@

Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

-<table class="common-table zebra-striped">
+<table class="zebra-striped">
 ...
 </table>

Example: Zebra-striped w/ TableSorter.js

@@ -591,7 +591,7 @@ $("table#sortTableExample").tablesorter({ sortList: [[1,0]] }); }); </script> -<table class="common-table zebra-striped"> +<table class="zebra-striped"> ... </table> -- cgit v1.2.3 From 4f67e135dc2a8ad7a7b3d8946cc7a857a34881a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Aug 2011 20:38:23 -0700 Subject: adding dropdowns to tabs by refactoring the shizzzz out of them --- docs/assets/js/application.js | 6 +++--- docs/index.html | 32 +++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 30677829e..aaf76e0f0 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -5,6 +5,7 @@ $(document).ready(function(){ prettyPrint(); + // scroll spy logic // ================ @@ -19,7 +20,6 @@ $(document).ready(function(){ return $(id).offset().top; }); - function setButton(id) { nav.parent("li").removeClass('active'); $(nav[$.inArray(id, targets)]).parent("li").addClass('active'); @@ -48,10 +48,10 @@ $(document).ready(function(){ // =============================== $("body").bind("click", function (e) { - $('a.menu').parent("li").removeClass("open"); + $('.dropdown-toggle').parent("li").removeClass("open"); }); - $("a.menu").click(function (e) { + $(".dropdown-toggle").click(function (e) { var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/docs/index.html b/docs/index.html index bc0e216ab..cbc482002 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,10 +34,10 @@
-
+

Bootstrap

-
    +
    • Overview
    • About
    • Grid
      • @@ -901,22 +901,31 @@

      Fixed topbar

      -
      +

      Project Name

      -
      +
      +
      1/3
      +
      1/3
      +
      1/3
      +
      4
      6
      -- cgit v1.2.3 From 654cc5ad3fbbc618375a39f42ce9603c7f6897c4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Aug 2011 21:24:00 -0700 Subject: resolving deltas between that epic css selector specifity pull request and latest changes here --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 1a4a02a0c..3d7f38ba0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,7 +34,7 @@
      -
      +

      Bootstrap

        @@ -906,7 +906,7 @@

        Fixed topbar

        -
        +

        Project Name

          -- cgit v1.2.3 From 7070d44aed65344ed52ffbf2a3a9c1ce91c69035 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Aug 2011 21:41:32 -0700 Subject: adding more grid docs --- docs/index.html | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 3d7f38ba0..97b633ca5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -215,6 +215,10 @@
          1/3
          1/3
        +
        +
        1/3
        +
        2/3
        +
        4
        6
        @@ -236,6 +240,9 @@
        4
        8 offset 4
        +
        +
        1/3 offset 2/3s
        +
        4 offset 4
        4 offset 4
        -- cgit v1.2.3 From e8f1ae007339c98ea71b0f56b37c037d11fa6276 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 21:52:45 -0700 Subject: btn's need &nbps; seperating them for ie7 --- docs/index.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 3d7f38ba0..db31ca296 100644 --- a/docs/index.html +++ b/docs/index.html @@ -863,11 +863,7 @@

        Example buttons

        Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

        - - - - - + &nbps;&nbps;&nbps;&nbps;

        Alternate sizes

        Fancy larger or smaller buttons? Have at it!

        -- cgit v1.2.3 From fc0471a450d8cf3fdeb0971ce2636ac11053891d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:34:13 -0700 Subject: lulz nbsp --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index db31ca296..415ea6a3b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -863,7 +863,7 @@

        Example buttons

        Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

        - &nbps;&nbps;&nbps;&nbps; +     

        Alternate sizes

        Fancy larger or smaller buttons? Have at it!

        -- cgit v1.2.3 From 55022228bcdfea8d87eefb0c21249e6a9e219263 Mon Sep 17 00:00:00 2001 From: David Haywood Smith Date: Tue, 30 Aug 2011 11:47:40 +0100 Subject: Fixed duplicate element ids Also updated labels where required --- docs/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index bc0e216ab..b04e35292 100644 --- a/docs/index.html +++ b/docs/index.html @@ -651,9 +651,9 @@
        - +
        - + Small snippet of help text
        @@ -688,7 +688,7 @@
        - +
        @@ -791,9 +791,9 @@
        Example form legend
        - +
        - +
        @@ -812,9 +812,9 @@
        Example form legend
        - +
        - + Small snippet of help text
        -- cgit v1.2.3 From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:34:19 -0700 Subject: rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 415ea6a3b..9ec827fb1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -78,7 +78,7 @@
        Hotlink the CSS

        For the quickest and easiest start, just copy this snippet into your webpage.

        - +
        -- cgit v1.2.3 From 6258832776b113b09e963680ef121b363dd8d292 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Aug 2011 16:26:47 -0700 Subject: spelling mistakes and undo of one comment --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 97b633ca5..46e2881a8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1103,7 +1103,7 @@
        × -

        Holy gaucamole! Best check yo self, you’re not looking too good.

        +

        Holy guacamole! Best check yo self, you’re not looking too good.

        × @@ -1129,7 +1129,7 @@
        × -

        Holy gaucamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

        +

        Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

        Take this action Or do this
        -- cgit v1.2.3 From 72da5dd54d154bb2b87b0ec23107eca775c72f51 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 1 Sep 2011 22:53:24 -0700 Subject: for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit --- docs/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 889bc0437..78a2b0333 100644 --- a/docs/index.html +++ b/docs/index.html @@ -763,21 +763,21 @@
        -   +  
        -- cgit v1.2.3 From 479e0ccd6bd4c32c2445e0cb6291c17c5aa4f7a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 00:28:54 -0700 Subject: add backwards compatability for dropdowns in topbar --- docs/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 62ca0b8f9..6580be3fa 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,7 +34,7 @@
        -
        +

        Bootstrap

          @@ -909,7 +909,7 @@

          Fixed topbar

          -
          +

          Project Name

            @@ -942,7 +942,7 @@
          -
          +
          -- cgit v1.2.3 From 462287e25e0c2295884ad0d2cab31b0cd0b90b26 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 2 Sep 2011 00:31:19 -0700 Subject: div > ul ftw --- docs/index.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 62ca0b8f9..f7ccb7d14 100644 --- a/docs/index.html +++ b/docs/index.html @@ -905,7 +905,6 @@

          Navigation

          -

          Fixed topbar

          -- cgit v1.2.3 From 2a5d829c4a09f82aa9ce4ab8db2025aec91c120b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 2 Sep 2011 00:47:06 -0700 Subject: add doc styles back to topbar-inner --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 67a34280b..a4e51967c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -200,7 +200,7 @@ div.topbar-wrapper div.topbar { margin: 0 -20px; } -div.topbar-wrapper div.topbar .fill { +div.topbar-wrapper div.topbar .topbar-inner { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; -- cgit v1.2.3 From fa94b264fa9b552427a349235e176543af4be6d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 00:50:05 -0700 Subject: add temp second topbar to nav section, fix it's compatibility issues --- docs/assets/js/application.js | 5 ++--- docs/index.html | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index aaf76e0f0..ec4ae3c06 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -48,10 +48,9 @@ $(document).ready(function(){ // =============================== $("body").bind("click", function (e) { - $('.dropdown-toggle').parent("li").removeClass("open"); + $('.dropdown-toggle, .menu').parent("li").removeClass("open"); }); - - $(".dropdown-toggle").click(function (e) { + $(".dropdown-toggle, .menu").click(function (e) { var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/docs/index.html b/docs/index.html index 6580be3fa..b23beb321 100644 --- a/docs/index.html +++ b/docs/index.html @@ -946,6 +946,47 @@
          + +
          +
          +
          +
          +

          Project Name

          + +
          + +
          + +
          +
          +
          +
          + +

          What is it

          -- cgit v1.2.3 From 411e32434095c9b6e9def4114d84df371e8e5d20 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 00:58:07 -0700 Subject: fix dropdown bug, remove second topbar from docs now --- docs/index.html | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 50a3b5715..e9686b90d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -945,47 +945,6 @@
          - -
          -
          -
          -
          -

          Project Name

          - -
          - -
          - -
          -
          -
          -
          - -

          What is it

          -- cgit v1.2.3 From 8c1e60c638ba9f2c564f9c0f05c255a673672a5e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 12:19:43 -0700 Subject: add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index e9686b90d..d2e036611 100644 --- a/docs/index.html +++ b/docs/index.html @@ -891,7 +891,7 @@

          Buttons

          -   +  
        -- cgit v1.2.3 From e0722fcb1bbaffa2adb20ce3d4793422921255e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 12:24:28 -0700 Subject: cleanup docs and fix gradient in masthead --- docs/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a4e51967c..a9f1f230d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -24,8 +24,9 @@ section > .row { background-image: -moz-linear-gradient(#004D9F, #049cd9); background-image: -o-linear-gradient(top, #004D9F, #049cd9); background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0))"; + + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0)\9; /* IE8 and down */ + } #masthead div.inner, #footer div.inner { background: transparent url(../img/grid-18px.png) top center; @@ -199,7 +200,6 @@ div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; } - div.topbar-wrapper div.topbar .topbar-inner { padding-left: 20px; padding-right: 20px; -- cgit v1.2.3 From cb244d5d51f910ac891f4a3a4691cd0740dc8307 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 12:31:14 -0700 Subject: fix docs.css spacing, add gradient support for ie9 back --- docs/assets/css/docs.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a9f1f230d..bdb655b1a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -24,9 +24,7 @@ section > .row { background-image: -moz-linear-gradient(#004D9F, #049cd9); background-image: -o-linear-gradient(top, #004D9F, #049cd9); background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0)\9; /* IE8 and down */ - + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */ } #masthead div.inner, #footer div.inner { background: transparent url(../img/grid-18px.png) top center; -- cgit v1.2.3