From 3278c40631c6914f063b2eef551c668abb98c9ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Mar 2013 03:06:00 -0700 Subject: move nav into partial; rejigger content some more --- docs/_includes/docs-nav.html | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 docs/_includes/docs-nav.html (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html new file mode 100644 index 000000000..92674c445 --- /dev/null +++ b/docs/_includes/docs-nav.html @@ -0,0 +1,55 @@ +
+ +
-- cgit v1.2.3 From 88141252595b3875ac001741aa77c7905aac942c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Mar 2013 23:33:08 -0700 Subject: Add subnav support to CSS section --- docs/_includes/docs-nav.html | 62 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 92674c445..f7c4b6c98 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -9,12 +9,64 @@
  • CSS
  • Overview
    • -
  • Grid system
    • -
  • Typography
    • +
  • + Grid system + +
    • +
  • + Typography + +
  • Code
    • -
  • Tables
    • -
  • Forms
    • -
  • Buttons
    • +
  • + Tables + +
    • +
  • + Forms + +
    • +
  • + Buttons + +
  • Images
  • Components
    • -- cgit v1.2.3 From 3359b8d5f650c2d2f44511cf4483e64e140db2ad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Mar 2013 23:37:55 -0700 Subject: nav change to go with that --- docs/_includes/docs-nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index f7c4b6c98..3ad2bbd48 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -61,7 +61,7 @@
  • Buttons
      -
    • Default buttons
      • +
    • Button options
    • Sizes
    • Disabled
    • Button tags
      • -- cgit v1.2.3 From 49ebf542a29216c55d48306b58bd232506d67154 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 00:19:05 -0700 Subject: reorder docs --- docs/_includes/docs-nav.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 3ad2bbd48..78a26ffb2 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -68,10 +68,11 @@
  • Images
    • +
  • Helper classes
    • +
  • Responsive utilities
  • Components
  • Glyphicons
    • -
  • Responsive utilities
  • Dropdowns
  • Button groups
  • Button dropdowns
    • @@ -86,7 +87,7 @@
  • Alerts
  • Progress bars
  • Media object
    • -
  • Misc
    • +
  • Wells
  • JavaScript
  • Overview
    • -- cgit v1.2.3 From af470f4c7be5b6e5f2fba5966f890ddfa89c966d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 01:06:50 -0700 Subject: more content and nav twerks --- docs/_includes/docs-nav.html | 55 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 78a26ffb2..f43b56812 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -79,20 +79,63 @@
  • Navs
  • Navbar
  • Breadcrumbs
    • -
  • Pagination
    • +
  • + Pagination + +
  • Labels
  • Badges
    • -
  • Typography
    • +
  • + Typography + +
  • Thumbnails
    • -
  • Alerts
    • -
  • Progress bars
    • +
  • + Alerts + +
    • +
  • + Progress bars + +
  • Media object
  • Wells
  • JavaScript
    • -
  • Overview
    • +
  • + Overview + +
  • Transitions
    • -
  • Modal
    • +
  • + Modal + +
  • Dropdown
  • Scrollspy
  • Tab
    • -- cgit v1.2.3 From bd69269426e16524757f1295d5c60263f36e2430 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:09:56 -0700 Subject: more component nav updates --- docs/_includes/docs-nav.html | 54 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index f43b56812..99ef5116c 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -7,6 +7,7 @@
  • What's included
  • Templates and examples
    • +
  • CSS
  • Overview
  • @@ -71,13 +72,55 @@
  • Helper classes
  • Responsive utilities
    • +
  • Components
  • Glyphicons
    • -
  • Dropdowns
    • -
  • Button groups
    • -
  • Button dropdowns
    • -
  • Navs
    • -
  • Navbar
    • +
  • + Dropdowns + +
    • +
  • + Button groups + +
    • +
  • + Button dropdowns + +
    • +
  • + Navs +
      +
      • +
      • +
      • +
    +
    • +
  • + Navbar +
      +
      • +
      • +
      • +
      • +
      • +
      • +
    +
  • Breadcrumbs
  • Pagination @@ -117,6 +160,7 @@
  • Media object
  • Wells
    • +
  • JavaScript
  • Overview -- cgit v1.2.3 From 171c7feae23227ac6c51b365614b63b266574232 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:14:04 -0700 Subject: navs nav links --- docs/_includes/docs-nav.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 99ef5116c..ae5e58e1d 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -103,11 +103,15 @@
  • - Navs -
      -
      • -
      • -
      • + Navs +
    • -- cgit v1.2.3 From 62df38586a046064fcb93e26f7644801e8b4ca17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:16:34 -0700 Subject: navbar links in sidenav --- docs/_includes/docs-nav.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index ae5e58e1d..682bf75aa 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -117,12 +117,13 @@
    • Navbar
    • Breadcrumbs
      • -- cgit v1.2.3 From 9fff2d3fb6a636c7ee61ad097c5b247e8def3ab5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 14:15:18 -0700 Subject: Change error to danger for all classes; add panels component --- docs/_includes/docs-nav.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 682bf75aa..649cad06a 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -163,6 +163,7 @@
  • Media object
    • +
  • Panels
  • Wells
    • -- cgit v1.2.3 From 731903a17597f9095f9c26d969da8e04f50568ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 14:16:30 -0700 Subject: panels subnav and links --- docs/_includes/docs-nav.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 649cad06a..4a91214a3 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -163,7 +163,14 @@
  • Media object
    • -
  • Panels
    • +
  • + Panels + +
  • Wells
    • -- cgit v1.2.3 From 2a9604fdd297fee6661561d1ccf7922b4d599641 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:07:50 -0700 Subject: add list group component --- docs/_includes/docs-nav.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 4a91214a3..652b845cd 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -163,12 +163,25 @@
  • Media object
    • +
  • + List group + +
  • Panels
  • Wells
    • -- cgit v1.2.3 From 1683669eaa75555e1454105460ed6b7bcaca9f11 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:56:49 -0700 Subject: Remove .nav-list given new .list-group --- docs/_includes/docs-nav.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 652b845cd..1eccba357 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -107,7 +107,6 @@
    • Tabs nav
    • Pills nav
      • -
    • List nav
    • Justified nav
    • Disabled links
    • Alignment options
      • -- cgit v1.2.3 From e560c41ed107cbaf00baf5082ffb18ac015afa4d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 17:00:43 -0700 Subject: simpler nav links --- docs/_includes/docs-nav.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 1eccba357..e87bea2b7 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -166,9 +166,9 @@ List group
      • Basic list group
        • -
      • With chevrons
        • -
      • With badges
        • -
      • With badges and chevrons
        • +
      • Chevrons
        • +
      • Badges
        • +
      • Badges and chevrons
      • Linked items
      • Custom content
        • -- cgit v1.2.3 From 9df6dc81b57cb710c1e623c4e06c39954fc82280 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 00:02:51 -0700 Subject: bring in customizing bootstrap section from old gist --- docs/_includes/docs-nav.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index e87bea2b7..f4caabc5c 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -6,6 +6,7 @@
      • Getting started
      • What's included
      • Templates and examples
        • +
      • Customizing Bootstrap
      • CSS
        • -- cgit v1.2.3 From 93db7c2c74d67e946276f635094c4e997839ee97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 11:14:11 -0700 Subject: more link fixing --- docs/_includes/docs-nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index f4caabc5c..75967f704 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -211,8 +211,8 @@
      • Tab
      • Tooltip
      • Popover
        • -
      • Alert
        • -
      • Button
        • +
      • Alert
        • +
      • Button
      • Collapse
      • Carousel
      • Typeahead
        • -- cgit v1.2.3 From 610eb8fb78952ad3b1b43df2362bcfef9b223a01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Apr 2013 18:02:53 -0700 Subject: sidenote edit under customization section --- docs/_includes/docs-nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 75967f704..f9670a0d8 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -181,7 +181,7 @@
      • Basic panel
      • Panel with heading
      • Contextual alternatives
        • -
      • With list groups
        • +
      • With list groups
    • Wells
      • -- cgit v1.2.3 From eadfa59d92ad8bd898b2586056fbbf55906e1420 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Apr 2013 19:40:43 -0700 Subject: Add small grid for phones and tablets --- docs/_includes/docs-nav.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index f9670a0d8..fa20d9e98 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -18,6 +18,7 @@
    • Offset columns
    • Nested columns
    • Column ordering
      • +
    • Small device grid
    • LESS mixins and variables
    -- cgit v1.2.3 From 5892cea20723c41532c61fe39b758ec86972e982 Mon Sep 17 00:00:00 2001 From: wangshishuo Date: Wed, 17 Apr 2013 12:27:30 +0800 Subject: change nav's #tables-hover to #tables-hover-rows --- docs/_includes/docs-nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index fa20d9e98..c10bea4d3 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -42,7 +42,7 @@
  • Basic example
  • Zebra striping
  • Bordered tables
    • -
  • Hover rows
    • +
  • Hover rows
  • Condensed tables
  • Contextual row classes
    • -- cgit v1.2.3 From 94792b9dae3800e739e0036d45a276c3127b103d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 May 2013 23:05:09 -0700 Subject: Improve buttons in navbars * Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two * Uses the same method as .navbar-form * To use, add .navbar-btn to any button outside a form element * Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav --- docs/_includes/docs-nav.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index c10bea4d3..ebeb0d828 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -121,6 +121,9 @@
  • Basic navbar
  • Nav links
  • Forms in navbars
    • +
  • Buttons in navbars
    • +
  • Component alignment
    • +
  • Text in navbars
  • Fixed top navbar
  • Fixed bottom navbar
  • Static top navbar
    • -- cgit v1.2.3 From e1c67b149f7189f72acc5ca3e25d02f9dcd27e35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 May 2013 23:13:43 -0700 Subject: More navbar CSS and docs cleanup * Rearrange sections * Add code snippets for text and links in navbars * Add .navbar-link back in * Add mention of .navbar-text, but it still needs to be re-implemented * Update nav to reflect new order --- docs/_includes/docs-nav.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/_includes/docs-nav.html') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index ebeb0d828..2c001a3f4 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -122,8 +122,9 @@
  • Nav links
  • Forms in navbars
  • Buttons in navbars
    • -
  • Component alignment
  • Text in navbars
    • +
  • Links in navbars
    • +
  • Component alignment
  • Fixed top navbar
  • Fixed bottom navbar
  • Static top navbar
    • -- cgit v1.2.3