From f61fe3c4746ec09ff64756797fe6314be5f53b30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2011 21:13:26 -0700 Subject: refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option --- examples/fluid.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index eacb5c3d2..c6387846b 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -30,7 +30,7 @@
-
+
Project name
  • Home
    • @@ -42,8 +42,8 @@
-
-
+
+
Sidebar
    @@ -68,7 +68,7 @@
-
+

Hello, world!

-- cgit v1.2.3 From 8c2bb99085816617704b5d537b9c901e26e03569 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:46:02 -0700 Subject: share new navbar in examples --- examples/fluid.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index c6387846b..3b8bb46a8 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -28,8 +28,8 @@ -
-
+
+
Project name
    -- cgit v1.2.3 From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:26:58 -0800 Subject: fix forms in navbars, fix examples' navbars --- examples/fluid.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index 3b8bb46a8..66e07c82e 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -28,7 +28,7 @@ -
    +
    Project name @@ -78,9 +78,9 @@
    -
    +

    Heading

    -

    Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    View details »

    @@ -99,9 +99,9 @@
    -
    +

    Heading

    -

    Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    View details »

    -- cgit v1.2.3 From 5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:59:53 -0800 Subject: update the fluid examples to use new classes and clear the floats properly from sidebar --- examples/fluid.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index 66e07c82e..bba78a329 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -42,29 +42,29 @@
    -
    -
    -
    -
    Sidebar
    -
    +
    +

    © Company 2011

    -- cgit v1.2.3 From 16eccc43d9fa6317818b5d1621d0477150214488 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 23:28:48 -0800 Subject: dates updated to 2012 --- examples/fluid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index bba78a329..cb00fb85a 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -119,7 +119,7 @@
    -

    © Company 2011

    +

    © Company 2012

    -- cgit v1.2.3 From 22359f9dfdf5d513da163416005345649415b90f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 14:48:35 -0800 Subject: update examples and restore icons --- examples/fluid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index cb00fb85a..1f7551562 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -12,7 +12,7 @@ - + + @@ -30,98 +35,107 @@
    -
    +
    + + + + + Project name - -

    Logged in as username

    +
    + +

    Logged in as username

    +
    -
    -
    -
    -
      -
    • Sidebar
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • +
      +
      +
      +
      + +
      +
      +
      +
      +

      Hello, world!

      +

      This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

      +

      Learn more »

      +
      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +

      Heading

      +

      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

      +

      View details »

      +
      +
      +
      +
      -
    • Sidebar
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • +
      -
    • Sidebar
      • -
    • Link
      • -
    • Link
      • -
    • Link
      • -
    -
    -
    -
    - -
    -

    Hello, world!

    -

    Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    -

    Learn more »

    -
    - - -
    -
    -

    Heading

    -

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    -

    View details »

    -
    -
    -

    Heading

    -

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    -

    View details »

    -
    -
    -

    Heading

    -

    Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

    -

    View details »

    -
    -
    +
    +

    © Company 2012

    +
    -
    +
    - -
    -
    -

    Heading

    -

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    -

    View details »

    -
    -
    -

    Heading

    -

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    -

    View details »

    -
    -
    -

    Heading

    -

    Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

    -

    View details »

    -
    -
    -
    - -
    -

    © Company 2012

    -
    -
    -
    + + + + + - \ No newline at end of file + -- cgit v1.2.3 From ae7f94eeff733584cbdc80a2d13a85f136a7744e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 00:39:44 -0800 Subject: overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts --- examples/fluid.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index 1cdfd6568..738c52058 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -55,7 +55,7 @@
    -
    +
      @@ -84,7 +84,7 @@

      This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

      Learn more »

    -
    +

    Heading

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    @@ -101,7 +101,7 @@

    View details »

    -
    +

    Heading

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    -- cgit v1.2.3 From 0f3a073b8dca534e78c09b71999d5a2632e2245d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 21:15:57 -0800 Subject: *really* refactor the buttons and update them all over the docs --- examples/fluid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/fluid.html') diff --git a/examples/fluid.html b/examples/fluid.html index 738c52058..57ee5b091 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -82,7 +82,7 @@

    Hello, world!

    This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

    -

    Learn more »

    +

    Learn more »

    -- cgit v1.2.3