diff --git a/app/admin/user.rb b/app/admin/user.rb index ada5346ee..2bec1c543 100644 --- a/app/admin/user.rb +++ b/app/admin/user.rb @@ -71,6 +71,7 @@ end column :entry_date column :member_uid + column :tag_list end end end diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 70a3b582d..606f11684 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,12 +11,12 @@ html { } .content { - margin-bottom: 76px; + margin-bottom: 120px; } .actions-menu { - margin-bottom: 16px; - padding: 0 15px; + margin-bottom: 10px; + padding: 0 10px; @media(max-width: $screen-sm-min) { padding: 0; @@ -670,6 +670,10 @@ label[required]::after{ margin: 0 !important; } +.organization-logo { + padding-top: 120px; +} + .input__password-eye { display: flex; align-items: center; diff --git a/app/assets/stylesheets/application/member-card.scss b/app/assets/stylesheets/application/member-card.scss index c72c603eb..6592e33f6 100644 --- a/app/assets/stylesheets/application/member-card.scss +++ b/app/assets/stylesheets/application/member-card.scss @@ -37,13 +37,6 @@ } } - &__tags { - a { - margin-left: 4px; - color: white; - } - } - &__activity { font-size: 14px; color: #78adb9; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 277101bb6..c34d8186b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,7 @@ def organization_logo return unless org && org.logo.attached? return if "#{controller_name}##{action_name}".in? %w(organizations#index pages#show) - content_tag(:div, class: "row") do + content_tag(:div, class: "row organization-logo") do image_tag(org.logo.variant(resize: "x200^"), class: 'img-responsive center-block') end end diff --git a/app/views/inquiries/index.html.erb b/app/views/inquiries/index.html.erb index 95d440ac1..9da125371 100644 --- a/app/views/inquiries/index.html.erb +++ b/app/views/inquiries/index.html.erb @@ -1,38 +1,32 @@ -
-
-
-

- <%= Inquiry.model_name.human(count: :many) %> - <%= render "shared/show_filter_hint" %> -

-
+
+
+

+ <%= Inquiry.model_name.human(count: :many) %> + <%= render "shared/show_filter_hint" %> +

-
-
- <%= render "shared/post_filters", base_path: inquiries_path %> +
+ <%= render "shared/post_filters", base_path: inquiries_path %> -
- <% if current_user && current_organization && !params[:org] %> -
    -
  • - <%= link_to new_inquiry_path do %> - <%= glyph :plus %> - <%= t "helpers.submit.create", model: Inquiry.model_name.human %> - <% end %> -
    • -
- <% end %> -
+
+ <% if current_user && current_organization && !params[:org] %> +
    +
  • + <%= link_to new_inquiry_path do %> + <%= glyph :plus %> + <%= t "helpers.submit.create", model: Inquiry.model_name.human %> + <% end %> +
    • +
+ <% end %>
-
-
-
- <%= render "shared/posts", posts: @inquiries %> -
+
+
+ <%= render "shared/posts", posts: @inquiries %>
diff --git a/app/views/inquiries/show.html.erb b/app/views/inquiries/show.html.erb index 388c15283..f9c651b4a 100644 --- a/app/views/inquiries/show.html.erb +++ b/app/views/inquiries/show.html.erb @@ -1,8 +1,8 @@ <% if @inquiry.organization == current_organization %> -

+

<% if admin? or @inquiry.user == current_user %> <%= render 'shared/post_actions', post: @inquiry %> <% end %> -

+
<% end %> <%= render "shared/post", post: @inquiry %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d97dea288..41e21caf0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,9 @@ <%= render 'navbar' %>
<%= render 'layouts/messages' unless devise_controller? %> - <%= yield %> +
+ <%= yield %> +
<%= organization_logo %>