diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 1619efbec..7751f4cab 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -61,8 +61,6 @@ $table-header: #ecf1f6; } .top-links { - background: #000; - color: $white; a { line-height: rem-calc($line-height * 1.5); diff --git a/app/assets/stylesheets/advanced_search.scss b/app/assets/stylesheets/advanced_search.scss index a22625b20..344176a48 100644 --- a/app/assets/stylesheets/advanced_search.scss +++ b/app/assets/stylesheets/advanced_search.scss @@ -29,8 +29,7 @@ > [aria-expanded] { @include xy-gutters; - color: $link; - cursor: pointer; + @include link; margin-top: $line-height; margin-bottom: $line-height; max-width: max-content; diff --git a/app/assets/stylesheets/datepicker_overrides.scss b/app/assets/stylesheets/datepicker_overrides.scss index 239b38f70..d59d8b7c7 100644 --- a/app/assets/stylesheets/datepicker_overrides.scss +++ b/app/assets/stylesheets/datepicker_overrides.scss @@ -8,14 +8,14 @@ .ui-datepicker-calendar { - .ui-state-default { - background: $highlight; - color: $text; - } - .ui-state-hover, .ui-state-active { @extend %brand-background; + + .ui-state-default:not(&) { + background: $highlight; + color: $text; + } } thead { diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 69373ae03..79631fcd4 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -146,9 +146,8 @@ button, } .button.hollow { - @include normal-selection; + @include brand-text; border: 1px solid; - color: $link; } .button.hollow.error { @@ -1375,16 +1374,20 @@ form { } } + .notification-link { + color: inherit; + + &:hover { + color: $link; + } + } + &:hover { a { text-decoration: none; } - p:not(.time) { - color: $link; - } - &::before { content: "\43"; } @@ -1405,7 +1408,6 @@ form { } p { - color: $text; margin-bottom: 0; max-width: 80%; } @@ -2359,8 +2361,7 @@ table { } .add-related-content { - color: $link; - cursor: pointer; + @include link; display: block; margin-bottom: $line-height; @@ -2459,7 +2460,7 @@ table { } a { - color: $link; + @include link; } } diff --git a/app/assets/stylesheets/mixins/buttons.scss b/app/assets/stylesheets/mixins/buttons.scss index b5e1aee6c..96b3da07a 100644 --- a/app/assets/stylesheets/mixins/buttons.scss +++ b/app/assets/stylesheets/mixins/buttons.scss @@ -23,7 +23,7 @@ @include base-button; } -@mixin hollow-button($color: $link) { +@mixin hollow-button($color: $brand) { @include button($style: hollow, $background: $color); @include normal-selection; @include base-button; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 2b8ceffac..c1830da9c 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -249,7 +249,7 @@ font-weight: bold; a { - color: $link !important; + @include link; } } diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index 48ae90db0..4eae3d8c5 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -5,7 +5,7 @@ title: notification.notifiable_title, body: notification.notifiable_body } %> <% link_text = render "/notifications/notification_body", locals %> - <%= link_to_if notification.link.present?, link_text, notification.link %> + <%= link_to_if notification.link.present?, link_text, notification.link, class: "notification-link" %> <% else %>