##// END OF EJS Templates
small new UI fixes
marcink -
r3542:fc79b3d5 beta
parent child Browse files
Show More
@@ -7,35 +7,35 b''
7 #quick .search { background-image: url("../images/icons/search_16.png"); }
7 #quick .search { background-image: url("../images/icons/search_16.png"); }
8 #quick .admin { background-image: url("../images/icons/cog_edit.png"); }
8 #quick .admin { background-image: url("../images/icons/cog_edit.png"); }
9
9
10 #context-bar button.follow { background-image: url("../images/icons/heart.png"); }
10 #context-bar button.follow { background-image: url("../images/icons/heart.png"); }
11 #context-bar button.following { background-image: url("../images/icons/heart_delete.png"); }
11 #context-bar button.following { background-image: url("../images/icons/heart_delete.png"); }
12 #context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); }
12 #context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); }
13 #context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); }
13 #context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); }
14 #context-bar a.changelogs { background-image: url("../images/icons/time.png"); }
14 #context-bar a.changelogs { background-image: url("../images/icons/time.png"); }
15 #context-bar a.files { background-image: url("../images/icons/file.png"); }
15 #context-bar a.files { background-image: url("../images/icons/file.png"); }
16 #context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); }
16 #context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); }
17 #context-bar a.options { background-image: url("../images/icons/table_gear.png"); }
17 #context-bar a.options { background-image: url("../images/icons/table_gear.png"); }
18 #context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); }
18 #context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); }
19 #context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); }
19 #context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); }
20 #context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
20 #context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
21 #context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); }
21 #context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); }
22 #context-bar a.settings { background-image: url("../images/icons/cog.png"); }
22 #context-bar a.settings { background-image: url("../images/icons/cog.png"); }
23 #context-bar a.shortlog { background-image: url("../images/icons/time.png"); }
23 #context-bar a.shortlog { background-image: url("../images/icons/time.png"); }
24 #context-bar a.search { background-image: url("../images/icons/search_16.png"); }
24 #context-bar a.search { background-image: url("../images/icons/search_16.png"); }
25 #context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); }
25 #context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); }
26
26
27 #context-bar a.journal { background-image: url("../images/icons/book.png"); }
27 #context-bar a.journal { background-image: url("../images/icons/book.png"); }
28 #context-bar a.repos { background-image: url("../images/icons/database_edit.png"); }
28 #context-bar a.repos { background-image: url("../images/icons/database_edit.png"); }
29 #context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); }
29 #context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); }
30 #context-bar a.users { background-image: url("../images/icons/user_edit.png"); }
30 #context-bar a.users { background-image: url("../images/icons/user_edit.png"); }
31 #context-bar a.groups { background-image: url("../images/icons/group_edit.png"); }
31 #context-bar a.groups { background-image: url("../images/icons/group_edit.png"); }
32 #context-bar a.permissions { background-image: url("../images/icons/key.png"); }
32 #context-bar a.permissions { background-image: url("../images/icons/key.png"); }
33 #context-bar a.ldap { background-image: url("../images/icons/server_key.png"); }
33 #context-bar a.ldap { background-image: url("../images/icons/server_key.png"); }
34 #context-bar a.defaults { background-image: url("../images/icons/wrench.png"); }
34 #context-bar a.defaults { background-image: url("../images/icons/wrench.png"); }
35 #context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); }
35 #context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); }
36 #context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')}
36 #context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')}
37 #context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')}
37 #context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')}
38 #context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')}
38 #context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')}
39
39
40 #content #context-bar {
40 #content #context-bar {
41 position: relative;
41 position: relative;
@@ -99,8 +99,8 b' ul.horizontal-list > li ul ul {'
99 top: -1px;
99 top: -1px;
100 min-width: 200px;
100 min-width: 200px;
101 max-height: 400px;
101 max-height: 400px;
102 overflow-x:hidden;
102 overflow-x: hidden;
103 overflow-y:auto;
103 overflow-y: auto;
104 }
104 }
105
105
106 #header #header-inner #quick ul a,
106 #header #header-inner #quick ul a,
@@ -109,7 +109,7 b' ul.horizontal-list li a {'
109 }
109 }
110
110
111 #breadcrumbs {
111 #breadcrumbs {
112 float:left;
112 float: left;
113 padding: 5px 0;
113 padding: 5px 0;
114 padding-left: 5px;
114 padding-left: 5px;
115 font-weight: bold;
115 font-weight: bold;
@@ -206,12 +206,12 b' ul#context-actions {'
206
206
207 #content #context-actions li:first-child {
207 #content #context-actions li:first-child {
208 border-left: none;
208 border-left: none;
209 border-radius:4px 0 0px 4px;
209 border-radius: 4px 0 0px 4px;
210 }
210 }
211
211
212 #content #context-actions li:last-child {
212 #content #context-actions li:last-child {
213 border-right: none;
213 border-right: none;
214 border-radius:0 4px 4px 0;
214 border-radius: 0 4px 4px 0;
215 }
215 }
216
216
217 #content #context-actions .icon {
217 #content #context-actions .icon {
@@ -263,7 +263,7 b' ul#context-actions {'
263 }
263 }
264
264
265 #content #context-pages .icon {
265 #content #context-pages .icon {
266 margin-right:5px;
266 margin-right: 5px;
267 }
267 }
268
268
269 #header #header-inner #quick li,
269 #header #header-inner #quick li,
@@ -274,11 +274,11 b' ul#context-actions {'
274 }
274 }
275 #header #header-inner #quick li:last-child,
275 #header #header-inner #quick li:last-child,
276 #content #context-pages li:last-child {
276 #content #context-pages li:last-child {
277 border-right:none;
277 border-right: none;
278 }
278 }
279
279
280 #header #header-inner #quick li:first-child {
280 #header #header-inner #quick li:first-child {
281 border-left:none;
281 border-left: none;
282 }
282 }
283
283
284 #header #header-inner #quick > li:first-child > a {
284 #header #header-inner #quick > li:first-child > a {
@@ -294,6 +294,12 b' ul#context-actions {'
294 line-height: 35px;
294 line-height: 35px;
295 }
295 }
296
296
297 #header #header-inner #quick a.thin,
298 #context-pages a.thin,
299 #context-pages .admin_menu a.thin {
300 line-height: 28px !important;
301 }
302
297 #header #header-inner #quick a#quick_login_link {
303 #header #header-inner #quick a#quick_login_link {
298 padding-left: 0px;
304 padding-left: 0px;
299 }
305 }
@@ -358,6 +364,4 b' ul#context-actions {'
358
364
359 #revision-changer .revision {
365 #revision-changer .revision {
360 text-transform: uppercase;
366 text-transform: uppercase;
361 }
367 } No newline at end of file
362
363
@@ -460,6 +460,7 b' div:hover > a.permalink {'
460 position: absolute;
460 position: absolute;
461 left: 0;
461 left: 0;
462 top: 9px;
462 top: 9px;
463 margin: 0px 2px 0px 2px;
463 }
464 }
464
465
465 #header #header-inner #quick li ul li a.journal, #header #header-inner #quick li ul li a.journal:hover {
466 #header #header-inner #quick li ul li a.journal, #header #header-inner #quick li ul li a.journal:hover {
@@ -482,6 +483,8 b' div:hover > a.permalink {'
482
483
483 #header #header-inner #quick li ul li a.git, #header #header-inner #quick li ul li a.git:hover {
484 #header #header-inner #quick li ul li a.git, #header #header-inner #quick li ul li a.git:hover {
484 background-image: url("../images/icons/giticon.png");
485 background-image: url("../images/icons/giticon.png");
486 padding-left: 42px;
487 background-position: 20px 9px;
485 }
488 }
486
489
487 #header #header-inner #quick li ul li a.repos, #header #header-inner #quick li ul li a.repos:hover {
490 #header #header-inner #quick li ul li a.repos, #header #header-inner #quick li ul li a.repos:hover {
@@ -1708,11 +1711,11 b' div.form div.fields div.field div.button'
1708 border-top: none;
1711 border-top: none;
1709 }
1712 }
1710
1713
1711 #summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
1714 #summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
1712 #summary-menu-stats a.forks { background-image: url('../images/icons/arrow_divide.png')}
1715 #summary-menu-stats a.forks { background-image: url('../images/icons/arrow_divide.png')}
1713 #summary-menu-stats a.settings { background-image: url('../images/icons/cog_edit.png')}
1716 #summary-menu-stats a.settings { background-image: url('../images/icons/cog_edit.png')}
1714 #summary-menu-stats a.feed { background-image: url('../images/icons/rss_16.png')}
1717 #summary-menu-stats a.feed { background-image: url('../images/icons/rss_16.png')}
1715 #summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
1718 #summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
1716
1719
1717 #summary-menu-stats a {
1720 #summary-menu-stats a {
1718 display: block;
1721 display: block;
@@ -1980,7 +1983,7 b' a.metatag[tag="license"]:hover {'
1980 }
1983 }
1981
1984
1982 #quick_login .password_forgoten {
1985 #quick_login .password_forgoten {
1983 padding-right: 10px;
1986 padding-right: 0px;
1984 padding-top: 0px;
1987 padding-top: 0px;
1985 text-align: left;
1988 text-align: left;
1986 }
1989 }
@@ -1988,6 +1991,8 b' a.metatag[tag="license"]:hover {'
1988 #quick_login .password_forgoten a {
1991 #quick_login .password_forgoten a {
1989 font-size: 10px;
1992 font-size: 10px;
1990 color: #fff;
1993 color: #fff;
1994 padding: 0px !important;
1995 line-height: 20px !important;
1991 }
1996 }
1992
1997
1993 #quick_login .register {
1998 #quick_login .register {
@@ -1999,6 +2004,8 b' a.metatag[tag="license"]:hover {'
1999 #quick_login .register a {
2004 #quick_login .register a {
2000 font-size: 10px;
2005 font-size: 10px;
2001 color: #fff;
2006 color: #fff;
2007 padding: 0px !important;
2008 line-height: 20px !important;
2002 }
2009 }
2003
2010
2004 #quick_login .submit {
2011 #quick_login .submit {
@@ -2022,15 +2029,16 b' a.metatag[tag="license"]:hover {'
2022 padding: 4px 0px 0px 6px;
2029 padding: 4px 0px 0px 6px;
2023 }
2030 }
2024 #quick_login .notifications {
2031 #quick_login .notifications {
2025 padding: 4px 0px 0px 6px;
2032 padding: 2px 0px 0px 6px;
2026 color: #FFFFFF;
2033 color: #FFFFFF;
2027 font-weight: bold;
2034 font-weight: bold;
2035 line-height: 10px !important;
2028 }
2036 }
2029 #quick_login .notifications a,
2037 #quick_login .notifications a,
2030 #quick_login .unread a {
2038 #quick_login .unread a {
2031 color: #FFFFFF;
2039 color: #FFFFFF;
2032 display: block;
2040 display: block;
2033 padding: 2px;
2041 padding: 0px !important;
2034 }
2042 }
2035 #quick_login .notifications a:hover,
2043 #quick_login .notifications a:hover,
2036 #quick_login .unread a:hover {
2044 #quick_login .unread a:hover {
@@ -3690,8 +3698,17 b' div#legend_data, div#legend_container, d'
3690 padding: 0 10px 10px;
3698 padding: 0 10px 10px;
3691 }
3699 }
3692
3700
3693 #content div.box div.title ul.links li a:hover, #content div.box div.title ul.links li.ui-tabs-selected a {
3701 #content div.box div.title ul.links li a:hover,
3694 color: #bfe3ff;
3702 #content div.box div.title ul.links li.ui-tabs-selected a {
3703
3704 background: #6388ad; /* Old browsers */
3705 background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
3706 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+ */
3707 background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
3708 background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
3709 background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
3710 background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
3711 /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
3695 }
3712 }
3696
3713
3697 #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 {
3714 #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 {
@@ -69,7 +69,7 b''
69
69
70 <%def name="admin_menu()">
70 <%def name="admin_menu()">
71 <ul class="admin_menu">
71 <ul class="admin_menu">
72 <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal')}</li>
72 <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
73 <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
73 <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
74 <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
74 <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
75 <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
75 <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
@@ -255,12 +255,12 b''
255 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
255 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
256 <div class="email">${c.rhodecode_user.email}</div>
256 <div class="email">${c.rhodecode_user.email}</div>
257 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
257 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
258 <div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
258 ##<div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
259 <div class="unread"><a href="${h.url('notifications')}">${_('Unread')}: ${c.unread_notifications}</a></div>
259 <div class="unread"><a href="${h.url('notifications')}">${_('Unread notifications')}: ${c.unread_notifications}</a></div>
260 </div>
260 </div>
261 <div class="links_right">
261 <div class="links_right">
262 <ol class="links">
262 <ol class="links">
263 <li>${h.link_to(_(u'Home'),h.url('home'))}</li>
263 ##<li>${h.link_to(_(u'Home'),h.url('home'))}</li>
264 <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>
264 <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>
265 <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
265 <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
266 <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
266 <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
@@ -11,6 +11,6 b''
11 %elif not repo['dbrepo']['private'] and c.visual.show_public_icon:
11 %elif not repo['dbrepo']['private'] and c.visual.show_public_icon:
12 <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" />
12 <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" />
13 %endif
13 %endif
14 ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])}
14 ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name thin %s" % repo['dbrepo']['repo_type'])}
15 </li>
15 </li>
16 %endfor
16 %endfor
General Comments 0
You need to be logged in to leave comments. Login now