diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76872984..5c718fed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: branches: - - redwood/indigo + - sumac/indigo jobs: release: name: Release diff --git a/package.json b/package.json index d469b611..37dbffa8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "release": { "tagFormat": "indigo-${version}", "branches": [ - "redwood/indigo" + "sumac/indigo" ] } } diff --git a/paragon/_footer.scss b/paragon/_footer.scss index 1b64ce4d..8b48cca0 100644 --- a/paragon/_footer.scss +++ b/paragon/_footer.scss @@ -430,6 +430,7 @@ footer.tutor-container { } } #course-list-active-filters { + margin-bottom: 10px; .pgn__chip.pgn__chip-light { background: $primary; * { diff --git a/paragon/_overrides.scss b/paragon/_overrides.scss index 9a9e6c23..e6cc0e16 100644 --- a/paragon/_overrides.scss +++ b/paragon/_overrides.scss @@ -154,28 +154,28 @@ html { .ml-1, >div { margin: 0 !important; border: none !important; - &:first-child { - button { - span { - border: none; - transform: none; - width: 21px; - height: auto; - &:after, &:before { - display: none; - } + + button { + span { + border: none; + transform: none; + width: 21px; + height: auto; + &:after, &:before { + display: none; } - svg { - display: block; - width: 24px; - height: auto; - path { - fill: #9CA3AF; - } + } + svg { + display: block; + width: 24px; + height: auto; + path { + fill: #9CA3AF; } } } - button { + + button[aria-label="Show notification tray"] { padding: 5px; border: 1px solid #D1D5DB !important; position: relative; @@ -189,7 +189,7 @@ html { box-sizing: border-box; position: relative; display: block; - transform: scale(var(--ggs,1)); + transform: scale(0.7); border: 2px solid #9CA3AF; border-bottom: 0; width: 14px; diff --git a/themes/dark/_extras.scss b/themes/dark/_extras.scss index f6e9c486..7e03d58a 100644 --- a/themes/dark/_extras.scss +++ b/themes/dark/_extras.scss @@ -615,6 +615,9 @@ footer.tutor-container .copyright-site { box-shadow: none; .bg-white { background: none !important; + p { + color: $text-color; + } } .pgn__action-row { button { diff --git a/themes/dark/_learning.scss b/themes/dark/_learning.scss index 6a545da9..6680879f 100644 --- a/themes/dark/_learning.scss +++ b/themes/dark/_learning.scss @@ -111,3 +111,27 @@ } } } + +section.courseware-search{ + background: $body-bg; + + .pgn__searchfield-form{ + background-color: $body-bg; + + } + + .courseware-search__results-summary{ + color: $text-color-primary; + } + + .courseware-search-results__item:hover{ + background-color: #353535; + .courseware-search-results__title >span{ + color: $text-color; + } + + .courseware-search-results__breadcrumbs > li div{ + color: grey; + } + } +} \ No newline at end of file diff --git a/themes/dark/_utilities.scss b/themes/dark/_utilities.scss index f25e4c99..c2b83a11 100644 --- a/themes/dark/_utilities.scss +++ b/themes/dark/_utilities.scss @@ -245,10 +245,14 @@ a.muted-link { } .btn-icon.btn-icon-primary:hover { - background-color: $light-300 !important; + background-color: $primary-700 !important; color: $primary-500 !important } +.btn-tertiary{ + color: #a6a6a6; +} + .nav-button-group { .nav-link.active, .show>.nav-link { @@ -281,4 +285,17 @@ a.muted-link { background-color: $body-bg; } +.pgn__card{ + background-color: $body-bg; + border: 1px solid $border-color; +} + +a.brand-link{ + color: $brand; +} + +#root.small{ + +} + @import "./learning"; diff --git a/themes/dark/_variables.scss b/themes/dark/_variables.scss index 41093a73..b11f13d2 100644 --- a/themes/dark/_variables.scss +++ b/themes/dark/_variables.scss @@ -4,6 +4,7 @@ $primary: #AEC7F6; $danger: #FFA07A; $success: #54CF5E; $body-bg:#0D0D0E; +$brand: #ce80aa; $primary-light: #292A2C; $light-dark: #374151; @@ -34,6 +35,18 @@ $primary-700: mix(black, $primary, 20%); $primary-800: mix(black, $primary, 25%); $primary-900: mix(black, $primary, 30%); + +$brand-100: mix(black, $brand, 30%) !default; +$brand-200: mix(black, $brand, 25%) !default; +$brand-300: mix(black, $brand, 20%) !default; +$brand-400: mix(black, $brand, 10%) !default; +$brand-500: $brand !default; +$brand-700: mix(white, $brand, 50%) !default; +$brand-600: mix(white, $brand, 25%) !default; +$brand-800: mix(white, $brand, 75%) !default; +$brand-900: mix(white, $brand, 94%) !default; + + $success-100: mix(white, $success, 94%); $success-200: mix(white, $success, 75%); $success-300: mix(white, $success, 50%);