Merge branch '4966-geo-secondary-banner-styling' into 'master'

Update read-only message banner styling for Geo secondary node

Closes #4966

See merge request gitlab-org/gitlab-ee!6135

app/assets/stylesheets/framework/flash.scss

@@ -10,6 +10,20 @@
     @extend .alert;
     background-color: $blue-500;
     margin: 0;
+
+    &.flash-notice-persistent {
+      background-color: $blue-100;
+      color: $gl-text-color;
+
+      a {
+        color: $gl-link-color;
+
+        &:hover {
+          color: $gl-link-hover-color;
+          text-decoration: none;
+        }
+      }
+    }
   }
 
   .flash-warning {

ee/app/helpers/ee/application_helper.rb

@@ -6,7 +6,7 @@ module EE
     def read_only_message
       return super unless ::Gitlab::Geo.secondary_with_primary?
 
-      (_('You are on a secondary (read-only) Geo node. If you want to make any changes, you must visit the %{primary_node}.') %
+      (_('You are on a secondary, <b>read-only</b> Geo node. If you want to make changes, you must visit this page on the %{primary_node}.') %
         { primary_node: link_to('primary node', ::Gitlab::Geo.primary_node.url) }).html_safe
     end
 

ee/app/views/layouts/header/_read_only_banner.html.haml

+- message = read_only_message
+- if message
+  .flash-container.flash-container-page
+    .flash-notice.flash-notice-persistent
+      %div{ class: (container_class) }
+        %span
+          = message

ee/changelogs/unreleased/4966-geo-secondary-banner-styling.yml

+---
+title: Update read-only message banner styling for Geo secondary node
+merge_request: 6135
+author:
+type: changed

ee/spec/features/geo_node_spec.rb

@@ -17,12 +17,12 @@ feature 'GEO Nodes' do
     describe "showing Flash Info Message" do
       it 'on dashboard' do
         visit root_dashboard_path
-        expect(page).to have_content 'You are on a secondary (read-only) Geo node.'
+        expect(page).to have_content 'You are on a secondary, read-only Geo node. If you want to make changes, you must visit this page on the primary node.'
       end
 
       it 'on project overview' do
         visit project_path(project)
-        expect(page).to have_content 'You are on a secondary (read-only) Geo node.'
+        expect(page).to have_content 'You are on a secondary, read-only Geo node. If you want to make changes, you must visit this page on the primary node.'
       end
     end
   end

ee/spec/features/read_only_spec.rb

@@ -16,6 +16,6 @@ describe 'Geo read-only message' do
 
     visit root_dashboard_path
 
-    expect(page).to have_content('You are on a secondary (read-only) Geo node')
+    expect(page).to have_content('You are on a secondary, read-only Geo node. If you want to make changes, you must visit this page on the primary node.')
   end
 end