Skip to content

fix: problem editor content style #34870

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.

Sign up for GitHub

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

Closed
ihor-romaniuk wants to merge 1 commit into from
Closed

fix: problem editor content style #34870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions cms/static/sass/xmodule/_headings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $headings-base-color: $gray-d2;
%hd-3 {
margin-bottom: ($baseline / 2);
font-size: 1.35em;
font-weight: $headings-font-weight-normal;
font-weight: $headings-font-weight-bold;
line-height: 1.4em;
}

Expand Down Expand Up @@ -105,15 +105,13 @@ $headings-base-color: $gray-d2;
// ----------------------------
// canned heading classes
@for $i from 1 through $headings-count {
h#{$i},
.hd-#{$i} {
@extend %hd-#{$i};
}
}

h3 {
@extend %hd-2;

font-weight: $headings-font-weight-normal;
// override external modules and xblocks that use inline CSS
text-transform: initial;
}
Expand Down
11 changes: 7 additions & 4 deletions lms/static/sass/base/_headings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $headings-base-color: $gray-d2;
%hd-3 {
margin-bottom: ($baseline / 2);
font-size: 1.35em;
font-weight: $headings-font-weight-normal;
font-weight: $headings-font-weight-bold;
line-height: 1.4em;
}

Expand Down Expand Up @@ -112,10 +112,13 @@ $headings-base-color: $gray-d2;
// H3 was problematic in xblocks, we so we'll keep it as it was

.xblock .xblock {
h2 {
@extend %hd-2;
@for $i from 1 through $headings-count {
h#{$i} {
@extend %hd-#{$i};
}
}

font-weight: $headings-font-weight-bold;
h2 {
// override external modules and xblocks that use inline CSS
text-transform: initial;

Expand Down
25 changes: 20 additions & 5 deletions xmodule/assets/capa/_display.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,10 @@ div.problem {
}

.grading {
margin: 0px 7px 0 0;
margin: 0 7px 0 0;
padding-left: 25px;
background: url('#{$static-path}/images/info-icon.png') left center no-repeat;
text-indent: 0px;
text-indent: 0;
}

p {
Expand Down Expand Up @@ -646,7 +646,7 @@ div.problem {
}

.submit-message-container {
margin: $baseline 0px ;
margin: $baseline 0;
}
}

Expand All @@ -657,13 +657,15 @@ div.problem {
}

ul {
padding-left: 1em;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
list-style: disc outside none;
}

ol {
padding-left: 1em;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
Expand Down Expand Up @@ -705,6 +707,8 @@ div.problem {
margin: lh() 0;
border-collapse: collapse;
table-layout: auto;
max-width: 100%;
border: 1px solid;

td, th {
&.cont-justified-left {
Expand Down Expand Up @@ -745,6 +749,7 @@ div.problem {

tr, td, th {
vertical-align: middle;
border: 1px solid;
}
}

Expand Down Expand Up @@ -1155,10 +1160,10 @@ div.problem {
color: $uxpl-gray-dark;
}

li {
li[class*="hint-index-"] {
color: $uxpl-gray-base;

strong {
& > strong {
color: $uxpl-gray-dark;
}
}
Expand Down Expand Up @@ -1187,6 +1192,16 @@ div.problem {
margin-bottom: $baseline / 4;
}
}

li[class*="hint-index-"] ul,
li[class*="hint-index-"] ol {
padding: 0 0 0 1em;
margin-left: .75rem;
}

li[class*="hint-index-"] ol {
list-style: decimal outside none;
}
}

.notification-btn-wrapper {
Expand Down