diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-08-08 17:02:39 -0500 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-08-09 13:18:24 -0500 |
commit | c1824ac75a1a3e6a04ac752e70c922528a56e0dc (patch) | |
tree | c30cf9ba581aeab5d187f62b9f74e83d83dc3da5 | |
parent | c23961710bbbd2b361cd8e50f29063e568490dc6 (diff) | |
download | gitlab-ce-c1824ac75a1a3e6a04ac752e70c922528a56e0dc.tar.gz |
Fix styling of all card elements
-rw-r--r-- | app/views/admin/users/show.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/pages/_use.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/milestones/_issuables.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/plugins/_index.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/50126-blocked-user-card.yml | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index c7a3df9349a..029efadd75d 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -128,8 +128,8 @@ .col-md-6 - unless @user == current_user - unless @user.confirmed? - .card.bg-info - .card-header + .card.border-info + .card-header.bg-info.text-white Confirm user .card-body - if @user.unconfirmed_email.present? @@ -162,8 +162,8 @@ %br = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-warning" - if @user.access_locked? - .card.bg-info - .card-header + .card.border-info + .card-header.bg-info.text-white This account has been locked .card-body %p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account. diff --git a/app/views/projects/pages/_use.html.haml b/app/views/projects/pages/_use.html.haml index cd9177c0f9e..988dabef3a0 100644 --- a/app/views/projects/pages/_use.html.haml +++ b/app/views/projects/pages/_use.html.haml @@ -1,6 +1,6 @@ - unless @project.pages_deployed? - .card.bg-info - .card-header + .card.border-info + .card-header.bg-info.text-white Configure pages .card-body %p diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index ee6354b1c28..ee97f0172da 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -2,8 +2,8 @@ - primary = local_assigns.fetch(:primary, false) - panel_class = primary ? 'bg-primary text-white' : '' -.card{ class: panel_class } - .card-header +.card + .card-header{ class: panel_class } .title = title - if show_counter diff --git a/app/views/shared/plugins/_index.html.haml b/app/views/shared/plugins/_index.html.haml index 7bcc54e7459..9d230d12be2 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.card.bg-light.text-center - No plugins found. + .card.bg-light.text-center + .nothing-here-block No plugins found. diff --git a/changelogs/unreleased/50126-blocked-user-card.yml b/changelogs/unreleased/50126-blocked-user-card.yml index b270bf7a757..a42d62e5530 100644 --- a/changelogs/unreleased/50126-blocked-user-card.yml +++ b/changelogs/unreleased/50126-blocked-user-card.yml @@ -1,5 +1,5 @@ --- title: Fix blocked user card style -merge_request: +merge_request: 21095 author: type: fixed |