Mercurial > kallithea

changeset 3542:fc79b3d5beb7 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small new UI fixes
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 18 Mar 2013 18:16:23 +0100
parents 8fae93880c30
children 6af65ba41115
files rhodecode/public/css/contextbar.css rhodecode/public/css/style.css rhodecode/templates/base/base.html rhodecode/templates/repo_switcher_list.html
diffstat 4 files changed, 75 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/contextbar.css	Mon Mar 18 03:04:35 2013 +0100
+++ b/rhodecode/public/css/contextbar.css	Mon Mar 18 18:16:23 2013 +0100
@@ -7,35 +7,35 @@
 #quick .search { background-image: url("../images/icons/search_16.png"); }
 #quick .admin { background-image: url("../images/icons/cog_edit.png"); }
 
-#context-bar button.follow         { background-image: url("../images/icons/heart.png"); }
-#context-bar button.following    { background-image: url("../images/icons/heart_delete.png"); }
-#context-bar a.fork             { background-image: url("../images/icons/arrow_divide.png"); }
-#context-bar a.summary             { background-image: url("../images/icons/clipboard_16.png"); }
-#context-bar a.changelogs         { background-image: url("../images/icons/time.png"); }
-#context-bar a.files             { background-image: url("../images/icons/file.png"); }
-#context-bar a.switch-to         { background-image: url("../images/icons/arrow_switch.png"); }
-#context-bar a.options             { background-image: url("../images/icons/table_gear.png"); }
-#context-bar a.pull-request     { background-image: url("../images/icons/arrow_join.png"); }
-#context-bar a.branches         { background-image: url("../images/icons/arrow_branch.png"); }
-#context-bar a.tags             { background-image: url("../images/icons/tag_blue.png"); }
-#context-bar a.bookmarks        { background-image: url("../images/icons/tag_green.png"); }
-#context-bar a.settings         { background-image: url("../images/icons/cog.png"); }
-#context-bar a.shortlog         { background-image: url("../images/icons/time.png"); }
-#context-bar a.search             { background-image: url("../images/icons/search_16.png"); }
-#context-bar a.admin             { background-image: url("../images/icons/cog_edit.png"); }
+#context-bar button.follow { background-image: url("../images/icons/heart.png"); }
+#context-bar button.following { background-image: url("../images/icons/heart_delete.png"); }
+#context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); }
+#context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); }
+#context-bar a.changelogs { background-image: url("../images/icons/time.png"); }
+#context-bar a.files { background-image: url("../images/icons/file.png"); }
+#context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); }
+#context-bar a.options { background-image: url("../images/icons/table_gear.png"); }
+#context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); }
+#context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); }
+#context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
+#context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); }
+#context-bar a.settings { background-image: url("../images/icons/cog.png"); }
+#context-bar a.shortlog { background-image: url("../images/icons/time.png"); }
+#context-bar a.search { background-image: url("../images/icons/search_16.png"); }
+#context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); }
 
-#context-bar a.journal            { background-image: url("../images/icons/book.png"); }
-#context-bar a.repos             { background-image: url("../images/icons/database_edit.png"); }
-#context-bar a.repos_groups        { background-image: url("../images/icons/database_link.png"); }
-#context-bar a.users            { background-image: url("../images/icons/user_edit.png"); }
-#context-bar a.groups             { background-image: url("../images/icons/group_edit.png"); }
-#context-bar a.permissions      { background-image: url("../images/icons/key.png"); }
-#context-bar a.ldap             { background-image: url("../images/icons/server_key.png"); }
-#context-bar a.defaults            { background-image: url("../images/icons/wrench.png"); }
-#context-bar a.settings            { background-image: url("../images/icons/cog_edit.png"); }
-#context-bar a.compare_request  { background-image: url('../images/icons/arrow_inout.png')}
-#context-bar a.locking_del       { background-image: url('../images/icons/lock_delete.png')}
-#context-bar a.locking_add       { background-image: url('../images/icons/lock_add.png')}
+#context-bar a.journal { background-image: url("../images/icons/book.png"); }
+#context-bar a.repos { background-image: url("../images/icons/database_edit.png"); }
+#context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); }
+#context-bar a.users { background-image: url("../images/icons/user_edit.png"); }
+#context-bar a.groups { background-image: url("../images/icons/group_edit.png"); }
+#context-bar a.permissions { background-image: url("../images/icons/key.png"); }
+#context-bar a.ldap { background-image: url("../images/icons/server_key.png"); }
+#context-bar a.defaults { background-image: url("../images/icons/wrench.png"); }
+#context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); }
+#context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')}
+#context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')}
+#context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')}
 
 #content #context-bar {
     position: relative;
@@ -99,8 +99,8 @@
     top: -1px;
     min-width: 200px;
     max-height: 400px;
-    overflow-x:hidden;
-    overflow-y:auto;
+    overflow-x: hidden;
+    overflow-y: auto;
 }
 
 #header #header-inner #quick ul a,
@@ -109,7 +109,7 @@
 }
 
 #breadcrumbs {
-    float:left;
+    float: left;
     padding: 5px 0;
     padding-left: 5px;
     font-weight: bold;
@@ -206,12 +206,12 @@
 
 #content #context-actions li:first-child {
     border-left: none;
-    border-radius:4px 0 0px 4px;
+    border-radius: 4px 0 0px 4px;
 }
 
 #content #context-actions li:last-child {
     border-right: none;
-    border-radius:0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
 }
 
 #content  #context-actions .icon {
@@ -263,7 +263,7 @@
 }
 
 #content #context-pages .icon {
-    margin-right:5px;
+    margin-right: 5px;
 }
 
 #header #header-inner #quick li,
@@ -274,11 +274,11 @@
 }
 #header #header-inner #quick li:last-child,
 #content #context-pages li:last-child {
-    border-right:none;
+    border-right: none;
 }
 
 #header #header-inner #quick li:first-child {
-    border-left:none;
+    border-left: none;
 }
 
 #header #header-inner #quick > li:first-child > a {
@@ -294,6 +294,12 @@
     line-height: 35px;
 }
 
+#header #header-inner #quick a.thin,
+#context-pages a.thin,
+#context-pages .admin_menu a.thin {
+    line-height: 28px !important;
+}
+
 #header #header-inner #quick a#quick_login_link {
     padding-left: 0px;
 }
@@ -358,6 +364,4 @@
 
 #revision-changer .revision {
     text-transform: uppercase;
-}
-
-
+}
\ No newline at end of file
--- a/rhodecode/public/css/style.css	Mon Mar 18 03:04:35 2013 +0100
+++ b/rhodecode/public/css/style.css	Mon Mar 18 18:16:23 2013 +0100
@@ -460,6 +460,7 @@
     position: absolute;
     left: 0;
     top: 9px;
+    margin: 0px 2px 0px 2px;
 }
 
 #header #header-inner #quick li ul li a.journal, #header #header-inner #quick li ul li a.journal:hover {
@@ -482,6 +483,8 @@
 
 #header #header-inner #quick li ul li a.git, #header #header-inner #quick li ul li a.git:hover {
     background-image: url("../images/icons/giticon.png");
+    padding-left: 42px;
+    background-position: 20px 9px;
 }
 
 #header #header-inner #quick li ul li a.repos, #header #header-inner #quick li ul li a.repos:hover {
@@ -1708,11 +1711,11 @@
     border-top: none;
 }
 
-#summary-menu-stats a.followers         { background-image: url('../images/icons/heart.png')}
-#summary-menu-stats a.forks             { background-image: url('../images/icons/arrow_divide.png')}
-#summary-menu-stats a.settings          { background-image: url('../images/icons/cog_edit.png')}
-#summary-menu-stats a.feed              { background-image: url('../images/icons/rss_16.png')}
-#summary-menu-stats a.repo-size         { background-image: url('../images/icons/server.png')}
+#summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
+#summary-menu-stats a.forks { background-image: url('../images/icons/arrow_divide.png')}
+#summary-menu-stats a.settings { background-image: url('../images/icons/cog_edit.png')}
+#summary-menu-stats a.feed { background-image: url('../images/icons/rss_16.png')}
+#summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
 
 #summary-menu-stats a {
     display: block;
@@ -1980,7 +1983,7 @@
 }
 
 #quick_login .password_forgoten {
-    padding-right: 10px;
+    padding-right: 0px;
     padding-top: 0px;
     text-align: left;
 }
@@ -1988,6 +1991,8 @@
 #quick_login .password_forgoten a {
     font-size: 10px;
     color: #fff;
+    padding: 0px !important;
+    line-height: 20px !important;
 }
 
 #quick_login .register {
@@ -1999,6 +2004,8 @@
 #quick_login .register a {
     font-size: 10px;
     color: #fff;
+    padding: 0px !important;
+    line-height: 20px !important;    
 }
 
 #quick_login .submit {
@@ -2022,15 +2029,16 @@
     padding: 4px 0px 0px 6px;
 }
 #quick_login .notifications {
-    padding: 4px 0px 0px 6px;
+    padding: 2px 0px 0px 6px;
     color: #FFFFFF;
     font-weight: bold;
+    line-height: 10px !important;
 }
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
-    padding: 2px;
+    padding: 0px !important;
 }
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
@@ -3690,8 +3698,17 @@
     padding: 0 10px 10px;
 }
 
-#content div.box div.title ul.links li a:hover, #content div.box div.title ul.links li.ui-tabs-selected a {
-    color: #bfe3ff;
+#content div.box div.title ul.links li a:hover,
+#content div.box div.title ul.links li.ui-tabs-selected a {
+
+    background: #6388ad; /* Old browsers */
+    background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
+    background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
+    /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
 }
 
 #content div.box ol.lower-roman, #content div.box ol.upper-roman, #content div.box ol.lower-alpha, #content div.box ol.upper-alpha, #content div.box ol.decimal {
--- a/rhodecode/templates/base/base.html	Mon Mar 18 03:04:35 2013 +0100
+++ b/rhodecode/templates/base/base.html	Mon Mar 18 18:16:23 2013 +0100
@@ -69,7 +69,7 @@
 
 <%def name="admin_menu()">
   <ul class="admin_menu">
-      <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal')}</li>
+      <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
       <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
       <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
       <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
@@ -255,12 +255,12 @@
                 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                 <div class="email">${c.rhodecode_user.email}</div>
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
-                <div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
-                <div class="unread"><a href="${h.url('notifications')}">${_('Unread')}: ${c.unread_notifications}</a></div>
+                ##<div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
+                <div class="unread"><a href="${h.url('notifications')}">${_('Unread notifications')}: ${c.unread_notifications}</a></div>
             </div>
             <div class="links_right">
             <ol class="links">
-              <li>${h.link_to(_(u'Home'),h.url('home'))}</li>
+              ##<li>${h.link_to(_(u'Home'),h.url('home'))}</li>
               <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>
               <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
--- a/rhodecode/templates/repo_switcher_list.html	Mon Mar 18 03:04:35 2013 +0100
+++ b/rhodecode/templates/repo_switcher_list.html	Mon Mar 18 18:16:23 2013 +0100
@@ -11,6 +11,6 @@
       %elif not repo['dbrepo']['private'] and c.visual.show_public_icon:
              <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" />
       %endif
-      ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])}
+      ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name thin %s" % repo['dbrepo']['repo_type'])}
     </li>
 %endfor