From 22918f8f92d29a12a42db4e357f3d439e41bad0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 17:16:17 -0700 Subject: more tweaks to layouts and some docs styles --- docs/templates/layout.mustache | 4 +- docs/templates/pages/base-css.mustache | 160 +++++++++++++++++++----------- docs/templates/pages/scaffolding.mustache | 64 ++++++++---- 3 files changed, 148 insertions(+), 80 deletions(-) (limited to 'docs/templates') diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index ae2ce4aad..3e8448d19 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -86,7 +86,7 @@ -
+
{{>body}} @@ -94,10 +94,10 @@
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9ef80c125..ce710d7e3 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -3,7 +3,7 @@

{{_i}}Base CSS{{/i}}

{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}

-
+
+
+
+

{{_i}}Contents{{/i}}

+
    +
  1. {{_i}}Typography{{/i}}
    2. +
  2. {{_i}}Code{{/i}}
    3. +
  3. {{_i}}Tables{{/i}}
    4. +
  4. {{_i}}Forms{{/i}}
    5. +
  5. {{_i}}Buttons{{/i}}
    6. +
  6. {{_i}}Icons by Glyphicons{{/i}}
    7. +
+
+
+
@@ -219,7 +233,7 @@

{{_i}}Lists{{/i}}

{{_i}}Unordered{{/i}}

-

{{_i}}A list of items in which the order does not explicitly matter.{{/i}}

+

{{_i}}A list of items in which the order does not explicitly matter.{{/i}}

  • Lorem ipsum dolor sit amet
    • @@ -245,64 +259,94 @@ </ul> -

    {{_i}}Unstyled{{/i}}

    -

    <ul class="unstyled">

    -
      -
    • Lorem ipsum dolor sit amet
      • -
    • Consectetur adipiscing elit
      • -
    • Integer molestie lorem at massa
      • -
    • Facilisis in pretium nisl aliquet
      • -
    • Nulla volutpat aliquam velit -
        -
      • Phasellus iaculis neque
        • -
      • Purus sodales ultricies
        • -
      • Vestibulum laoreet porttitor sem
        • -
      • Ac tristique libero volutpat at
        • -
      -
      • -
    • Faucibus porta lacus fringilla vel
      • -
    • Aenean sit amet erat nunc
      • -
    • Eget porttitor lorem
      • -
    -

    {{_i}}Ordered{{/i}}

    -

    <ol>

    -
      -
    1. Lorem ipsum dolor sit amet
      2. -
    2. Consectetur adipiscing elit
      3. -
    3. Integer molestie lorem at massa
      4. -
    4. Facilisis in pretium nisl aliquet
      5. -
    5. Nulla volutpat aliquam velit
      6. -
    6. Faucibus porta lacus fringilla vel
      7. -
    7. Aenean sit amet erat nunc
      8. -
    8. Eget porttitor lorem
      9. -
    +

    {{_i}}A list of items in which the order does explicitly matter.{{/i}}

    +
    +
      +
    1. Lorem ipsum dolor sit amet
      2. +
    2. Consectetur adipiscing elit
      3. +
    3. Integer molestie lorem at massa
      4. +
    4. Facilisis in pretium nisl aliquet
      5. +
    5. Nulla volutpat aliquam velit
      6. +
    6. Faucibus porta lacus fringilla vel
      7. +
    7. Aenean sit amet erat nunc
      8. +
    8. Eget porttitor lorem
      9. +
    +
    +
    +<ol>
+  <li>...</li>
+</ol>
+
    + +

    {{_i}}Unstyled{{/i}}

    +

    {{_i}}A list of items with no list-style or additional left padding.{{/i}}

    +
    +
      +
    • Lorem ipsum dolor sit amet
      • +
    • Consectetur adipiscing elit
      • +
    • Integer molestie lorem at massa
      • +
    • Facilisis in pretium nisl aliquet
      • +
    • Nulla volutpat aliquam velit +
        +
      • Phasellus iaculis neque
        • +
      • Purus sodales ultricies
        • +
      • Vestibulum laoreet porttitor sem
        • +
      • Ac tristique libero volutpat at
        • +
      +
      • +
    • Faucibus porta lacus fringilla vel
      • +
    • Aenean sit amet erat nunc
      • +
    • Eget porttitor lorem
      • +
    +
    +
    +<ul class="unstyled">
+  <li>...</li>
+</ul>
+

    {{_i}}Description{{/i}}

    -

    <dl>

    -
    -
    {{_i}}Description lists{{/i}}
    -
    {{_i}}A description list is perfect for defining terms.{{/i}}
    -
    Euismod
    -
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    -
    Donec id elit non mi porta gravida at eget metus.
    -
    Malesuada porta
    -
    Etiam porta sem malesuada magna mollis euismod.
    -
    - -

    {{_i}}Horizontal description{{/i}}

    -

    <dl class="dl-horizontal">

    -
    -
    {{_i}}Description lists{{/i}}
    -
    {{_i}}A description list is perfect for defining terms.{{/i}}
    -
    Euismod
    -
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    -
    Donec id elit non mi porta gravida at eget metus.
    -
    Malesuada porta
    -
    Etiam porta sem malesuada magna mollis euismod.
    -
    Felis euismod semper eget lacinia
    -
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    -
    +

    {{_i}}A list of terms with their associated descriptions.{{/i}}

    +
    +
    +
    {{_i}}Description lists{{/i}}
    +
    {{_i}}A description list is perfect for defining terms.{{/i}}
    +
    Euismod
    +
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    +
    Donec id elit non mi porta gravida at eget metus.
    +
    Malesuada porta
    +
    Etiam porta sem malesuada magna mollis euismod.
    +
    +
    +
    +<dl>
+  <dt>...</dt>
+  <dd>...</dd>
+</dl>
+
    + +

    {{_i}}Horizontal description{{/i}}

    +

    {{_i}}Make terms and descriptions in <dl> line up side-by-side.{{/i}}

    +
    +
    +
    {{_i}}Description lists{{/i}}
    +
    {{_i}}A description list is perfect for defining terms.{{/i}}
    +
    Euismod
    +
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    +
    Donec id elit non mi porta gravida at eget metus.
    +
    Malesuada porta
    +
    Etiam porta sem malesuada magna mollis euismod.
    +
    Felis euismod semper eget lacinia
    +
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    +
    +
    +
    +<dl class="dl-horizontal">
+  <dt>...</dt>
+  <dd>...</dd>
+</dl>
+

    {{_i}}Heads up!{{/i}} diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index d2832e0fa..ae17ad4a8 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -1,26 +1,9 @@ -

    -
    -
    -

    {{_i}}Contents{{/i}}

    -
      -
    1. {{_i}}Global styles{{/i}}
      2. -
    2. {{_i}}Grid system{{/i}}
      3. -
    3. {{_i}}Fluid grid system{{/i}}
      4. -
    4. {{_i}}Customizing{{/i}}
      5. -
    5. {{_i}}Layouts{{/i}}
      6. -
    6. {{_i}}Responsive design{{/i}}
      7. -
    -
    -
    -
    -

    {{_i}}Scaffolding{{/i}}

    {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}

    -
    +