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

This commit is contained in:
Kyle Drake 2014-10-13 17:15:27 -07:00
commit 24d2368f6e
2 changed files with 20 additions and 2 deletions

View file

@ -274,7 +274,7 @@
li { li {
width:100%; width:100%;
a:hover { a:hover, a:focus {
background:#3C6670; background:#3C6670;
} }
} }
@ -287,6 +287,24 @@
padding: 0px 5px; padding: 0px 5px;
} }
} }
.dropdown-submenu {
float: left;
&:hover > a, &:focus > a {
background:#3C6670;
}
.dropdown-menu {
margin-left: -1px;
top: 0;
margin-top: -1px;
margin-right: 3px;
}
>a:after {
border-left-color: #fff;
}
}
} }
.constant-Nav{ .constant-Nav{
float:left; float:left;

View file

@ -59,7 +59,7 @@
<li><a href="/settings">Settings</a></li> <li><a href="/settings">Settings</a></li>
<% if current_site.other_sites_dataset.count > 0 %> <% if current_site.other_sites_dataset.count > 0 %>
<li class="dropdown-submenu pull-right"> <li class="dropdown-submenu pull-left">
<a tabindex="-1" href="#" onclick="return false">Switch Site</a> <a tabindex="-1" href="#" onclick="return false">Switch Site</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<% current_site.other_sites_dataset.select(:username).all.each do |site| %> <% current_site.other_sites_dataset.select(:username).all.each do |site| %>