Merge branch 'v2' of github.com:neocities/neocities into v2

This commit is contained in:
Kyle Drake 2014-10-13 17:36:04 -07:00
commit 19bb544b78
2 changed files with 4 additions and 1 deletions

View file

@ -274,6 +274,9 @@
li { li {
width:100%; width:100%;
a {
float:left;
}
a:hover, a:focus { a:hover, a:focus {
background:#3C6670; background:#3C6670;
} }

View file

@ -46,7 +46,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="/site/<%= current_site.username %>">Profile</a></li> <li><a href="/site/<%= current_site.username %>">Profile</a></li>
<li> <li>
<a href="/?activity=mine">Activity <a href="/?activity=mine"><span class="float-Left">Activity</span>
<% if current_site.unseen_notifications_count > 0 %> <% if current_site.unseen_notifications_count > 0 %>
<span class="notification-value"><%= current_site.unseen_notifications_count %></span> <span class="notification-value"><%= current_site.unseen_notifications_count %></span>
<% end %> <% end %>