Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update color issues on learnder-dashboard mfe and learning mfe #28

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release
on:
push:
branches:
- redwood/indigo
- sumac/indigo
jobs:
release:
name: Release
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"release": {
"tagFormat": "indigo-${version}",
"branches": [
"redwood/indigo"
"sumac/indigo"
]
}
}
1 change: 1 addition & 0 deletions paragon/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ footer.tutor-container {
}
}
#course-list-active-filters {
margin-bottom: 10px;
.pgn__chip.pgn__chip-light {
background: $primary;
* {
Expand Down
38 changes: 19 additions & 19 deletions paragon/_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions themes/dark/_extras.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 24 additions & 0 deletions themes/dark/_learning.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
19 changes: 18 additions & 1 deletion themes/dark/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
13 changes: 13 additions & 0 deletions themes/dark/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $primary: #AEC7F6;
$danger: #FFA07A;
$success: #54CF5E;
$body-bg:#0D0D0E;
$brand: #ce80aa;

$primary-light: #292A2C;
$light-dark: #374151;
Expand Down Expand Up @@ -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%);
Expand Down