From c8aa54af2c24d8c3daf8383abb217831ac593215 Mon Sep 17 00:00:00 2001
From: Michael Greene <profmikegreene@gmail.com>
Date: Fri, 20 May 2022 15:22:51 -0400
Subject: [PATCH] Remove overrides incorporated upstream SAK-46594

---
 .../sass/_duke-all-overrides.scss             | 107 ------------
 .../tool/lessonbuilder/_lessonbuilder.scss    | 162 ++++++++++--------
 2 files changed, 90 insertions(+), 179 deletions(-)

diff --git a/library/src/morpheus-master/sass/_duke-all-overrides.scss b/library/src/morpheus-master/sass/_duke-all-overrides.scss
index 6538c7a5cc..2989b6da86 100644
--- a/library/src/morpheus-master/sass/_duke-all-overrides.scss
+++ b/library/src/morpheus-master/sass/_duke-all-overrides.scss
@@ -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",
@@ -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;
diff --git a/library/src/morpheus-master/sass/modules/tool/lessonbuilder/_lessonbuilder.scss b/library/src/morpheus-master/sass/modules/tool/lessonbuilder/_lessonbuilder.scss
index 7ac3a9f8e2..7d40a502b0 100644
--- a/library/src/morpheus-master/sass/modules/tool/lessonbuilder/_lessonbuilder.scss
+++ b/library/src/morpheus-master/sass/modules/tool/lessonbuilder/_lessonbuilder.scss
@@ -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;
@@ -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');