Mercurial > kallithea
changeset 2001:93d4e3eb7d84 beta
made upper menu always hover, looks nicer and produces less troubles
- added notification inbox into quick menu
- commented yet innactive compose message button
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 19 Feb 2012 19:36:42 +0200 |
parents | 72c525a7e7ad |
children | bdc0ad168006 |
files | rhodecode/public/css/style.css rhodecode/templates/admin/notifications/notifications.html rhodecode/templates/admin/notifications/show_notification.html rhodecode/templates/base/base.html rhodecode/templates/base/root.html |
diffstat | 5 files changed, 26 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Sun Feb 19 17:41:07 2012 +0200 +++ b/rhodecode/public/css/style.css Sun Feb 19 19:36:42 2012 +0200 @@ -284,7 +284,10 @@ width: 100% !important; margin-left: -10px !important; z-index: 10000; - border-radius: 0px 0px 4px 4px; + -webkit-border-radius: 0px 0px 0px 0px; + -khtml-border-radius: 0px 0px 0px 0px; + -moz-border-radius: 0px 0px 0px 0px; + border-radius: 0px 0px 0px 0px; } #header #header-inner #home a { height: 40px; @@ -326,7 +329,7 @@ float: right; list-style-type: none; list-style-position: outside; - margin: 8px 5px 0 0; + margin: 8px 8px 0 0; padding: 0; } @@ -1970,7 +1973,14 @@ #quick_login .big_gravatar{ padding:4px 0px 0px 6px; } - +#quick_login .inbox{ + padding:4px 0px 0px 6px; + color: #FFFFFF; + font-weight: bold; +} +#quick_login .inbox a{ + color: #FFFFFF; +} #quick_login .email,#quick_login .email a{ color: #FFFFFF; padding: 3px; @@ -3143,7 +3153,7 @@ #content { clear: both; overflow: hidden; - padding: 14px 10px; + padding: 54px 10px 14px 10px; } #content div.box div.title div.search {
--- a/rhodecode/templates/admin/notifications/notifications.html Sun Feb 19 17:41:07 2012 +0200 +++ b/rhodecode/templates/admin/notifications/notifications.html Sun Feb 19 19:36:42 2012 +0200 @@ -18,11 +18,11 @@ <!-- box / title --> <div class="title"> ${self.breadcrumbs()} - <ul class="links"> - <li> - <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> - </li> - </ul> + ##<ul class="links"> + ## <li> + ## <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> + ## </li> + ##</ul> </div> %if c.notifications: <div style="padding:10px 15px;text-align: right">
--- a/rhodecode/templates/admin/notifications/show_notification.html Sun Feb 19 17:41:07 2012 +0200 +++ b/rhodecode/templates/admin/notifications/show_notification.html Sun Feb 19 19:36:42 2012 +0200 @@ -20,11 +20,11 @@ <!-- box / title --> <div class="title"> ${self.breadcrumbs()} - <ul class="links"> - <li> - <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> - </li> - </ul> + ##<ul class="links"> + ## <li> + ## <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> + ## </li> + ##</ul> </div> <div class="table"> <div id="notification_${c.notification.notification_id}">
--- a/rhodecode/templates/base/base.html Sun Feb 19 17:41:07 2012 +0200 +++ b/rhodecode/templates/base/base.html Sun Feb 19 19:36:42 2012 +0200 @@ -3,7 +3,7 @@ <!-- HEADER --> <div id="header"> - <div id="header-inner" class="title"> + <div id="header-inner" class="title hover"> <div id="logo"> <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1> </div> @@ -115,6 +115,7 @@ <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="inbox"><a href="${h.url('notifications')}">${_('Inbox')}: ${c.unread_notifications}</a></div> </div> <div class="links_right"> <ol class="links">
--- a/rhodecode/templates/base/root.html Sun Feb 19 17:41:07 2012 +0200 +++ b/rhodecode/templates/base/root.html Sun Feb 19 19:36:42 2012 +0200 @@ -123,16 +123,6 @@ } } }); - - // hover menu - YUE.on(window,'scroll',function(){ - if(YUD.getDocumentScrollTop() > 45){ - YUD.addClass('header-inner','hover'); - } - else{ - YUD.removeClass('header-inner','hover'); - } - }) }) </script> </%def>