Skip to content

Commit

Permalink
Remove overrides incorporated upstream SAK-46594
Browse files Browse the repository at this point in the history
  • Loading branch information
@profmikegreene
profmikegreene committed May 20, 2022
1 parent 994aa29 commit c8aa54a
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 179 deletions.
107 changes: 0 additions & 107 deletions library/src/morpheus-master/sass/_duke-all-overrides.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,102 +281,6 @@ table caption {
// duke-296 adjust lessons styles
///////////////////////////////////////////////////

@mixin sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name) {
// Color scheme generation in Lessons Layouts
// Use any color previously defined via defineColorHSL
// @include sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name)
// @param color
// Type: string
// expects the same value used to define a color palette in defineColorHSL
// @param lighterOrDarker
// Type: string
// expects a string either lighter or darker
// @param name
// Type: string
// expects a string which matches the classes the lessons tool will apply to the markup
// @returns a set of CSS selectors and rules
// Example usage
// @include sakaiLessonsLayoutColorScheme('--sakai-color-gray', 'lighter', 'gray');

$shade1: #{$color}--#{$lighterOrDarker}-1;
$shade2: #{$color}--#{$lighterOrDarker}-2;
$shade3: #{$color};
$shade4: #{$color}--#{$lighterOrDarker}-7;
@if $lighterOrDarker == "darker" {
$shade1: #{$color}--#{$lighterOrDarker}-4;
$shade2: #{$color}--#{$lighterOrDarker}-5;
$shade3: #{$color}--#{$lighterOrDarker}-3;
$shade4: #{$color}--#{$lighterOrDarker}-7;
}

.coln#{$name},
.coln#{$name}-trans {
background: var(--sakai-background-color-1);
border: 1px solid var($shade1);
}
.coln#{$name}-header,
.coln#{$name}-trans-header {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
}
.collapsibleSectionHeader.coln#{$name}-header:hover,
.collapsibleSectionHeader.coln#{$name}-trans-header:hover {
@extend .sakai-colorize#{$shade1};
border-color: var(#{$shade1});
}
.collapsibleSectionHeader.coln#{$name}-header:active,
.collapsibleSectionHeader.coln#{$name}-trans-header:active {
@extend .sakai-colorize#{$shade3};
border-color: var(#{$shade3});
}
.coln#{$name}-header + .section {
border: 1px solid var(#{$shade2});
// border-top: none; // #duke-310
}

.coln#{$name} {
.questionDiv .contentCol,
.checklistDiv {
@extend .sakai-colorize#{$shade4};
}
input[type="submit"].question-submit,
.linkCell .addStudentContent,
input[type="submit"].setStudentZero {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
&:hover,
&:focus {
@extend .sakai-colorize#{$shade1};
border: 1px solid var(#{$shade1});
}
&:active {
@extend .sakai-colorize#{$shade3};
border: 1px solid var(#{$shade3});
}
}
input[type="submit"].question-submit,
.linkCell .addStudentContent,
input[type="submit"].setStudentZero {
margin-top: $standard-space-4x;
}
}
//SAK-46594
.usebutton.n#{$name},
.usebutton.n#{$name}-trans {
@extend .sakai-colorize#{$shade2};

border: 1px solid var(#{$shade2}) !important;
&:hover,
&:focus {
@extend .sakai-colorize#{$shade1};
border: 1px solid var(#{$shade1});
}
&:active {
@extend .sakai-colorize#{$shade3};
border: 1px solid var(#{$shade3});
}
}
}
.#{$namespace}sakai-lessonbuildertool {
@include sakaiLessonsLayoutColorScheme(
"--sakai-color-gray",
Expand Down Expand Up @@ -404,17 +308,6 @@ table caption {
"purple"
);

@include sakaiLessonsLayoutColorScheme(
"--sakai-lessons-navy",
"lighter",
"navy"
);
@include sakaiLessonsLayoutColorScheme(
"--sakai-lessons-navy",
"darker",
"navy2"
);

.navIntraTool:last-of-type {
position: sticky;
bottom: 0;
Expand Down
162 changes: 90 additions & 72 deletions library/src/morpheus-master/sass/modules/tool/lessonbuilder/_lessonbuilder.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,93 @@
// DUKE move mixin to global scope so it is available in overrides
@mixin sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name){
// Color scheme generation in Lessons Layouts
// Use any color previously defined via defineColorHSL
// @include sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name)
// @param color
// Type: string
// expects the same value used to define a color palette in defineColorHSL
// @param lighterOrDarker
// Type: string
// expects a string either lighter or darker
// @param name
// Type: string
// expects a string which matches the classes the lessons tool will apply to the markup
// @returns a set of CSS selectors and rules
// Example usage
// @include sakaiLessonsLayoutColorScheme('--sakai-color-gray', 'lighter', 'gray');

$shade1: #{$color}--#{$lighterOrDarker}-1;
$shade2: #{$color}--#{$lighterOrDarker}-2;
$shade3: #{$color};
$shade4: #{$color}--#{$lighterOrDarker}-7;
@if $lighterOrDarker == "darker" {
$shade1: #{$color}--#{$lighterOrDarker}-4;
$shade2: #{$color}--#{$lighterOrDarker}-5;
$shade3: #{$color}--#{$lighterOrDarker}-3;
$shade4: #{$color}--#{$lighterOrDarker}-7;
}
.coln#{$name}, .coln#{$name}-trans {
background: var(--sakai-background-color-1);
border: 1px solid var($shade1);
}
.coln#{$name}-header, .coln#{$name}-trans-header {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
}
.collapsibleSectionHeader.coln#{$name}-header:hover, .collapsibleSectionHeader.coln#{$name}-trans-header:hover {
@extend .sakai-colorize#{$shade1};
border-color: var(#{$shade1});
}
.collapsibleSectionHeader.coln#{$name}-header:active, .collapsibleSectionHeader.coln#{$name}-trans-header:active {
@extend .sakai-colorize#{$shade3};
border-color: var(#{$shade3});
}
.coln#{$name}-header + .section {
border: 1px solid var(#{$shade2});
// border-top: none; // duke-310
}

.coln#{$name} {
.questionDiv .contentCol, .checklistDiv {
@extend .sakai-colorize#{$shade4};
}
input[type="submit"].question-submit,
.linkCell .addStudentContent,
input[type="submit"].setStudentZero {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
&:hover,
&:focus {
@extend .sakai-colorize#{$shade1};
border: 1px solid var(#{$shade1});
}
&:active {
@extend .sakai-colorize#{$shade3};
border: 1px solid var(#{$shade3});
}
}
input[type="submit"].question-submit,.linkCell .addStudentContent, input[type="submit"].setStudentZero {
margin-top: $standard-space-4x;
}
}

.usebutton.n#{$name},
.usebutton.n#{$name}-trans {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});

&:hover,
&:focus {
@extend .sakai-colorize#{$shade1};
border: 1px solid var(#{$shade1});
}

&:active {
@extend .sakai-colorize#{$shade3};
border: 1px solid var(#{$shade3});
}
}
}
.#{$namespace}sakai-lessonbuildertool {
.navIntraTool {
margin: 0 0 0 0;
Expand Down Expand Up @@ -167,79 +257,7 @@
}


@mixin sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name){
// Color scheme generation in Lessons Layouts
// Use any color previously defined via defineColorHSL
// @include sakaiLessonsLayoutColorScheme($color, $lighterOrDarker, $name)
// @param color
// Type: string
// expects the same value used to define a color palette in defineColorHSL
// @param lighterOrDarker
// Type: string
// expects a string either lighter or darker
// @param name
// Type: string
// expects a string which matches the classes the lessons tool will apply to the markup
// @returns a set of CSS selectors and rules
// Example usage
// @include sakaiLessonsLayoutColorScheme('--sakai-color-gray', 'lighter', 'gray');

$shade1: #{$color}--#{$lighterOrDarker}-1;
$shade2: #{$color}--#{$lighterOrDarker}-2;
$shade3: #{$color};
$shade4: #{$color}--#{$lighterOrDarker}-7;
@if $lighterOrDarker == "darker" {
$shade1: #{$color}--#{$lighterOrDarker}-4;
$shade2: #{$color}--#{$lighterOrDarker}-5;
$shade3: #{$color}--#{$lighterOrDarker}-3;
$shade4: #{$color}--#{$lighterOrDarker}-7;
}
.coln#{$name}, .coln#{$name}-trans {
background: var(--sakai-background-color-1);
border: 1px solid var($shade1);
}
.coln#{$name}-header, .coln#{$name}-trans-header {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
}
.collapsibleSectionHeader.coln#{$name}-header:hover, .collapsibleSectionHeader.coln#{$name}-trans-header:hover {
@extend .sakai-colorize#{$shade1};
border-color: var(#{$shade1});
}
.collapsibleSectionHeader.coln#{$name}-header:active, .collapsibleSectionHeader.coln#{$name}-trans-header:active {
@extend .sakai-colorize#{$shade3};
border-color: var(#{$shade3});
}
.coln#{$name}-header + .section {
border: 1px solid var(#{$shade2});
border-top: none;
}

.coln#{$name} {
.questionDiv .contentCol, .checklistDiv {
@extend .sakai-colorize#{$shade4};
}
input[type="submit"].question-submit,
.linkCell .addStudentContent,
input[type="submit"].setStudentZero {
@extend .sakai-colorize#{$shade2};
border: 1px solid var(#{$shade2});
&:hover,
&:focus {
@extend .sakai-colorize#{$shade1};
border: 1px solid var(#{$shade1});
}
&:active {
@extend .sakai-colorize#{$shade3};
border: 1px solid var(#{$shade3});
}
}
input[type="submit"].question-submit,.linkCell .addStudentContent, input[type="submit"].setStudentZero {
margin-top: $standard-space-4x;
}
}

}

@include sakaiLessonsLayoutColorScheme('--sakai-color-gray', 'lighter', 'gray');
@include sakaiLessonsLayoutColorScheme('--sakai-color-gray', 'darker', 'black');
Expand Down

0 comments on commit c8aa54a

Please sign in to comment.