From 68b4b34b76450be4fa3807096ed0b6b416b122b4 Mon Sep 17 00:00:00 2001
From: David Eads <davideads@gmail.com>
Date: Tue, 12 Jun 2012 00:30:56 -0500
Subject: [PATCH] Clean up icons and bad style rules

---
 themes/townsquare_bootstrap/css/townsquare-bootstrap.css | 3 ---
 themes/townsquare_bootstrap/templates/page.tpl.php       | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/themes/townsquare_bootstrap/css/townsquare-bootstrap.css b/themes/townsquare_bootstrap/css/townsquare-bootstrap.css
index b7fbeb0..47cfc19 100644
--- a/themes/townsquare_bootstrap/css/townsquare-bootstrap.css
+++ b/themes/townsquare_bootstrap/css/townsquare-bootstrap.css
@@ -3,9 +3,6 @@ body { padding-top: 68px; }
 #navigation .brand { font-size: 15px; line-height: 20px; }
 .form-actions, .form-horizontal .form-actions { padding: 9px 0; margin-top: 18px; background: transparent; }
 .form-actions button, .form-actions input { margin-right: 5px; }
-body #main-content * {
-  line-height: 1.6;
-}
 #main-content p, #main-content ul {
   font-size: 15px;
 }
diff --git a/themes/townsquare_bootstrap/templates/page.tpl.php b/themes/townsquare_bootstrap/templates/page.tpl.php
index fb4b584..fed157d 100644
--- a/themes/townsquare_bootstrap/templates/page.tpl.php
+++ b/themes/townsquare_bootstrap/templates/page.tpl.php
@@ -23,7 +23,7 @@
       <ul class="nav pull-right" id="secondary-menu">
         <li class="dropdown nav-collapse" id="secondary-menu-children">
           <a class="dropdown-toggle" data-toggle="dropdown">
-            <i class="caret"></i> <?php print $user_name; ?>
+            <?php print $user_name; ?><i class="icon-caret-down"></i>
             <?php if (isset($user_picture)): ?>
             <div class="user-picture"><?php print $user_picture; ?></div>
             <?php endif; ?>
@@ -41,7 +41,7 @@
       <ul class="nav pull-right" id="admin-menu">
         <li class="dropdown nav-collapse" id="admin-menu-children">
           <a class="dropdown-toggle" data-toggle="dropdown">
-            <i class="caret"></i> <?php print t('Administer'); ?><i class="icon-cog"></i>
+            <i class="icon-cog"></i><?php print t('Administer'); ?><i class="icon-caret-down"></i>
           </a>
           <?php print render($admin_menu); ?>
         </li>
@@ -52,7 +52,7 @@
     <div class="menu">
       <ul class="nav pull-right" id="login-block">
       <li class="dropdown">
-        <?php print t('<a class="dropdown-toggle" data-toggle="dropdown"><i class="icon-flag"></i> Want to participate? Login or sign up <i class="caret"></i></a>'); ?>
+        <?php print t('<a class="dropdown-toggle" data-toggle="dropdown"><i class="icon-flag"></i> Want to participate? Login or sign up <i class="icon-caret-down"></i></a>'); ?>
         <div class="dropdown-menu" id="login-block-form">
           <?php print render($login); ?>
         </div>