From 58a804bb0c21f0401de0b1fcf2377b937286fb96 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 13 Apr 2018 15:51:54 -0500 Subject: [PATCH] [skip ci] Convert wells to card, port info-well --- app/assets/stylesheets/bootstrap_migration.scss | 16 ++++++++++++++++ app/views/admin/labels/index.html.haml | 2 +- app/views/admin/system_info/show.html.haml | 8 ++++---- .../profiles/two_factor_auths/_codes.html.haml | 2 +- .../clusters/_advanced_settings.html.haml | 2 +- app/views/projects/compare/show.html.haml | 2 +- app/views/projects/empty.html.haml | 8 ++++---- .../projects/pipeline_schedules/index.html.haml | 2 +- .../mattermost_slash_commands/_help.html.haml | 2 +- .../projects/services/prometheus/_help.html.haml | 2 +- .../slack_slash_commands/_help.html.haml | 2 +- app/views/shared/_import_form.html.haml | 2 +- app/views/shared/_service_settings.html.haml | 2 +- app/views/shared/plugins/_index.html.haml | 2 +- 14 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 0c436390a5b..6d497b571c0 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -72,3 +72,19 @@ button, html [type="button"], [type="reset"], [type="submit"] { .divider { @extend .dropdown-divider; } + +.info-well { + background: $theme-gray-50; + color: $gl-text-color; + border: 1px solid $border-color; + border-radius: 4px; + margin-bottom: 16px; + + .well-segment { + padding: 16px; + + &:not(:last-of-type) { + border-bottom: 1px solid $well-inner-border; + } + } +} diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml index 2628b5a1721..add38fb333e 100644 --- a/app/views/admin/labels/index.html.haml +++ b/app/views/admin/labels/index.html.haml @@ -13,6 +13,6 @@ = render @labels = paginate @labels, theme: 'gitlab' - else - .light-well + .card.bg-light .nothing-here-block There are no labels yet diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index 23f9927cfee..d73b7060dcd 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -5,7 +5,7 @@ .prepend-top-default .row .col-sm-4 - .light-well + .card.bg-light %h4 CPU .data - if @cpus @@ -14,7 +14,7 @@ = icon('warning', class: 'text-warning') Unable to collect CPU info .col-sm-4 - .light-well + .card.bg-light %h4 Memory Usage .data - if @memory @@ -23,7 +23,7 @@ = icon('warning', class: 'text-warning') Unable to collect memory info .col-sm-4 - .light-well + .card.bg-light %h4 Disk Usage .data - @disks.each do |disk| @@ -31,7 +31,7 @@ %p= disk[:disk_name] %p= disk[:mount_path] .col-sm-4 - .light-well + .card.bg-light %h4 Uptime .data %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at) diff --git a/app/views/profiles/two_factor_auths/_codes.html.haml b/app/views/profiles/two_factor_auths/_codes.html.haml index 43b58be7f98..93722d7b034 100644 --- a/app/views/profiles/two_factor_auths/_codes.html.haml +++ b/app/views/profiles/two_factor_auths/_codes.html.haml @@ -4,7 +4,7 @@ %b will lose access to your account. -.codes.well +.codes.card %ul - @codes.each do |code| %li diff --git a/app/views/projects/clusters/_advanced_settings.html.haml b/app/views/projects/clusters/_advanced_settings.html.haml index 14979bee714..e9bdc54364b 100644 --- a/app/views/projects/clusters/_advanced_settings.html.haml +++ b/app/views/projects/clusters/_advanced_settings.html.haml @@ -7,7 +7,7 @@ - link_gke = link_to(s_('ClusterIntegration|Google Kubernetes Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer') = s_('ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke } - .well.form-group + .card.form-group %label.text-danger = s_('ClusterIntegration|Remove Kubernetes cluster integration') %p diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 8da55664878..b6bebbabed0 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -10,7 +10,7 @@ = render "projects/commits/commit_list" = render "projects/diffs/diffs", diffs: @diffs, environment: @environment - else - .light-well + .card.bg-light .center %h4 = s_("CompareBranches|There isn't anything to compare.") diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index f0d11d345cd..fbabf6f8927 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -44,14 +44,14 @@ .git-empty %fieldset %h5 Git global setup - %pre.light-well + %pre.card.bg-light :preserve git config --global user.name "#{h git_user_name}" git config --global user.email "#{h git_user_email}" %fieldset %h5 Create a new repository - %pre.light-well + %pre.card.bg-light :preserve git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')} cd #{h @project.path} @@ -62,7 +62,7 @@ %fieldset %h5 Existing folder - %pre.light-well + %pre.card.bg-light :preserve cd existing_folder git init @@ -73,7 +73,7 @@ %fieldset %h5 Existing Git repository - %pre.light-well + %pre.card.bg-light :preserve cd existing_repo git remote rename origin old-origin diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml index bcb6dddba1a..3677666070e 100644 --- a/app/views/projects/pipeline_schedules/index.html.haml +++ b/app/views/projects/pipeline_schedules/index.html.haml @@ -18,5 +18,5 @@ %ul.content-list = render partial: "table" - else - .light-well + .card.bg-light .nothing-here-block= _("No schedules") diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml index 2a1b9d4c465..62bef77be97 100644 --- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml @@ -1,6 +1,6 @@ - enabled = Gitlab.config.mattermost.enabled -.well +.card %p This service allows users to perform common operations on this project by entering slash commands in Mattermost. diff --git a/app/views/projects/services/prometheus/_help.html.haml b/app/views/projects/services/prometheus/_help.html.haml index 88acb824ba7..15e7362c2ba 100644 --- a/app/views/projects/services/prometheus/_help.html.haml +++ b/app/views/projects/services/prometheus/_help.html.haml @@ -5,5 +5,5 @@ = s_('PrometheusService|Manual configuration') - unless @service.editable? - .well + .card = s_('PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters') diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml index 0e0c1d11cd4..44f58ad05e5 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -1,7 +1,7 @@ - pretty_name = defined?(@project) ? @project.full_name : 'namespace / path' - run_actions_text = "Perform common operations on GitLab project: #{pretty_name}" -.well +.card %p This service allows users to perform common operations on this project by entering slash commands in Slack. diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index b297374c6c4..35673303b85 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -7,7 +7,7 @@ = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git', required: true - .well.prepend-top-20 + .card.prepend-top-20 %ul %li = _('The repository must be accessible over http://, https:// or git://.').html_safe diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 091dd48c6fc..0ebf365c7bd 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -3,7 +3,7 @@ - if lookup_context.template_exists?('help', "projects/services/#{@service.to_param}", true) = render "projects/services/#{@service.to_param}/help", subject: subject - elsif @service.help.present? - .well + .card = markdown @service.help .service-settings diff --git a/app/views/shared/plugins/_index.html.haml b/app/views/shared/plugins/_index.html.haml index 5f426370dc6..7bcc54e7459 100644 --- a/app/views/shared/plugins/_index.html.haml +++ b/app/views/shared/plugins/_index.html.haml @@ -19,5 +19,5 @@ .monospace = File.basename(file) - else - %p.light-well.text-center + %p.card.bg-light.text-center No plugins found.