Skip to content

Improved user menu on mobile #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 14, 2018
Merged

Improved user menu on mobile #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
366dbeb
Improved user menu on mobile
mllocs Jun 12, 2018
c9d670a
Fixed indentation in navbar file
mllocs Jun 12, 2018
bb38d06
Reordered footer styles
mllocs Jun 13, 2018
6ef130e
Readjusted footer and content margins
mllocs Jun 13, 2018
45d95dd
Improved footer responsiveness
mllocs Jun 13, 2018
266ab16
Removed empty lines
mllocs Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions app/assets/stylesheets/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
.language-selector {
& {
display: inline-block;

@media(max-width: $screen-sm-min) {
display: block;
position: relative;
}
}

a.btn-default.dropdown-toggle {
& {
background-color: transparent;
border: 1px solid white;
}

&:hover {
background-color: transparent;
}
}

&.open > a.btn-default.dropdown-toggle {
& {
background-color: transparent;
color: white;
border-color: #ddd;
}

&:hover {
background-color: transparent;
color: white;
border-color: #ddd;
}
}
}

.footer {
padding: 8px 0;
line-height: 40px;
Expand Down Expand Up @@ -84,3 +48,39 @@
left: 0;
}
}

.language-selector {
& {
display: inline-block;

@media(max-width: $screen-sm-min) {
display: block;
position: relative;
}
}

a.btn-default.dropdown-toggle {
& {
background-color: transparent;
border: 1px solid white;
}

&:hover {
background-color: transparent;
}
}

&.open > a.btn-default.dropdown-toggle {
& {
background-color: transparent;
color: white;
border-color: #ddd;
}

&:hover {
background-color: transparent;
color: white;
border-color: #ddd;
}
}
}
7 changes: 4 additions & 3 deletions app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ html {

.content {
min-height: 500px;
margin-bottom: 36px;
margin-bottom: 76px;
}

.actions-menu {
Expand Down Expand Up @@ -419,7 +419,7 @@ form .checkbox input[type="checkbox"] {

.vertical-align {
position: absolute;
top: 48%;
top: 46%;
left: 50%;
transform: translate(-50%, -50%);
width: 100%;
Expand Down Expand Up @@ -686,8 +686,9 @@ form .checkbox input[type="checkbox"] {
font-size:55.5%;
}

.navbar-nav > li > a{
.navbar-nav > li {
text-align: center;
color: $palette-dark-turkey;
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/views/application/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="footer container-fluid">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 footer-left-col">
<div class="col-xs-12 col-sm-5 col-md-5 col-lg-4 footer-left-col">
<a href="http://community.coopdevs.org/" target="_blank"><%= t('layouts.application.help') %></a>
<%= link_to t('application.terms_conditions'), tnc_path, data: { target: '#modal', toggle: 'modal' } %>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 footer-center-col">
<div class="col-xs-12 col-sm-2 col-md-2 col-lg-4 footer-center-col">
<%= render 'application/menus/language_switcher' %>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 footer-right-col">
<div class="col-xs-12 col-sm-5 col-md-5 col-lg-4 footer-right-col">
<a href="https://twitter.com/timeoverflow" target="_blank">Twitter</a>
<a href="https://github.com/coopdevs/timeoverflow" target="_blank">Github</a>
</div>
Expand Down
56 changes: 32 additions & 24 deletions app/views/application/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,33 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>

<% if current_user && current_organization %>
<a class="navbar-brand" href="<%= organization_path(current_organization) %>">TimeOverflow</a>
<a class="navbar-brand" href="<%= organization_path(current_organization) %>">TimeOverflow</a>
<% else %>
<a class="navbar-brand" href="/">TimeOverflow</a>
<a class="navbar-brand" href="/">TimeOverflow</a>
<% end %>
</div>
</div>
<div class="col-xs-12 col-sm-9 col-md-9 col-lg-9">
<div id="navbar-collapse" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav navbar-right hidden-xs">
<% if current_user %>
<%= render 'application/menus/user_admin_menu' %>
<% else %>
<%= render 'application/menus/visitor_menu' %>
<% end %>
</ul>

<ul class="nav navbar-nav navbar-right hidden-sm hidden-md hidden-lg">
<% if current_user %>
<li>
<%= link_to t("layouts.application.login"), new_user_session_path %>
</li>
<li>
<%= link_to t("layouts.application.about"), page_path("about") %>
<%= image_tag avatar_url(current_user) %>
<%= current_user.email %>
</li>
<%= render 'application/menus/user_admin_menu_items' %>
<% else %>
<%= render 'application/menus/visitor_menu' %>
<% end %>
</ul>
</div>
Expand All @@ -39,23 +47,23 @@
</nav>

<% if current_user && current_organization %>
<nav role="navigation">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<ul class="nav nav-pills actions-menu">
<%= render 'application/menus/user_list_link' %>
<%= render 'application/menus/offers_dashboard_link' %>
<%= render 'application/menus/inquiries_list_link' %>
<% if current_user.manages? current_organization %>
<%= render 'application/menus/offers_by_tag_link' %>
<%= render 'application/menus/organization_reports_menu' %>
<%= render 'application/menus/organization_statistics_menu' %>
<%= render 'application/menus/organization_listings_menu' %>
<% end %>
</ul>
<nav role="navigation">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<ul class="nav nav-pills actions-menu">
<%= render 'application/menus/user_list_link' %>
<%= render 'application/menus/offers_dashboard_link' %>
<%= render 'application/menus/inquiries_list_link' %>
<% if current_user.manages? current_organization %>
<%= render 'application/menus/offers_by_tag_link' %>
<%= render 'application/menus/organization_reports_menu' %>
<%= render 'application/menus/organization_statistics_menu' %>
<%= render 'application/menus/organization_listings_menu' %>
<% end %>
</ul>
</div>
</div>
</div>
</div>
</nav>
</nav>
<% end %>
34 changes: 1 addition & 33 deletions app/views/application/menus/_user_admin_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,6 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<% if superadmin? %>
<li role="presentation">
<%= link_to admin_root_path do %>
<%= glyph :cog %>
<%= t "application.navbar.adminshort" %>
<% end %>
</li>
<% end %>
<li role="presentation">
<%= link_to destroy_user_session_path, method: :delete do %>
<%= glyph :log_out %>
<%= t "application.navbar.sign_out" %>
<% end %>
</li>
<li class="divider" role="presentation"></li>
<% if current_user.organizations.count > 1 %>
<%= render 'application/menus/organization_switcher' %>
<li class="divider" role="presentation"></li>
<% end %>
<li role="presentation">
<%= link_to current_user do %>
<%= glyph :user %>
<%= t "layouts.application.edit_profile" %>
<% end %>
</li>
<% current_user.members.where(manager: true).each do |m| %>
<li role="presentation">
<%= link_to m.organization do %>
<%= glyph :pencil %>
<%= t "layouts.application.edit_org", organization: m.organization %>
<% end %>
</li>
<% end %>
<%= render 'application/menus/user_admin_menu_items' %>
</ul>
</li>
38 changes: 38 additions & 0 deletions app/views/application/menus/_user_admin_menu_items.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<% if current_user.organizations.count > 1 %>
<%= render 'application/menus/organization_switcher' %>
<li class="divider" role="presentation"></li>
<% end %>

<li role="presentation">
<%= link_to current_user do %>
<%= glyph :user %>
<%= t "layouts.application.edit_profile" %>
<% end %>
</li>

<% current_user.members.where(manager: true).each do |m| %>
<li role="presentation">
<%= link_to m.organization do %>
<%= glyph :pencil %>
<%= t "layouts.application.edit_org", organization: m.organization %>
<% end %>
</li>
<% end %>

<% if superadmin? %>
<li role="presentation">
<%= link_to admin_root_path do %>
<%= glyph :cog %>
<%= t "application.navbar.adminshort" %>
<% end %>
</li>
<% end %>

<li class="divider" role="presentation"></li>

<li role="presentation">
<%= link_to destroy_user_session_path, method: :delete do %>
<%= glyph :log_out %>
<%= t "application.navbar.sign_out" %>
<% end %>
</li>
2 changes: 2 additions & 0 deletions app/views/application/menus/_visitor_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<li><%= link_to t("layouts.application.login"), new_user_session_path %></li>
<li><%= link_to t("layouts.application.about"), page_path("about") %></li>