cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user menu fix

Browse source
This commit is contained in:
Eden Halperin 2013-11-06 13:17:36 -05:00
parent 537d72b0f6
commit 89a132d31c
6 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/leaflet.key.js
View file

@ -6,7 +6,7 @@ L.OSM.key = function (options) {
.attr('class', 'control-key'); .attr('class', 'control-key');
var button = $('<a>') var button = $('<a>')
.attr('class', 'control-button') .attr('class', 'control-button mobile-hide')
.attr('href', '#') .attr('href', '#')
.html('<span class="icon key"></span>') .html('<span class="icon key"></span>')
.on('click', toggle) .on('click', toggle)

2
app/assets/javascripts/leaflet.layers.js
View file

@ -8,7 +8,7 @@ L.OSM.layers = function(options) {
.attr('class', 'control-layers'); .attr('class', 'control-layers');
var button = $('<a>') var button = $('<a>')
.attr('class', 'control-button') .attr('class', 'control-button mobile-hide')
.attr('href', '#') .attr('href', '#')
.attr('title', I18n.t('javascripts.map.layers.title')) .attr('title', I18n.t('javascripts.map.layers.title'))
.html('<span class="icon layers"></span>') .html('<span class="icon layers"></span>')

2
app/assets/javascripts/leaflet.share.js
View file

@ -11,7 +11,7 @@ L.OSM.share = function (options) {
.attr('class', 'control-share'); .attr('class', 'control-share');
var button = $('<a>') var button = $('<a>')
.attr('class', 'control-button') .attr('class', 'control-button mobile-hide')
.attr('href', '#') .attr('href', '#')
.attr('title', I18n.t('javascripts.share.title')) .attr('title', I18n.t('javascripts.share.title'))
.html('<span class="icon share"></span>') .html('<span class="icon share"></span>')

10
app/assets/stylesheets/common.css.scss
View file

@ -238,7 +238,7 @@ table {
/* Rules for the header */ /* Rules for the header */
#menu-icon { #menu-icon {
display: none; display: none !important;
float: right; float: right;
background: url("/assets/menu-icon.png") no-repeat; background: url("/assets/menu-icon.png") no-repeat;
background-size: 30px 30px; background-size: 30px 30px;
@ -252,7 +252,6 @@ table {
header { header {
height: $headerHeight; height: $headerHeight;
position: relative; position: relative;
// border-bottom: $keyline;
z-index: 1001; z-index: 1001;
font-size: 13px; font-size: 13px;
@ -357,8 +356,9 @@ nav.secondary {
position: absolute; position: absolute;
right: 0; right: 0;
> ul a, > ul {
.dropdown-toggle { vertical-align: middle;
a, .dropdown-toggle {
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
color: $darkgrey; color: $darkgrey;
@ -366,6 +366,7 @@ nav.secondary {
&:hover { color: darken($darkgrey, 10%); } &:hover { color: darken($darkgrey, 10%); }
} }
}
> ul li.current a { > ul li.current a {
color: darken($darkgrey, 25%); color: darken($darkgrey, 25%);
@ -381,6 +382,7 @@ nav.secondary {
> li { > li {
border-right: $border; border-right: $border;
float: left;
&:last-child { &:last-child {
border-right: 0; border-right: 0;

8
app/assets/stylesheets/small.css.scss
View file

@ -11,7 +11,7 @@
/* Rules for the whole left sidebar, including the logo */ /* Rules for the whole left sidebar, including the logo */
#menu-icon { #menu-icon {
display: inline-block; display: inline-block !important;
} }
@ -87,13 +87,13 @@ nav.secondary {
width: 100%; width: 100%;
position: fixed; position: fixed;
top: 58px; top: 58px;
height: 360px; height: 370px;
overflow-x: hidden; overflow-x: hidden;
z-index: 1; z-index: 1;
background: #fff; background: #fff;
p.large-text { p.large-text {
font-size: 1.4em; font-size: 1.2em;
line-height: 1.5em; line-height: 1.4em;
} }
&.minimized { &.minimized {
background: none; background: none;

2
app/views/layouts/_header.html.erb
View file

@ -71,7 +71,7 @@
</ul> </ul>
</div> </div>
<% else %> <% 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.log_in'), login_path(:referer => request.fullpath) %></li>
<li><%= link_to t('layouts.sign_up'), user_new_path %></li> <li><%= link_to t('layouts.sign_up'), user_new_path %></li>
</ul> </ul>