changeset 3612:a8373e8fff51 beta

merge the two context menu bar stripes - save some vertical space
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Mar 2013 23:30:20 +0100
parents ceb7fdf4588a
children 6bc4b63bb225
files rhodecode/public/css/contextbar.css rhodecode/templates/base/base.html
diffstat 2 files changed, 6 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/contextbar.css	Tue Mar 26 23:29:54 2013 +0100
+++ b/rhodecode/public/css/contextbar.css	Tue Mar 26 23:30:20 2013 +0100
@@ -40,9 +40,12 @@
 
 #content #context-bar {
     position: relative;
-    background-color: #003B76 !important;
-    padding: 0px;
     overflow: visible;
+    background-color: #336699;
+    border-top: 1px solid #517da8;
+    border-bottom: 1px solid #003162;
+    padding: 0 5px;
+    min-height: 36px;
 }
 
 #header #header-inner #quick a,
@@ -109,7 +112,7 @@
 
 #breadcrumbs {
     float: left;
-    padding: 5px 0;
+    padding: 3px 0 5px 0;
     padding-left: 5px;
     font-weight: bold;
     font-size: 14px;
@@ -120,13 +123,6 @@
     font-size: 1.8em;
 }
 
-#context-top {
-    position: relative;
-    overflow: hidden;
-    border-bottom: 1px solid #003162;
-    padding: 5px;
-}
-
 #header #header-inner #quick ul,
 #revision-changer,
 #context-pages,
@@ -226,12 +222,6 @@
     display: none;
 }
 
-#context-state {
-    background-color: #336699;
-    border-top: 1px solid #517da8;
-    min-height: 36px;
-}
-
 #context-pages {
     float: right;
     border-left: 1px solid rgba(0,0,0,0.1);
--- a/rhodecode/templates/base/base.html	Tue Mar 26 23:29:54 2013 +0100
+++ b/rhodecode/templates/base/base.html	Tue Mar 26 23:30:20 2013 +0100
@@ -97,14 +97,11 @@
 
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
-    <div id="context-top">
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         &raquo;
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
       </div>
-    </div>
-    <div id="context-state">
       <ul id="context-pages" class="horizontal-list">
         <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li>
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li>
@@ -162,7 +159,6 @@
           </a>
         </li>
       </ul>
-    </div>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){