diff --git a/app/assets/stylesheets/config/_import.scss b/app/assets/stylesheets/config/_import.scss index 8dab34b9f..4dbbe43d2 100644 --- a/app/assets/stylesheets/config/_import.scss +++ b/app/assets/stylesheets/config/_import.scss @@ -43,11 +43,13 @@ $breakpoint-xs: 480px; $breakpoint-s: 640px; $breakpoint-m: 768px; $breakpoint-l: 1024px; +$breakpoint-xl: 1280px; $breakpoints: ( 's': $breakpoint-s, 'm': $breakpoint-m, 'l': $breakpoint-l, + 'xl': $breakpoint-xl, ); //////////////////////////////////////////////////////////////////////////////////// diff --git a/app/javascript/shared/components/useMediaQuery.js b/app/javascript/shared/components/useMediaQuery.js index 093e5d40b..ab3e60e1d 100644 --- a/app/javascript/shared/components/useMediaQuery.js +++ b/app/javascript/shared/components/useMediaQuery.js @@ -9,6 +9,7 @@ export const BREAKPOINTS = Object.freeze({ Small: 640, Medium: 768, Large: 1024, + ExtraLarge: 1280, }); /** diff --git a/app/views/admin/users/_member_index.html.erb b/app/views/admin/users/_member_index.html.erb index ab96ffdf0..f9a6fa9ac 100644 --- a/app/views/admin/users/_member_index.html.erb +++ b/app/views/admin/users/_member_index.html.erb @@ -1,47 +1,74 @@ -
+

Members

<%= render "admin/users/index/tabs" %>
<%= render "admin/users/index/controls" %> - -
-

Members

-
    + +
    +

    Members

    +
      <% @users.includes([:organization_memberships]).each do |user| %>
    • -
      - - <%= user.name %> - -

      <%= link_to user.name, admin_user_path(user), class: "color-base-80" %>

      - <%= link_to "@#{user.username}", admin_user_path(user), class: "color-base-60" %> +
      +
      + + <%= user.name %> + +
      +

      <%= link_to user.name, admin_user_path(user) %>

      +
      + @<%= user.username %> + +
      +
      +
      +
      + +
      -
      +
      - <% if user.suspended? %> - Suspended - <% elsif user.warned? %> - Warned - <% elsif user.comment_suspended? %> - Comment suspended - <% elsif user.trusted? %> - Trusted - <% else %> - Good standing - <% end %> + <% if user.suspended? %> + Suspended + <% elsif user.warned? %> + Warned + <% elsif user.comment_suspended? %> + Comment suspended + <% elsif user.trusted? %> + Trusted + <% else %> + Good standing + <% end %>
      -
      <%= cascading_high_level_roles(user) %> -
      -
      +
      Last activity
      <%= format_last_activity_timestamp(user.last_activity) %>
      @@ -66,33 +93,34 @@ <% end %>
    - + - - + + - + + <% @users.includes([:organization_memberships]).each do |user| %> + <% end %> - +
    <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users" %> diff --git a/app/views/admin/users/index/_controls.html.erb b/app/views/admin/users/index/_controls.html.erb index b18cd3bc9..cb20eae0b 100644 --- a/app/views/admin/users/index/_controls.html.erb +++ b/app/views/admin/users/index/_controls.html.erb @@ -3,7 +3,7 @@ <% if FeatureFlag.enabled?(:member_index_view) %> <% if params[:controller] == "admin/users" %> - <%= form_with url: admin_users_path, method: :get, local: true, class: "l:hidden" do |f| %> + <%= form_with url: admin_users_path, method: :get, local: true, class: "m:hidden" do |f| %>