Improve the request / withdraw access button

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG

@@ -31,8 +31,9 @@ v 8.10.0 (unreleased)
   - Add basic system information like memory and disk usage to the admin panel
 v 8.9.5 (unreleased)
-  - Fix assigning shared runners as admins
-  - Show "locked" label for locked runners on runners admin
+  - Improve the request / withdraw access button. !4860
+  - Fix assigning shared runners as admins. !4961
+  - Show "locked" label for locked runners on runners admin. !4961
 v 8.9.4
   - Fix privilege escalation issue with OAuth external users.

app/assets/stylesheets/framework/mobile.scss

@@ -71,6 +71,10 @@
     display: none;
   }
+  .group-right-buttons {
+    display: none;
+  }
+
   .container .title {
     padding-left: 15px !important;
   }

app/assets/stylesheets/pages/groups.scss

@@ -41,14 +41,17 @@
 }
 .groups-cover-block {
-
   .container-fluid {
     position: relative;
   }
-  .access-request-button {
+  .group-right-buttons {
+    position: absolute;
+    right: 16px;
+    .btn {
       @include btn-gray;
-    margin-right: 10px;
-    text-transform: none;
+      padding: 3px 10px;
+      background-color: $background-color;
+    }
   }
 }

app/assets/stylesheets/pages/projects.scss

@@ -266,18 +266,6 @@
     @media (max-width: $screen-md-max) {
       top: 0;
     }
-
-    .access-request-button {
-      position: absolute;
-      right: 0;
-      bottom: 61px;
-
-      @media (max-width: $screen-md-max) {
-        position: relative;
-        bottom: 0;
-        margin-right: 10px;
-      }
-    }
   }
   @media (max-width: $screen-md-max) {

app/views/groups/show.html.haml

@@ -15,18 +15,15 @@
           %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
             = visibility_level_icon(@group.visibility_level, fw: false)
-        %span.hidden-xs
-          = render 'shared/notifications/button', notification_setting: @notification_setting
-
+        .group-right-buttons.btn-group
           - if current_user
-          .pull-right
-            = render 'shared/members/access_request_buttons', source: @group
+            .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @group
+          = render 'shared/notifications/button', notification_setting: @notification_setting
       - if @group.description.present?
         .cover-desc.description
           = markdown(@group.description, pipeline: :description)
-
 %div{ class: container_class }
   .top-area
     %ul.nav-links

app/views/projects/_home_panel.html.haml

@@ -31,7 +31,7 @@
       .project-repo-buttons.btn-group.project-right-buttons
         - if current_user
-          = render 'shared/members/access_request_buttons', source: @project
+          .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @project
         = render "projects/buttons/download"
         = render 'projects/buttons/dropdown'

app/views/shared/members/_access_request_buttons.html.haml

@@ -7,8 +7,8 @@
       = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]),
                 method: :delete,
                 data: { confirm: remove_member_message(member) },
-                class: 'btn access-request-button hidden-xs'
+                class: 'btn'
   - else
     = link_to 'Request Access', polymorphic_path([:request_access, source, :members]),
               method: :post,
-              class: 'btn access-request-button hidden-xs'
+              class: 'btn'

doc/workflow/groups.md

@@ -51,7 +51,7 @@ If necessary, you can increase the access level of an individual user for a spec
 ![Barry effectively has 'Master' access to GitLab CI now](groups/override_access_level.png)
-## Request access to a group
+## Requesting access to a group
 As a user, you can request to be a member of a group. Go to the group you'd
 like to be a member of, and click the **Request Access** button on the right