user menu fix
This commit is contained in:
parent
537d72b0f6
commit
89a132d31c
6 changed files with 19 additions and 17 deletions
|
@ -6,7 +6,7 @@ L.OSM.key = function (options) {
|
|||
.attr('class', 'control-key');
|
||||
|
||||
var button = $('<a>')
|
||||
.attr('class', 'control-button')
|
||||
.attr('class', 'control-button mobile-hide')
|
||||
.attr('href', '#')
|
||||
.html('<span class="icon key"></span>')
|
||||
.on('click', toggle)
|
||||
|
|
|
@ -8,7 +8,7 @@ L.OSM.layers = function(options) {
|
|||
.attr('class', 'control-layers');
|
||||
|
||||
var button = $('<a>')
|
||||
.attr('class', 'control-button')
|
||||
.attr('class', 'control-button mobile-hide')
|
||||
.attr('href', '#')
|
||||
.attr('title', I18n.t('javascripts.map.layers.title'))
|
||||
.html('<span class="icon layers"></span>')
|
||||
|
|
|
@ -11,7 +11,7 @@ L.OSM.share = function (options) {
|
|||
.attr('class', 'control-share');
|
||||
|
||||
var button = $('<a>')
|
||||
.attr('class', 'control-button')
|
||||
.attr('class', 'control-button mobile-hide')
|
||||
.attr('href', '#')
|
||||
.attr('title', I18n.t('javascripts.share.title'))
|
||||
.html('<span class="icon share"></span>')
|
||||
|
|
|
@ -238,7 +238,7 @@ table {
|
|||
/* Rules for the header */
|
||||
|
||||
#menu-icon {
|
||||
display: none;
|
||||
display: none !important;
|
||||
float: right;
|
||||
background: url("/assets/menu-icon.png") no-repeat;
|
||||
background-size: 30px 30px;
|
||||
|
@ -252,7 +252,6 @@ table {
|
|||
header {
|
||||
height: $headerHeight;
|
||||
position: relative;
|
||||
// border-bottom: $keyline;
|
||||
z-index: 1001;
|
||||
font-size: 13px;
|
||||
|
||||
|
@ -357,8 +356,9 @@ nav.secondary {
|
|||
position: absolute;
|
||||
right: 0;
|
||||
|
||||
> ul a,
|
||||
.dropdown-toggle {
|
||||
> ul {
|
||||
vertical-align: middle;
|
||||
a, .dropdown-toggle {
|
||||
display: inline-block;
|
||||
text-decoration: none;
|
||||
color: $darkgrey;
|
||||
|
@ -366,6 +366,7 @@ nav.secondary {
|
|||
|
||||
&:hover { color: darken($darkgrey, 10%); }
|
||||
}
|
||||
}
|
||||
|
||||
> ul li.current a {
|
||||
color: darken($darkgrey, 25%);
|
||||
|
@ -381,6 +382,7 @@ nav.secondary {
|
|||
|
||||
> li {
|
||||
border-right: $border;
|
||||
float: left;
|
||||
&:last-child {
|
||||
border-right: 0;
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
/* Rules for the whole left sidebar, including the logo */
|
||||
|
||||
#menu-icon {
|
||||
display: inline-block;
|
||||
display: inline-block !important;
|
||||
}
|
||||
|
||||
|
||||
|
@ -87,13 +87,13 @@ nav.secondary {
|
|||
width: 100%;
|
||||
position: fixed;
|
||||
top: 58px;
|
||||
height: 360px;
|
||||
height: 370px;
|
||||
overflow-x: hidden;
|
||||
z-index: 1;
|
||||
background: #fff;
|
||||
p.large-text {
|
||||
font-size: 1.4em;
|
||||
line-height: 1.5em;
|
||||
font-size: 1.2em;
|
||||
line-height: 1.4em;
|
||||
}
|
||||
&.minimized {
|
||||
background: none;
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
<% else %>
|
||||
<ul class="user-menu">
|
||||
<ul class="user-menu clearfix">
|
||||
<li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath) %></li>
|
||||
<li><%= link_to t('layouts.sign_up'), user_new_path %></li>
|
||||
</ul>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue