From c161a2266204e0dec566691b46ce22721ccf2332 Mon Sep 17 00:00:00 2001 From: Kendra Swanson Date: Tue, 28 May 2024 20:45:16 +0000 Subject: [PATCH 1/2] remove more styles that point to nowhere --- styles/books/generic/webview.scss | 3 +- .../webview/parts/_exercise-components.scss | 15 ++------- .../webview/parts/_exercise-shapes.scss | 13 +------- styles/output/webview-generic.css | 33 ------------------- 4 files changed, 4 insertions(+), 60 deletions(-) diff --git a/styles/books/generic/webview.scss b/styles/books/generic/webview.scss index dbb59d254..2fd1033e7 100644 --- a/styles/books/generic/webview.scss +++ b/styles/books/generic/webview.scss @@ -126,8 +126,7 @@ @include add_settings(( Exercise: ( _selectors: ('[data-type="exercise"]'), - 'Solution1:::border-top-color': (_ref: 'colorMap:::NoteBorder'), - 'Solution2:::border-top-color': (_ref: 'colorMap:::NoteBorder'), + 'Solution:::border-top-color': (_ref: 'colorMap:::NoteBorder'), 'ProblemsExercisesProblemBefore1:::color': (_ref: 'colorMap:::NoteText'), 'ProblemsExercisesProblemBefore2:::color': (_ref: 'colorMap:::NoteText'), 'ProblemsExercisesSolutionBefore1:::color': (_ref: 'colorMap:::NoteText'), diff --git a/styles/designs/webview/parts/_exercise-components.scss b/styles/designs/webview/parts/_exercise-components.scss index 23692380b..1a6cbba08 100644 --- a/styles/designs/webview/parts/_exercise-components.scss +++ b/styles/designs/webview/parts/_exercise-components.scss @@ -112,8 +112,8 @@ $Exercise__Question__Stem: ( ); /// -$Exercise__Solution1: ( - _name: "Solution1", +$Exercise__Solution: ( + _name: "Solution", _subselector: ' [data-type="solution"]', _properties: ( padding: '0.5em 1em', @@ -123,17 +123,6 @@ $Exercise__Solution1: ( ), ); -$Exercise__Solution2: ( - _name: "Solution2", - _subselector: ' .solution', - _properties: ( - padding: '0.5em 1em', - border-top-width: 0.1rem, - border-top-color: enum('ValueSet:::REQUIRED'), - border-top-style: solid, - ), -); - $Exercise__Solution__Toggle: ( _name: "SolutionToggle", _subselector: (' > .ui-toggle'), diff --git a/styles/designs/webview/parts/_exercise-shapes.scss b/styles/designs/webview/parts/_exercise-shapes.scss index e989e77e2..f66c6aef7 100644 --- a/styles/designs/webview/parts/_exercise-shapes.scss +++ b/styles/designs/webview/parts/_exercise-shapes.scss @@ -16,18 +16,7 @@ $Exercise__Problem__MCAnswer__Pre, ) )), - map-merge($Exercise__Solution1, ( - _components: ( - $Button--InExerciseSolution, - map-merge($Exercise__Solution__Toggle, ( - _components: ( - $Exercise__Solution__Toggle__Before, - ), - )), - $Exercise__Solution__Toggle__Marker, - ), - )), - map-merge($Exercise__Solution2, ( + map-merge($Exercise__Solution, ( _components: ( $Button--InExerciseSolution, map-merge($Exercise__Solution__Toggle, ( diff --git a/styles/output/webview-generic.css b/styles/output/webview-generic.css index aca556f2a..4a18c2a06 100644 --- a/styles/output/webview-generic.css +++ b/styles/output/webview-generic.css @@ -1022,39 +1022,6 @@ a:hover { display: none; } -[data-type=exercise] .solution { - padding: 0.5em 1em; - border-top-width: 0.1rem; - border-top-color: #dcdcdc; - border-top-style: solid; -} - -[data-type=exercise] .solution .btn-link { - color: #21366b; - font-weight: 400; - border-radius: 0; - background-color: transparent; - -webkit-box-shadow: none; - box-shadow: none; - border-color: transparent; -} - -[data-type=exercise] .solution > .ui-toggle { - font-weight: bold; - text-align: center; - text-transform: capitalize; - list-style: none; - cursor: pointer; -} - -[data-type=exercise] .solution > .ui-toggle::before { - content: "[Show/Hide Solution]"; -} - -[data-type=exercise] .solution > summary.ui-toggle::-webkit-details-marker { - display: none; -} - [data-type=exercise].has-problem-title .os-problem-container { display: initial; } From ff8923bfd0055ea46f66a7c3bd3f82bc386b9d95 Mon Sep 17 00:00:00 2001 From: Kendra Swanson Date: Tue, 28 May 2024 20:46:23 +0000 Subject: [PATCH 2/2] remove styles that set show/hide solution message in content --- styles/designs/webview/parts/_exercise-components.scss | 8 -------- styles/designs/webview/parts/_exercise-shapes.scss | 6 +----- styles/output/webview-generic.css | 4 ---- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/styles/designs/webview/parts/_exercise-components.scss b/styles/designs/webview/parts/_exercise-components.scss index 1a6cbba08..286fbb3c0 100644 --- a/styles/designs/webview/parts/_exercise-components.scss +++ b/styles/designs/webview/parts/_exercise-components.scss @@ -135,14 +135,6 @@ $Exercise__Solution__Toggle: ( ), ); -$Exercise__Solution__Toggle__Before: ( - _name: "SolutionToggleBefore", - _subselector: ('::before'), - _properties: ( - content: '"[Show/Hide Solution]"', - ), -); - $Exercise__Solution__Toggle__Marker: ( _name: "SolutionToggleMarker", _subselector:(' > summary.ui-toggle::-webkit-details-marker'), diff --git a/styles/designs/webview/parts/_exercise-shapes.scss b/styles/designs/webview/parts/_exercise-shapes.scss index f66c6aef7..ba1703194 100644 --- a/styles/designs/webview/parts/_exercise-shapes.scss +++ b/styles/designs/webview/parts/_exercise-shapes.scss @@ -19,11 +19,7 @@ map-merge($Exercise__Solution, ( _components: ( $Button--InExerciseSolution, - map-merge($Exercise__Solution__Toggle, ( - _components: ( - $Exercise__Solution__Toggle__Before, - ), - )), + $Exercise__Solution__Toggle, $Exercise__Solution__Toggle__Marker, ), )), diff --git a/styles/output/webview-generic.css b/styles/output/webview-generic.css index 4a18c2a06..9efd747b2 100644 --- a/styles/output/webview-generic.css +++ b/styles/output/webview-generic.css @@ -1014,10 +1014,6 @@ a:hover { cursor: pointer; } -[data-type=exercise] [data-type=solution] > .ui-toggle::before { - content: "[Show/Hide Solution]"; -} - [data-type=exercise] [data-type=solution] > summary.ui-toggle::-webkit-details-marker { display: none; }