From d8c07ccc51c663ab1bd48fe7ee8ef5d5f57aeb46 Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Thu, 9 May 2013 13:24:10 -0400
Subject: [PATCH] adding split dropdown for icons and examples

---
 build/_includes/icons/brand.html              |  2 +-
 build/_includes/icons/directional.html        |  2 +-
 build/_includes/icons/medical.html            |  2 +-
 build/_includes/icons/new.html                |  2 +-
 build/_includes/icons/text-editor.html        |  2 +-
 build/_includes/icons/video-player.html       |  2 +-
 .../{web-app.html => web-application.html}    |  2 +-
 build/_includes/navbar.html                   | 29 +++++++++++++++----
 build/assets/css/site.css                     | 16 ++++++++++
 .../assets/font-awesome/css/font-awesome.css  | 12 +++-----
 build/assets/font-awesome/less/core.less      |  6 ++--
 build/assets/less/site.less                   | 18 +++++++++++-
 build/icons/index.html                        |  2 +-
 13 files changed, 71 insertions(+), 26 deletions(-)
 rename build/_includes/icons/{web-app.html => web-application.html} (99%)

diff --git a/build/_includes/icons/brand.html b/build/_includes/icons/brand.html
index b1e9b4fba..11260872d 100644
--- a/build/_includes/icons/brand.html
+++ b/build/_includes/icons/brand.html
@@ -1,4 +1,4 @@
-<section id="icons-brand" class="row">
+<section id="brand" class="row">
   <div class="span12">
     <h2 class="page-header">Brand Icons</h2>
   </div>
diff --git a/build/_includes/icons/directional.html b/build/_includes/icons/directional.html
index 740439703..7e03e7e1e 100644
--- a/build/_includes/icons/directional.html
+++ b/build/_includes/icons/directional.html
@@ -1,4 +1,4 @@
-<section id="icons-directional" class="row">
+<section id="directional" class="row">
   <div class="span12">
     <h2 class="page-header">Directional Icons</h2>
   </div>
diff --git a/build/_includes/icons/medical.html b/build/_includes/icons/medical.html
index bf25a5005..34e2790cf 100644
--- a/build/_includes/icons/medical.html
+++ b/build/_includes/icons/medical.html
@@ -1,4 +1,4 @@
-<section id="icons-medical" class="row">
+<section id="medical" class="row">
   <div class="span12">
     <h2 class="page-header">Medical Icons</h2>
   </div>
diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html
index 0108304ab..e33061aaa 100644
--- a/build/_includes/icons/new.html
+++ b/build/_includes/icons/new.html
@@ -1,4 +1,4 @@
-  <section id="icons-new">
+  <section id="new">
   {% if page.navbar_active == "icons" %}
   <div class="row">
     <div class="span8">
diff --git a/build/_includes/icons/text-editor.html b/build/_includes/icons/text-editor.html
index 2ad15b13c..68901ed73 100644
--- a/build/_includes/icons/text-editor.html
+++ b/build/_includes/icons/text-editor.html
@@ -1,4 +1,4 @@
-<section id="icons-text-editor" class="row">
+<section id="text-editor" class="row">
   <div class="span12">
     <h2 class="page-header">Text Editor Icons</h2>
   </div>
diff --git a/build/_includes/icons/video-player.html b/build/_includes/icons/video-player.html
index ba06308fc..9b983deef 100644
--- a/build/_includes/icons/video-player.html
+++ b/build/_includes/icons/video-player.html
@@ -1,4 +1,4 @@
-<section id="icons-video-player" class="row">
+<section id="video-player" class="row">
   <div class="span12">
     <h2 class="page-header">Video Player Icons</h2>
   </div>
diff --git a/build/_includes/icons/web-app.html b/build/_includes/icons/web-application.html
similarity index 99%
rename from build/_includes/icons/web-app.html
rename to build/_includes/icons/web-application.html
index 7b3e3b445..b7d93130a 100644
--- a/build/_includes/icons/web-app.html
+++ b/build/_includes/icons/web-application.html
@@ -1,5 +1,5 @@
 
-<section id="icons-web-app" class="row">
+<section id="web-application" class="row">
   <div class="span12">
     <h2 class="page-header">Web Application Icons</h2>
   </div>
diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html
index 83583a80e..75b4fcc2e 100644
--- a/build/_includes/navbar.html
+++ b/build/_includes/navbar.html
@@ -5,14 +5,31 @@
       <ul class="nav">
         <li{% if page.navbar_active == "home" %} class="active"{% endif %}><a href="{{ page.relative_path }}">Home</a></li>
         <li{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ page.relative_path }}get-started/">Get Started</a></li>
-        <li{% if page.navbar_active == "icons" %} class="active"{% endif %}><a href="{{ page.relative_path }}icons/">Icons</a></li>
-        <li{% if page.navbar_active == "examples" %} class="active"{% endif %}><a href="{{ page.relative_path }}examples/">Examples</a></li>
-        <li class="dropdown">
+        <li class="dropdown-split-left{% if page.navbar_active == "icons" %} active{% endif %}"><a href="{{ page.relative_path }}icons/">Icons</a></li>
+        <li class="dropdown dropdown-split-right{% if page.navbar_active == "icons" %} active{% endif %}">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <i class="icon-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu pull-right">
+          <li><a href="{{ page.relative_path }}icons/">Icons</a></li>
+          <li class="divider"></li>
+          <li><a href="{{ page.relative_path }}icons/#new">New Icons in {{ site.font_awesome.version }}</a></li>
+          <li><a href="{{ page.relative_path }}icons/#web-application">Web Application Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#text-editor">Text Editor Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#directional">Directional Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#video-player">Video Player Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#brand">Brand Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#medical">Medical Icons</a></li>
+        </ul>
+        </li>
+        <li class="dropdown-split-left{% if page.navbar_active == "examples" %} active{% endif %}"><a href="{{ page.relative_path }}examples/">Examples</a></li>
+        <li class="dropdown dropdown-split-right{% if page.navbar_active == "examples" %} active{% endif %}">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-            <b class="caret"></b>
+            <i class="icon-caret-down"></i>
           </a>
           <ul class="dropdown-menu pull-right">
-            <li class="nav-header">Examples</li>
+            <li><a href="{{ page.relative_path }}examples/">Examples</a></li>
+            <li class="divider"></li>
             <li><a href="{{ page.relative_path }}examples/#new-styles">New Styles</a></li>
             <li><a href="{{ page.relative_path }}examples/#inline-icons">Inline Icons</a></li>
             <li><a href="{{ page.relative_path }}examples/#larger-icons">Larger Icons</a></li>
@@ -34,7 +51,7 @@
         <li{% if page.navbar_active == "license" %} class="active"{% endif %}><a href="{{ page.relative_path }}license/">License</a></li>
       </ul>
       <ul class="nav pull-right">
-        <li><a href="mailto:{{ site.font_awesome.author.email }}"><i class="icon-envelope"></i> Me</a></li>
+        <li><a href="mailto:{{ site.font_awesome.author.email }}"><i class="icon-envelope"></i>&nbsp; Me</a></li>
       </ul>
     </div>
   </div>
diff --git a/build/assets/css/site.css b/build/assets/css/site.css
index ca957340f..e89550979 100644
--- a/build/assets/css/site.css
+++ b/build/assets/css/site.css
@@ -5795,6 +5795,16 @@ section {
   list-style-type: none;
   margin: 0;
 }
+.the-icons li [class^="icon-"],
+.the-icons li [class*=" icon-"] {
+  display: inline-block;
+  width: 1.2857142857142858em;
+  text-align: center;
+}
+.the-icons li [class^="icon-"].icon-large,
+.the-icons li [class*=" icon-"].icon-large {
+  width: 1.5714285714285714em;
+}
 .the-icons li a {
   display: block;
   cursor: pointer;
@@ -5897,3 +5907,9 @@ footer ul {
 footer .project {
   margin-top: 10px;
 }
+.navbar .nav > li.dropdown-split-right > a {
+  padding-left: 7px;
+}
+.navbar .nav > li.dropdown-split-left > a {
+  padding-right: 0;
+}
diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css
index 6ed0f7521..210539113 100644
--- a/build/assets/font-awesome/css/font-awesome.css
+++ b/build/assets/font-awesome/css/font-awesome.css
@@ -61,18 +61,14 @@ a [class*=" icon-"]:before {
   display: inline;
 }
 /* increased font size for icon-large */
-li [class^="icon-"],
-.nav li [class^="icon-"],
-li [class*=" icon-"],
-.nav li [class*=" icon-"] {
+[class^="icon-"].icon-fixed-width,
+[class*=" icon-"].icon-fixed-width {
   display: inline-block;
   width: 1.2857142857142858em;
   text-align: center;
 }
-li [class^="icon-"].icon-large,
-.nav li [class^="icon-"].icon-large,
-li [class*=" icon-"].icon-large,
-.nav li [class*=" icon-"].icon-large {
+[class^="icon-"].icon-fixed-width.icon-large,
+[class*=" icon-"].icon-fixed-width.icon-large {
   width: 1.5714285714285714em;
 }
 ul.icons-ul {
diff --git a/build/assets/font-awesome/less/core.less b/build/assets/font-awesome/less/core.less
index 5ef4d0fd1..45b23ef9b 100644
--- a/build/assets/font-awesome/less/core.less
+++ b/build/assets/font-awesome/less/core.less
@@ -33,9 +33,9 @@ a {
 }
 
 /* increased font size for icon-large */
-li, .nav li {
-  [class^="icon-"],
-  [class*=" icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
+  &.icon-fixed-width {
     display: inline-block;
     width: 18/14em;
     text-align: center;
diff --git a/build/assets/less/site.less b/build/assets/less/site.less
index 9ab78450e..9e6459029 100644
--- a/build/assets/less/site.less
+++ b/build/assets/less/site.less
@@ -1,5 +1,5 @@
 @import "twbs-2.3.1/bootstrap.less";
-@import "twbs-2.3.1/.less";
+@import "twbs-2.3.1/responsive-utilities.less";
 @import "sticky-footer.less";
 
 @import "mixins.less";
@@ -224,6 +224,15 @@ section {
   list-style-type: none;
   margin: 0;
   li {
+    [class^="icon-"],
+    [class*=" icon-"] {
+      display: inline-block;
+      width: 18/14em;
+      text-align: center;
+      &.icon-large {
+        width: 22/14em;
+      }
+    }
     a {
       display: block;
       &, &:hover { color: @grayDarker; }
@@ -344,3 +353,10 @@ footer {
 
   .project { margin-top: 10px; }
 }
+
+// makes dropdowns closer for split dropdown
+// Links
+.navbar .nav > li {
+  &.dropdown-split-right > a { padding-left: 7px; }
+  &.dropdown-split-left > a { padding-right: 0; }
+}
diff --git a/build/icons/index.html b/build/icons/index.html
index e2aab01b4..13c6de6c8 100644
--- a/build/icons/index.html
+++ b/build/icons/index.html
@@ -12,7 +12,7 @@ relative_path: ../
 
 <div class="container">
   {% include icons/new.html %}
-  {% include icons/web-app.html %}
+  {% include icons/web-application.html %}
   {% include icons/text-editor.html %}
   {% include icons/directional.html %}
   {% include icons/video-player.html %}