diff --git a/src/sass/functions.sass b/src/sass/functions.sass index 96bb95070..88870932a 100644 --- a/src/sass/functions.sass +++ b/src/sass/functions.sass @@ -17,7 +17,7 @@ @if (lightness($bgColor) > 50 and lightness($accent_color) > 75) @return darken($accent_color, 40%) @else - @return $accent_color + @return lighten($accent_color, 10%) @function pace-color() @if ($topbar_bg == #42464d) diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index 4b7a40d59..7d8bf5ae7 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -169,7 +169,7 @@ margin: 0 a.blackLink - color: #222 !important + color: automatic-link-color($page_content_right_bg) !important a.hoverUnderline &:hover diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs index 01b603ca9..f7f81e9b3 100644 --- a/src/views/partials/nav.hbs +++ b/src/views/partials/nav.hbs @@ -30,19 +30,8 @@
  • chatMessages
    • - - - - - - - - - {{#canUser data.user "accounts:view"}}
  • Accounts
    • {{/canUser}} {{#canUser data.user "groups:view"}}
  • supervisor_accountGroups
    • {{/canUser}} - - {{#canUser data.user "reports:view"}}
  • @@ -53,15 +42,10 @@
    • {{/canUser}} @@ -144,15 +128,10 @@
  • Closed
    • \ No newline at end of file diff --git a/src/views/pub_createTicket.hbs b/src/views/pub_createTicket.hbs index d9c7ce492..600092e74 100644 --- a/src/views/pub_createTicket.hbs +++ b/src/views/pub_createTicket.hbs @@ -40,6 +40,7 @@ height: 500px; background: #f6f6f6; border: 1px solid #ccc; + color: #222; padding: 15px; overflow: auto; } diff --git a/src/views/pub_signup.hbs b/src/views/pub_signup.hbs index c04716ee9..8f4f46f45 100644 --- a/src/views/pub_signup.hbs +++ b/src/views/pub_signup.hbs @@ -42,6 +42,7 @@ border: 1px solid #ccc; padding: 15px; overflow: auto; + color: #222; } p {