Commit ca7a5bf6 authored by Clement Ho's avatar Clement Ho

Merge branch '6209-license-panels' into 'master'

Resolve "Admin area > Colored panels have wrong header color"

Closes #6209

See merge request gitlab-org/gitlab-ee!6646
parents edef5340 3dabbdec
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
%strong Expired %strong Expired
.col-md-6 .col-md-6
.card.bg-info .card.border-info
.card-header .card-header.bg-info.text-white
Download license Download license
.card-body .card-body
%p Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your <code>.gitlab-license</code> file. %p Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your <code>.gitlab-license</code> file.
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
= link_to 'Download license', download_admin_license_path, class: "btn btn-info" = link_to 'Download license', download_admin_license_path, class: "btn btn-info"
.card.bg-danger .card.border-danger
.card-header .card-header.bg-danger.text-white
Remove license Remove license
.card-body .card-body
%p If you remove this license, GitLab will fall back on the previous license, if any. %p If you remove this license, GitLab will fall back on the previous license, if any.
......
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