Commit c1824ac7 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix styling of all card elements

parent c2396171
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
.col-md-6 .col-md-6
- unless @user == current_user - unless @user == current_user
- unless @user.confirmed? - unless @user.confirmed?
.card.bg-info .card.border-info
.card-header .card-header.bg-info.text-white
Confirm user Confirm user
.card-body .card-body
- if @user.unconfirmed_email.present? - if @user.unconfirmed_email.present?
...@@ -162,8 +162,8 @@ ...@@ -162,8 +162,8 @@
%br %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" = 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? - if @user.access_locked?
.card.bg-info .card.border-info
.card-header .card-header.bg-info.text-white
This account has been locked This account has been locked
.card-body .card-body
%p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account. %p This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.
......
- unless @project.pages_deployed? - unless @project.pages_deployed?
.card.bg-info .card.border-info
.card-header .card-header.bg-info.text-white
Configure pages Configure pages
.card-body .card-body
%p %p
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
- primary = local_assigns.fetch(:primary, false) - primary = local_assigns.fetch(:primary, false)
- panel_class = primary ? 'bg-primary text-white' : '' - panel_class = primary ? 'bg-primary text-white' : ''
.card{ class: panel_class } .card
.card-header .card-header{ class: panel_class }
.title .title
= title = title
- if show_counter - if show_counter
......
...@@ -19,5 +19,5 @@ ...@@ -19,5 +19,5 @@
.monospace .monospace
= File.basename(file) = File.basename(file)
- else - else
%p.card.bg-light.text-center .card.bg-light.text-center
No plugins found. .nothing-here-block No plugins found.
--- ---
title: Fix blocked user card style title: Fix blocked user card style
merge_request: merge_request: 21095
author: author:
type: fixed 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