From 07e4455eeb9d5cffd806e5b45c8a618c90e69483 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Fri, 29 Jun 2018 14:34:26 +0000
Subject: Style updates for personal access token form

---
 app/views/shared/_personal_access_tokens_form.html.haml | 16 ++++++++++------
 app/views/shared/tokens/_scopes_form.html.haml          |  8 ++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'app/views/shared')

diff --git a/app/views/shared/_personal_access_tokens_form.html.haml b/app/views/shared/_personal_access_tokens_form.html.haml
index b8b1f4ca42f..28407b543b9 100644
--- a/app/views/shared/_personal_access_tokens_form.html.haml
+++ b/app/views/shared/_personal_access_tokens_form.html.haml
@@ -9,13 +9,17 @@
 
   = form_errors(token)
 
-  .form-group
-    = f.label :name, class: 'label-light'
-    = f.text_field :name, class: "form-control", required: true
+  .row
+    .form-group.col-md-6
+      = f.label :name, class: 'label-light'
+      = f.text_field :name, class: "form-control", required: true
 
-  .form-group
-    = f.label :expires_at, class: 'label-light'
-    = f.text_field :expires_at, class: "datepicker form-control"
+  .row
+    .form-group.col-md-6
+      = f.label :expires_at, class: 'label-light'
+      .input-icon-wrapper
+        = f.text_field :expires_at, class: "datepicker form-control", placeholder: 'YYYY-MM-DD'
+        = icon('calendar', { class: 'input-icon-right' })
 
   .form-group
     = f.label :scopes, class: 'label-light'
diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml
index e5c82962f82..dcb3fca23f2 100644
--- a/app/views/shared/tokens/_scopes_form.html.haml
+++ b/app/views/shared/tokens/_scopes_form.html.haml
@@ -3,7 +3,7 @@
 - token = local_assigns.fetch(:token)
 
 - scopes.each do |scope|
-  %fieldset
-    = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}"
-    = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: "label-light"
-    .scope-description= t scope, scope: [:doorkeeper, :scope_desc]
+  %fieldset.form-group.form-check
+    = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}", class: 'form-check-input'
+    = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: 'label-light form-check-label'
+    .text-secondary= t scope, scope: [:doorkeeper, :scope_desc]
-- 
cgit v1.2.3