diff --git a/rhodecode/public/css/contextbar.css b/rhodecode/public/css/contextbar.css --- a/rhodecode/public/css/contextbar.css +++ b/rhodecode/public/css/contextbar.css @@ -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 @@ ul.horizontal-list > li ul ul { 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 @@ ul.horizontal-list li a { } #breadcrumbs { - float:left; + float: left; padding: 5px 0; padding-left: 5px; font-weight: bold; @@ -206,12 +206,12 @@ ul#context-actions { #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 @@ ul#context-actions { } #content #context-pages .icon { - margin-right:5px; + margin-right: 5px; } #header #header-inner #quick li, @@ -274,11 +274,11 @@ ul#context-actions { } #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 @@ ul#context-actions { 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 @@ ul#context-actions { #revision-changer .revision { text-transform: uppercase; -} - - +} \ No newline at end of file diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -460,6 +460,7 @@ div:hover > a.permalink { 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 @@ div:hover > a.permalink { #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 @@ div.form div.fields div.field div.button 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 @@ a.metatag[tag="license"]:hover { } #quick_login .password_forgoten { - padding-right: 10px; + padding-right: 0px; padding-top: 0px; text-align: left; } @@ -1988,6 +1991,8 @@ a.metatag[tag="license"]:hover { #quick_login .password_forgoten a { font-size: 10px; color: #fff; + padding: 0px !important; + line-height: 20px !important; } #quick_login .register { @@ -1999,6 +2004,8 @@ a.metatag[tag="license"]:hover { #quick_login .register a { font-size: 10px; color: #fff; + padding: 0px !important; + line-height: 20px !important; } #quick_login .submit { @@ -2022,15 +2029,16 @@ a.metatag[tag="license"]:hover { 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 @@ div#legend_data, div#legend_container, d 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 { diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -69,7 +69,7 @@ <%def name="admin_menu()">