Merge pull request #268 from dpc-sdp/uat

joelwigley · web-flow · commit 72b2f49e66ce · 2025-02-04T14:09:06.000+11:00
SXDEDPCXZIC-418
diff --git a/ckanext/datavic_odp_theme/grunt/sass/_menu.scss b/ckanext/datavic_odp_theme/grunt/sass/_menu.scss
@@ -278,7 +278,7 @@ $rpl-menu-gutter: rpl_grid_get_gutter($rpl-grid) !default;
 
 .rpl-menu--vertical,
 .rpl-menu--horizontal-floating-wrapper,
-.rpl-menu--horizontal .rpl-menu--subs, {
+.rpl-menu--horizontal .rpl-menu--subs {
   .rpl-menu__item {
     border-top: $rpl-menu-item-border;
 
@@ -349,10 +349,20 @@ $rpl-menu-gutter: rpl_grid_get_gutter($rpl-grid) !default;
       display: inline-block;
     }
   }
+  #btn-mobile-menu-open {
+    .rpl-icon--color_white {
+      fill: rpl-color("white");
+    }
+  }
 }
 #mobile-menu {
   z-index: 1040;
   .rpl-site-header__top {
     height: 3rem;
   }
+  #btn-mobile-menu-close {
+    .rpl-icon--color_white {
+      fill: rpl-color("white");
+    }
+  }
 }
diff --git a/ckanext/datavic_odp_theme/grunt/sass/_search_form.scss b/ckanext/datavic_odp_theme/grunt/sass/_search_form.scss
@@ -106,6 +106,7 @@ $rpl-search-form-search-text: $rpl-search-form-show-filters-ruleset !default;
     }
 
     svg {
+      fill: rpl-color('primary');
       width: $rpl-search-form-button-width;
       height: $rpl-search-form-button-width;
     }
@@ -209,6 +210,10 @@ $rpl-search-form-search-text: $rpl-search-form-show-filters-ruleset !default;
     padding-top: $rpl-space * 12;
   }
 
+  .rpl-icon--color_danger {
+    fill: #af272f;
+  }
+
 }
 
 .search-form-wrapper {
diff --git a/ckanext/datavic_odp_theme/webassets/css/datavic_odp_theme.css b/ckanext/datavic_odp_theme/webassets/css/datavic_odp_theme.css

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ $rpl-menu-gutter: rpl_grid_get_gutter($rpl-grid) !default;`
`278`	`278`
`279`	`279`	`.rpl-menu--vertical,`
`280`	`280`	`.rpl-menu--horizontal-floating-wrapper,`
`281`		`-.rpl-menu--horizontal .rpl-menu--subs, {`
	`281`	`+.rpl-menu--horizontal .rpl-menu--subs {`
`282`	`282`	`.rpl-menu__item {`
`283`	`283`	`border-top: $rpl-menu-item-border;`
`284`	`284`
`@@ -349,10 +349,20 @@ $rpl-menu-gutter: rpl_grid_get_gutter($rpl-grid) !default;`
`349`	`349`	`display: inline-block;`
`350`	`350`	`}`
`351`	`351`	`}`
	`352`	`+ #btn-mobile-menu-open {`
	`353`	`+ .rpl-icon--color_white {`
	`354`	`+ fill: rpl-color("white");`
	`355`	`+ }`
	`356`	`+ }`
`352`	`357`	`}`
`353`	`358`	`#mobile-menu {`
`354`	`359`	`z-index: 1040;`
`355`	`360`	`.rpl-site-header__top {`
`356`	`361`	`height: 3rem;`
`357`	`362`	`}`
	`363`	`+ #btn-mobile-menu-close {`
	`364`	`+ .rpl-icon--color_white {`
	`365`	`+ fill: rpl-color("white");`
	`366`	`+ }`
	`367`	`+ }`
`358`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ $rpl-search-form-search-text: $rpl-search-form-show-filters-ruleset !default;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`svg {`
	`109`	`+ fill: rpl-color('primary');`
`109`	`110`	`width: $rpl-search-form-button-width;`
`110`	`111`	`height: $rpl-search-form-button-width;`
`111`	`112`	`}`
`@@ -209,6 +210,10 @@ $rpl-search-form-search-text: $rpl-search-form-show-filters-ruleset !default;`
`209`	`210`	`padding-top: $rpl-space * 12;`
`210`	`211`	`}`
`211`	`212`
	`213`	`+ .rpl-icon--color_danger {`
	`214`	`+ fill: #af272f;`
	`215`	`+ }`
	`216`	`+`
`212`	`217`	`}`
`213`	`218`
`214`	`219`	`.search-form-wrapper {`