From 29e98571454a450f0af1e2649d1688c6f2afffdb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 21 Aug 2021 15:32:47 +0100 Subject: [PATCH] Improve behaviour of secondary action lists when wrapping Based on https://stackoverflow.com/a/31732902 this ensure that when a secondary action list wraps the additional lines don't start with an item delimiter by pushing it to the left, outside of a parent nav element which then hides it. --- app/assets/stylesheets/common.scss | 42 ++-- app/views/dashboards/_contact.html.erb | 22 +- app/views/dashboards/show.html.erb | 20 +- app/views/diary_entries/_diary_entry.html.erb | 50 ++-- app/views/diary_entries/index.html.erb | 28 ++- app/views/traces/_trace.html.erb | 18 +- app/views/user_blocks/_blocks.html.erb | 28 ++- app/views/user_blocks/edit.html.erb | 10 +- app/views/user_blocks/show.html.erb | 24 +- app/views/users/show.html.erb | 222 +++++++++--------- 10 files changed, 244 insertions(+), 220 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 16624dda1..ec2ec4dea 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1474,28 +1474,28 @@ abbr.geo { /* General styles for action lists / subnavs / pager navs */ -ul.secondary-actions { - font-style: normal; - margin-bottom: 0; - margin-left: 0; - padding: 0; - &.pager { - display: inline-block; - margin-right: 60px; - } - > li { - display: block; - float: left; - list-style: none; - border-left: 1px solid $grey; - padding-left: $lineheight/2; - margin-right: $lineheight/2; - &:first-child { - border-left: 0; - padding-left: 0; + +nav.secondary-actions { + margin-left: -11px; + overflow: hidden; + > ul { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-bottom: 0; + margin-left: -1px; + padding: 0; + &.pager { + display: inline-block; + margin-right: 60px; } - &:last-child { - margin-right: 0px; + > li { + flex-basis: auto; + list-style: none; + border-left: 1px solid $grey; + padding-left: $lineheight/2; + margin-right: $lineheight/2; + margin-bottom: $lineheight/8; } } } diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 3b46a3b45..545557e64 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -31,15 +31,17 @@ <% end %>

- + <% end %> diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb index 3fe27b779..f5feb9037 100644 --- a/app/views/dashboards/show.html.erb +++ b/app/views/dashboards/show.html.erb @@ -32,10 +32,12 @@ <% if friends.empty? %> <%= t ".no friends" %> <% else %> - +
<%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
@@ -48,10 +50,12 @@ <% if nearby.empty? %> <%= t ".no nearby users" %> <% else %> - +
<%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 946c6ce17..4080b8f95 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -23,31 +23,33 @@ <%= render :partial => "location", :object => diary_entry %> <% end %> - + diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 80561cbbf..6803c761e 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -6,19 +6,21 @@ <% end %>

<%= @title %>

- + <% end %> diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 44de2ef06..74e096dd1 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -44,14 +44,16 @@ <% if trace.inserted? %> - + <% end %> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index 8955852c1..b0b73c5a0 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -20,18 +20,20 @@ <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %> - + diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 882eb27b1..8c89c80f3 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -3,10 +3,12 @@

<%= t(".heading_html", :name => link_to(@user_block.user.display_name, user_path(@user_block.user))) %>

- + <% end %> <%= bootstrap_form_for(@user_block) do |f| %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index d686bda10..03bcd3036 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -8,17 +8,19 @@ user_path(@user_block.user)), :block_by => link_to(@user_block.creator.display_name, user_path(@user_block.creator))) %> - + <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 0ea411811..1c5d3dc64 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -7,109 +7,113 @@

<%= @user.display_name %> <%= role_icons(@user) %>

<% if current_user and @user.id == current_user.id %> - + <% else %> - + <% end %>

@@ -130,37 +134,39 @@ <% if can?(:set_status, User) || can?(:destroy, User) %> -

+ <% end %> <% if current_user and current_user.administrator? -%> -- 2.45.1