Commit 91134115 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray Committed by Clement Ho

Align form labels following Bootstrap 4 docs

parent b7dfe76e
...@@ -93,7 +93,6 @@ hr { ...@@ -93,7 +93,6 @@ hr {
} }
.form-group.row .col-form-label { .form-group.row .col-form-label {
padding-top: 0;
// Bootstrap 4 aligns labels to the left // Bootstrap 4 aligns labels to the left
// for horizontal forms // for horizontal forms
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%legend %legend
Navigation bar: Navigation bar:
.form-group.row .form-group.row
= f.label :header_logo, 'Header logo', class: 'col-sm-2 col-form-label' = f.label :header_logo, 'Header logo', class: 'col-sm-2 col-form-label pt-0'
.col-sm-10 .col-sm-10
- if @appearance.header_logo? - if @appearance.header_logo?
= image_tag @appearance.header_logo_url, class: 'appearance-light-logo-preview' = image_tag @appearance.header_logo_url, class: 'appearance-light-logo-preview'
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%legend %legend
Favicon: Favicon:
.form-group.row .form-group.row
= f.label :favicon, 'Favicon', class: 'col-sm-2 col-form-label' = f.label :favicon, 'Favicon', class: 'col-sm-2 col-form-label pt-0'
.col-sm-10 .col-sm-10
- if @appearance.favicon? - if @appearance.favicon?
= image_tag @appearance.favicon_url, class: 'appearance-light-logo-preview' = image_tag @appearance.favicon_url, class: 'appearance-light-logo-preview'
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
.hint .hint
Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}. Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
.form-group.row .form-group.row
= f.label :logo, class: 'col-sm-2 col-form-label' = f.label :logo, class: 'col-sm-2 col-form-label pt-0'
.col-sm-10 .col-sm-10
- if @appearance.logo? - if @appearance.logo?
= image_tag @appearance.logo_url, class: 'appearance-logo-preview' = image_tag @appearance.logo_url, class: 'appearance-logo-preview'
......
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
for local tests for local tests
= content_tag :div, class: 'form-group row' do = content_tag :div, class: 'form-group row' do
= f.label :trusted, class: 'col-sm-2 col-form-label' = f.label :trusted, class: 'col-sm-2 col-form-label pt-0'
.col-sm-10 .col-sm-10
= f.check_box :trusted = f.check_box :trusted
%span.form-text.text-muted %span.form-text.text-muted
Trusted applications are automatically authorized on GitLab OAuth flow. Trusted applications are automatically authorized on GitLab OAuth flow.
.form-group.row .form-group.row
= f.label :scopes, class: 'col-sm-2 col-form-label' = f.label :scopes, class: 'col-sm-2 col-form-label pt-0'
.col-sm-10 .col-sm-10
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
......
.form-group.row .form-group.row
= f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label col-sm-2' = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label col-sm-2 pt-0'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :lfs_enabled, checked: @group.lfs_enabled?, class: 'form-check-input' = f.check_box :lfs_enabled, checked: @group.lfs_enabled?, class: 'form-check-input'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%span.descr This setting can be overridden in each project. %span.descr This setting can be overridden in each project.
.form-group.row .form-group.row
= f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2 pt-0'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.check_box :require_two_factor_authentication, class: 'form-check-input'
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= render 'shared/allow_request_access', form: f = render 'shared/allow_request_access', form: f
.form-group.row .form-group.row
%label.col-form-label.col-sm-2 %label.col-form-label.col-sm-2.pt-0
= s_('GroupSettings|Share with group lock') = s_('GroupSettings|Share with group lock')
.col-sm-10 .col-sm-10
.form-check .form-check
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.form-group.row.visibility-level-setting .form-group.row.visibility-level-setting
- if with_label - if with_label
= f.label :visibility_level, class: 'col-form-label col-sm-2' do = f.label :visibility_level, class: 'col-form-label col-sm-2 pt-0' do
Visibility Level Visibility Level
= link_to icon('question-circle'), help_page_path("public_access/public_access") = link_to icon('question-circle'), help_page_path("public_access/public_access")
%div{ :class => (with_label ? "col-sm-10" : "col-sm-12") } %div{ :class => (with_label ? "col-sm-10" : "col-sm-12") }
......
---
title: Align form labels following Bootstrap 4 docs
merge_request: 21752
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment