diff options
Diffstat (limited to 'app/views')
36 files changed, 53 insertions, 53 deletions
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index 4cd2941202c..f40dd347eb3 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :gravatar_enabled do = f.check_box :gravatar_enabled diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml index 5c10b9e3922..da7248337d2 100644 --- a/app/views/admin/application_settings/_background_jobs.html.haml +++ b/app/views/admin/application_settings/_background_jobs.html.haml @@ -7,7 +7,7 @@ = link_to 'restart', help_page_path('administration/restart_gitlab') to take effect. .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :sidekiq_throttling_enabled do = f.check_box :sidekiq_throttling_enabled diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index f9788c15e5f..a16aeee7ee0 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :auto_devops_enabled do = f.check_box :auto_devops_enabled @@ -18,7 +18,7 @@ .form-text.text-muted = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.") .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :shared_runners_enabled do = f.check_box :shared_runners_enabled diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index fbcf9126a28..7443f02ad15 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :email_author_in_body do = f.check_box :email_author_in_body @@ -13,7 +13,7 @@ Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :html_emails_enabled do = f.check_box :html_emails_enabled diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index fbba8cae660..97d397788c6 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -8,7 +8,7 @@ = f.text_area :help_page_text, class: 'form-control', rows: 4 .form-text.text-muted Markdown enabled .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :help_page_hide_commercial_content do = f.check_box :help_page_hide_commercial_content diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml index 84ed00c350b..e5d699f9a2f 100644 --- a/app/views/admin/application_settings/_influx.html.haml +++ b/app/views/admin/application_settings/_influx.html.haml @@ -9,7 +9,7 @@ to take effect. = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction') .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :metrics_enabled do = f.check_box :metrics_enabled diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml index d9dc8634b9f..539ff9b5168 100644 --- a/app/views/admin/application_settings/_ip_limits.html.haml +++ b/app/views/admin/application_settings/_ip_limits.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :throttle_unauthenticated_enabled do = f.check_box :throttle_unauthenticated_enabled @@ -19,7 +19,7 @@ .col-sm-10 = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control' .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :throttle_authenticated_api_enabled do = f.check_box :throttle_authenticated_api_enabled @@ -35,7 +35,7 @@ .col-sm-10 = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control' .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :throttle_authenticated_web_enabled do = f.check_box :throttle_authenticated_web_enabled diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml index 9d3cef89a47..0532f49fd5b 100644 --- a/app/views/admin/application_settings/_koding.html.haml +++ b/app/views/admin/application_settings/_koding.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :koding_enabled do = f.check_box :koding_enabled diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index e0f1a4a8799..4341801b045 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :sentry_enabled do = f.check_box :sentry_enabled @@ -19,7 +19,7 @@ = f.text_field :sentry_dsn, class: 'form-control' .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :clientside_sentry_enabled do = f.check_box :clientside_sentry_enabled diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index 7a4adbd8d3b..176cdfe9e1a 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :allow_local_requests_from_hooks_and_services do = f.check_box :allow_local_requests_from_hooks_and_services diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index a7e0f288384..0100ef038e2 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -8,7 +8,7 @@ = f.number_field :max_pages_size, class: 'form-control' .form-text.text-muted 0 for unlimited .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :pages_domain_verification_enabled do = f.check_box :pages_domain_verification_enabled diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml index 5473f45effc..07d3a8b7cdf 100644 --- a/app/views/admin/application_settings/_performance.html.haml +++ b/app/views/admin/application_settings/_performance.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :authorized_keys_enabled do = f.check_box :authorized_keys_enabled diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index 66979d0eb0d..8001b42e2f9 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :performance_bar_enabled do = f.check_box :performance_bar_enabled diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml index 68001f6d4a0..ee6d1d1a888 100644 --- a/app/views/admin/application_settings/_plantuml.html.haml +++ b/app/views/admin/application_settings/_plantuml.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :plantuml_enabled do = f.check_box :plantuml_enabled diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml index 4b30a7890de..8c95597e787 100644 --- a/app/views/admin/application_settings/_prometheus.html.haml +++ b/app/views/admin/application_settings/_prometheus.html.haml @@ -12,7 +12,7 @@ to take effect. = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index') .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :prometheus_metrics_enabled do = f.check_box :prometheus_metrics_enabled diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index 8d149bcbedb..dfb82030962 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -5,7 +5,7 @@ .sub-section %h4 Repository checks .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :repository_checks_enabled do = f.check_box :repository_checks_enabled @@ -15,7 +15,7 @@ %a{ href: 'https://www.kernel.org/pub/software/scm/git/docs/git-fsck.html', target: 'blank' } 'git fsck' in all project and wiki repositories to look for silent disk corruption issues. .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove" .form-text.text-muted If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database. @@ -23,7 +23,7 @@ .sub-section %h4 Housekeeping .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :housekeeping_enabled do = f.check_box :housekeeping_enabled diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml index 5a9612b0ada..75d1a532147 100644 --- a/app/views/admin/application_settings/_repository_storage.html.haml +++ b/app/views/admin/application_settings/_repository_storage.html.haml @@ -4,7 +4,7 @@ %fieldset .sub-section .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :hashed_storage_enabled do = f.check_box :hashed_storage_enabled diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 2ba1b92f37c..2f06c1322f9 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :password_authentication_enabled_for_web do = f.check_box :password_authentication_enabled_for_web @@ -11,7 +11,7 @@ .form-text.text-muted When disabled, an external authentication provider must be used. .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :password_authentication_enabled_for_git do = f.check_box :password_authentication_enabled_for_git diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index 42f92b81b58..50c455f8686 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -3,13 +3,13 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :signup_enabled do = f.check_box :signup_enabled Sign-up enabled .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :send_user_confirmation_email do = f.check_box :send_user_confirmation_email @@ -27,7 +27,7 @@ = f.check_box :domain_blacklist_enabled Enable domain blacklist for sign ups .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = label_tag :blacklist_type_file do = radio_button_tag :blacklist_type, :file diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml index d421f6d3706..58543a0359a 100644 --- a/app/views/admin/application_settings/_spam.html.haml +++ b/app/views/admin/application_settings/_spam.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :recaptcha_enabled do = f.check_box :recaptcha_enabled @@ -24,7 +24,7 @@ = f.text_field :recaptcha_private_key, class: 'form-control' .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :akismet_enabled do = f.check_box :akismet_enabled @@ -40,7 +40,7 @@ %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :unique_ips_limit_enabled do = f.check_box :unique_ips_limit_enabled diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml index 8e5699b1761..316c8b04dea 100644 --- a/app/views/admin/application_settings/_usage.html.haml +++ b/app/views/admin/application_settings/_usage.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :version_check_enabled do = f.check_box :version_check_enabled @@ -13,7 +13,7 @@ = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check") about what information is shared with GitLab Inc. .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 - can_be_configured = @application_setting.usage_ping_can_be_configured? .form-check = f.label :usage_ping_enabled do diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 40a3250dca8..10e9f0b0303 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -43,7 +43,7 @@ = link_to "(?)", help_page_path("integration/gitlab") .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.label :project_export_enabled do = f.check_box :project_export_enabled diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index ff1e4d5610f..4c659327654 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -16,7 +16,7 @@ required: true, data: { preview_path: preview_admin_broadcast_messages_path } .form-group.row.js-toggle-colors-container - .col-sm-10.col-sm-offset-2 + .col-sm-10.offset-sm-2 = link_to 'Customize colors', '#', class: 'js-toggle-colors-link' .form-group.row.js-toggle-colors-container.d-none = f.label :color, "Background Color", class: 'col-form-label col-sm-2' diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 53d29416730..dc4dccc9e0d 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -10,14 +10,14 @@ = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = render 'shared/allow_request_access', form: f = render 'groups/group_admin_settings', f: f - if @group.new_record? .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .alert.alert-info = render 'shared/group_tips' .form-actions diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index f3adf7ed974..49a4cde73d9 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -127,7 +127,7 @@ = dropdown_loading .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = f.submit 'Transfer', class: 'btn btn-primary' .card.repository-check diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index d7efbf33eb4..0de2288ce0a 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -22,7 +22,7 @@ Require all users in this group to setup Two-factor authentication = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group') .form-group - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = f.text_field :two_factor_grace_period, class: 'form-control' .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 0ee24283e00..1642b25642c 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -8,7 +8,7 @@ = render 'shared/group_form', f: f .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .avatar-container.s160 = group_icon(@group, alt: '', class: 'avatar group-avatar s160') %p.light @@ -24,7 +24,7 @@ = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = render 'shared/allow_request_access', form: f .form-group.row diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 1addfe1f1ab..1e72d88db1e 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -22,7 +22,7 @@ = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = render 'shared/group_tips' .form-actions diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index c53069de2bd..71744b6546e 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -471,13 +471,13 @@ .col-sm-10 %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/ .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check %label %input{ :type => "checkbox" }/ Remember me .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 %button.btn.btn-secondary{ :type => "submit" } Sign in .lead diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml index 55cd516d399..4628ecff3d6 100644 --- a/app/views/projects/blob/_remove.html.haml +++ b/app/views/projects/blob/_remove.html.haml @@ -10,6 +10,6 @@ = render 'shared/new_commit_form', placeholder: "Delete #{@blob.name}" .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 = button_tag 'Delete file', class: 'btn btn-remove btn-remove-file' = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" diff --git a/app/views/projects/clusters/gcp/login.html.haml b/app/views/projects/clusters/gcp/login.html.haml index dada51f39da..5d8e2e812ca 100644 --- a/app/views/projects/clusters/gcp/login.html.haml +++ b/app/views/projects/clusters/gcp/login.html.haml @@ -8,7 +8,7 @@ = render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create Kubernetes cluster on Google Kubernetes Engine') = render 'header' .row - .col-sm-8.col-sm-offset-4.signin-with-google + .col-sm-8.offset-sm-4.signin-with-google - if @authorize_url = link_to @authorize_url do = image_tag('auth_buttons/signin_with_google.png', width: '191px') diff --git a/app/views/projects/cycle_analytics/_overview.html.haml b/app/views/projects/cycle_analytics/_overview.html.haml index 9007f2c24ba..5b0d73b8c68 100644 --- a/app/views/projects/cycle_analytics/_overview.html.haml +++ b/app/views/projects/cycle_analytics/_overview.html.haml @@ -1,7 +1,7 @@ .cycle-analytics-overview .container .row - .col-md-10.col-md-offset-1 + .col-md-10.offset-md-1 .row.overview-details .col-md-6.overview-text %h4 Introducing Cycle Analytics diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index fa67a80307c..f8109fb52a6 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -7,7 +7,7 @@ .max-width-marker %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" } .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .row .col-6 %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" } diff --git a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml index 44c0b7a90dc..2da8e5428ec 100644 --- a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml @@ -1,7 +1,7 @@ .services-installation-info - unless @service.activated? .row - .col-sm-9.col-sm-offset-3 + .col-sm-9.offset-sm-3 = link_to new_project_mattermost_path(@project), class: 'btn btn-lg' do = custom_icon('mattermost_logo', size: 15) Add to Mattermost diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 3459e735bd9..79feac2e811 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -21,7 +21,7 @@ - if issuable.respond_to?(:confidential) .form-group.row - .col-sm-offset-2.col-sm-10 + .offset-sm-2.col-sm-10 .form-check = form.label :confidential do = form.check_box :confidential @@ -37,7 +37,7 @@ - if @merge_request_to_resolve_discussions_of .form-group.row - .col-sm-10.col-sm-offset-2 + .col-sm-10.offset-sm-2 = icon('info-circle') - if @merge_request_to_resolve_discussions_of.discussions_can_be_resolved_by?(current_user) = hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 24bd2b48fe5..f0c2b89cef7 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -8,7 +8,7 @@ - return unless issuable.can_remove_source_branch?(current_user) .form-group - .col-sm-10.col-sm-offset-2 + .col-sm-10.offset-sm-2 - if issuable.can_remove_source_branch?(current_user) .form-check = label_tag 'merge_request[force_remove_source_branch]' do |