Skip to content

Commit

Permalink
chore: clean up built in blocks css (#35854)
Browse files Browse the repository at this point in the history
* chore: clean up built in blocks css

* chore: Address PR change request
  • Loading branch information
farhan authored Nov 18, 2024
1 parent 842aec4 commit 26afafa
Show file tree
Hide file tree
Showing 11 changed files with 392 additions and 221 deletions.
11 changes: 0 additions & 11 deletions xmodule/static/css-builtin-blocks/AnnotatableBlockDisplay.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_display.xmodule_AnnotatableBlock {
/* TODO: move top-level variables to a common _variables.scss.
* NOTE: These variables were only added here because when this was integrated with the CMS,
* SASS compilation errors were triggered because the CMS didn't have the same variables defined
* that the LMS did, so the quick fix was to localize the LMS variables not shared by the CMS.
* -Abarrett and Vshnayder
*/
/* stylelint-disable-line */
/* stylelint-disable-line */
}

.xmodule_display.xmodule_AnnotatableBlock .annotatable-wrapper {
position: relative;
}
Expand Down
38 changes: 17 additions & 21 deletions xmodule/static/css-builtin-blocks/HtmlBlockDisplay.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_display.xmodule_AboutBlock,
.xmodule_display.xmodule_CourseInfoBlock,
.xmodule_display.xmodule_HtmlBlock,
.xmodule_display.xmodule_StaticTabBlock {
/* stylelint-disable-line */
/* stylelint-disable-line */
}

.xmodule_display.xmodule_AboutBlock *,
.xmodule_display.xmodule_CourseInfoBlock *,
.xmodule_display.xmodule_HtmlBlock *,
Expand Down Expand Up @@ -138,18 +130,18 @@
font-weight: bold;
}

.xmodule_display.xmodule_AboutBlock p + p,
.xmodule_display.xmodule_AboutBlock ul + p,
.xmodule_display.xmodule_AboutBlock ol + p,
.xmodule_display.xmodule_CourseInfoBlock p + p,
.xmodule_display.xmodule_CourseInfoBlock ul + p,
.xmodule_display.xmodule_CourseInfoBlock ol + p,
.xmodule_display.xmodule_HtmlBlock p + p,
.xmodule_display.xmodule_HtmlBlock ul + p,
.xmodule_display.xmodule_HtmlBlock ol + p,
.xmodule_display.xmodule_StaticTabBlock p + p,
.xmodule_display.xmodule_StaticTabBlock ul + p,
.xmodule_display.xmodule_StaticTabBlock ol + p {
.xmodule_display.xmodule_AboutBlock p+p,
.xmodule_display.xmodule_AboutBlock ul+p,
.xmodule_display.xmodule_AboutBlock ol+p,
.xmodule_display.xmodule_CourseInfoBlock p+p,
.xmodule_display.xmodule_CourseInfoBlock ul+p,
.xmodule_display.xmodule_CourseInfoBlock ol+p,
.xmodule_display.xmodule_HtmlBlock p+p,
.xmodule_display.xmodule_HtmlBlock ul+p,
.xmodule_display.xmodule_HtmlBlock ol+p,
.xmodule_display.xmodule_StaticTabBlock p+p,
.xmodule_display.xmodule_StaticTabBlock ul+p,
.xmodule_display.xmodule_StaticTabBlock ol+p {
margin-top: var(--baseline);
}

Expand Down Expand Up @@ -198,7 +190,11 @@
list-style: disc outside none;
}

.xmodule_display.xmodule_AboutBlock a:link, .xmodule_display.xmodule_AboutBlock a:visited, .xmodule_display.xmodule_AboutBlock a:hover, .xmodule_display.xmodule_AboutBlock a:active, .xmodule_display.xmodule_AboutBlock a:focus,
.xmodule_display.xmodule_AboutBlock a:link,
.xmodule_display.xmodule_AboutBlock a:visited,
.xmodule_display.xmodule_AboutBlock a:hover,
.xmodule_display.xmodule_AboutBlock a:active,
.xmodule_display.xmodule_AboutBlock a:focus,
.xmodule_display.xmodule_CourseInfoBlock a:link,
.xmodule_display.xmodule_CourseInfoBlock a:visited,
.xmodule_display.xmodule_CourseInfoBlock a:hover,
Expand Down
8 changes: 2 additions & 6 deletions xmodule/static/css-builtin-blocks/HtmlBlockEditor.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_edit.xmodule_AboutBlock,
.xmodule_edit.xmodule_CourseInfoBlock,
.xmodule_edit.xmodule_HtmlBlock,
.xmodule_edit.xmodule_StaticTabBlock {
}

.xmodule_edit.xmodule_AboutBlock .ui-col-wide,
.xmodule_edit.xmodule_CourseInfoBlock .ui-col-wide,
Expand Down Expand Up @@ -118,7 +113,8 @@
height: 21px;
}

.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:hover, .xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:focus,
.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:hover,
.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:focus,
.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button:hover,
.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button:focus,
.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar button:hover,
Expand Down
12 changes: 3 additions & 9 deletions xmodule/static/css-builtin-blocks/LTIBlockDisplay.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_display.xmodule_LTIBlock {
/* stylelint-disable-line */
/* stylelint-disable-line */
/* stylelint-disable-line */
/* stylelint-disable-line */
}

.xmodule_display.xmodule_LTIBlock h2.problem-header {
display: inline-block;
}

.xmodule_display.xmodule_LTIBlock div.problem-progress {
display: inline-block;
padding-left: calc((var(--baseline)/4));
padding-left: calc((var(--baseline) / 4));
color: #666;
font-weight: 100;
font-size: 1em;
Expand Down Expand Up @@ -57,6 +51,6 @@
}

.xmodule_display.xmodule_LTIBlock div.lti div.problem-feedback {
margin-top: calc((var(--baseline)/4));
margin-bottom: calc((var(--baseline)/4));
margin-top: calc((var(--baseline) / 4));
margin-bottom: calc((var(--baseline) / 4));
}
8 changes: 2 additions & 6 deletions xmodule/static/css-builtin-blocks/PollBlockDisplay.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_display.xmodule_PollBlock {
/* stylelint-disable-line */
/* stylelint-disable-line */
}

@media print {
.xmodule_display.xmodule_PollBlock div.poll_question {
display: block;
width: auto;
padding: 0;
}

.xmodule_display.xmodule_PollBlock div.poll_question canvas, .xmodule_display.xmodule_PollBlock div.poll_question img {
.xmodule_display.xmodule_PollBlock div.poll_question canvas,
.xmodule_display.xmodule_PollBlock div.poll_question img {
page-break-inside: avoid;
}
}
Expand Down
391 changes: 294 additions & 97 deletions xmodule/static/css-builtin-blocks/ProblemBlockDisplay.css

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions xmodule/static/css-builtin-blocks/ProblemBlockEditor.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_edit.xmodule_ProblemBlock {
}

.xmodule_edit.xmodule_ProblemBlock .ui-col-wide {
width: 74.46809%;
margin-right: 2.12766%;
Expand Down Expand Up @@ -76,7 +73,8 @@
height: 21px;
}

.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:hover, .xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:focus {
.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:hover,
.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:focus {
background: rgba(255, 255, 255, 0.5);
}

Expand Down Expand Up @@ -134,7 +132,8 @@
cursor: none;
}

.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:hover, .xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:focus {
.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:hover,
.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:focus {
box-shadow: 0 0 0 0 !important;
background-color: var(--white);
}
Expand Down Expand Up @@ -208,7 +207,7 @@
background: none;
}

.xmodule_edit.xmodule_ProblemBlock .problem-editor .markdown-box + .CodeMirror {
.xmodule_edit.xmodule_ProblemBlock .problem-editor .markdown-box+.CodeMirror {
padding: 10px;
width: 69%;
}
Expand Down
5 changes: 0 additions & 5 deletions xmodule/static/css-builtin-blocks/SequenceBlockDisplay.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");

.xmodule_display.xmodule_SequenceBlock {
/* stylelint-disable-line */
/* stylelint-disable-line */
}

.xmodule_display.xmodule_SequenceBlock .block-link {
border-left: 1px solid var(--border-color);
display: block;
Expand Down
Loading

0 comments on commit 26afafa

Please sign in to comment.