Skip to content

Commit 5411360

Browse files
Try to match exercise styles as best as possible
1 parent 0d7a5f7 commit 5411360

File tree

3 files changed

+29
-24
lines changed

3 files changed

+29
-24
lines changed

styles/books/algebra-1/book.scss

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ $ChapterIntroType: fullWidth;
127127
@include add_settings((
128128
EverydayExercises: (
129129
_selectors: ('section.practice', 'section.numbered-exercises'),
130+
MultipartQuestionIdent: (
131+
margin-left: initial,
132+
),
133+
ProblemSolutionNumber: (
134+
font-weight: initial,
135+
),
130136
),
131137
ReviewExercises: (
132138
_selectors: ('.os-eoc.os-review-exercises-container > section.review-exercises'),
@@ -260,20 +266,17 @@ $ChapterIntroType: fullWidth;
260266
}
261267
}
262268

263-
@mixin PracticeQuestionNumbers {
264-
section.practice [data-type=injected-exercise] > [data-type=exercise-question] {
265-
[data-type=question-stem] {
266-
> ol:not([type=a]) > li::marker {
267-
@content;
269+
@mixin SplitMultipart {
270+
[data-type=exercise-stimulus] {
271+
> ol:not(.circled):not(.os-stepwise),
272+
> ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) {
273+
&:not(:nth-of-type(1)) {
274+
margin-left: #{h-spacing(3)};
268275
}
269276
}
270277
}
271278
}
272279

273-
@include PracticeQuestionNumbers {
274-
font-weight: bold;
275-
};
276-
277280
@include HideSolutions();
278281
@include BorderlessTable();
279282
@include ImageBaseline();
@@ -283,6 +286,7 @@ $ChapterIntroType: fullWidth;
283286
$borderColor: settings("colorMap:::boxedTitleColor"),
284287
);
285288
@include TableSettings();
289+
@include SplitMultipart();
286290
@include use('BookRoot', "common:::BookRoot");
287291
@include use('LearningObjectivesNumbered', 'corn:::LearningObjectivesNumberedShape');
288292
@include use('Toc', 'corn:::NoUnitToc');

styles/designs/corn/parts/_exercises-components.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ $Exercise__ProblemSolution__Number: (
112112
display: table-cell,
113113
text-decoration: none,
114114
color: enum('ValueSet:::REQUIRED'),
115-
font-weight: bold,
115+
font-weight: (enum('ValueSet:::OPTIONAL'), bold),
116116
width: enum('ValueSet:::OPTIONAL'), // Used in one column exercises, answer key
117117
text-align: enum('ValueSet:::OPTIONAL'), // Used in one column exercises, answer key
118118
)
@@ -141,7 +141,7 @@ $InjectedExercise--Multipart__QuestionIndent: (
141141
_name: "MultipartQuestionIdent",
142142
_subselector: ' [data-type="injected-exercise"][data-is-multipart="True"] > [data-type="exercise-question"]',
143143
_properties: (
144-
margin-left: h-spacing(2),
144+
margin-left: (enum('ValueSet:::OPTIONAL'), h-spacing(2)),
145145
)
146146
);
147147

styles/output/algebra-1-pdf.css

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -985,10 +985,6 @@ div[data-type=composite-page].os-eob {
985985
margin-bottom: 0.8in;
986986
margin-top: 0.8in;
987987
}
988-
section.practice [data-type=injected-exercise] > [data-type=exercise-question] [data-type=question-stem] > ol:not([type=a]) > li::marker {
989-
font-weight: bold;
990-
}
991-
992988
[data-type=solution] {
993989
display: none;
994990
}
@@ -1034,7 +1030,7 @@ img {
10341030
align-items: center;
10351031
}
10361032

1037-
.os-table > table:has(figure) {
1033+
.os-table > table:has(figure img) {
10381034
table-layout: fixed;
10391035
width: 100%;
10401036
}
@@ -1044,6 +1040,11 @@ img {
10441040
margin-right: initial;
10451041
}
10461042

1043+
[data-type=exercise-stimulus] > ol:not(.circled):not(.os-stepwise):not(:nth-of-type(1)),
1044+
[data-type=exercise-stimulus] > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]):not(:nth-of-type(1)) {
1045+
margin-left: 24px;
1046+
}
1047+
10471048
:root {
10481049
font-family: Noto Sans, sans-serif, StixGeneral;
10491050
font-size: 11px;
@@ -3603,7 +3604,7 @@ section.practice [data-type=exercise] [data-type=problem] > .os-number {
36033604
display: table-cell;
36043605
text-decoration: none;
36053606
color: #000000;
3606-
font-weight: bold;
3607+
font-weight: initial;
36073608
}
36083609

36093610
section.practice [data-type=exercise] [data-type=problem] > .os-divider {
@@ -3650,7 +3651,7 @@ section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-n
36503651
display: table-cell;
36513652
text-decoration: none;
36523653
color: #000000;
3653-
font-weight: bold;
3654+
font-weight: initial;
36543655
}
36553656

36563657
section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-divider {
@@ -3695,7 +3696,7 @@ section.practice [data-type=injected-exercise] [data-type=exercise-question] > .
36953696
display: table-cell;
36963697
text-decoration: none;
36973698
color: #000000;
3698-
font-weight: bold;
3699+
font-weight: initial;
36993700
}
37003701

37013702
section.practice [data-type=injected-exercise] [data-type=exercise-question] > .os-divider {
@@ -3735,7 +3736,7 @@ section.practice [data-type=injected-exercise] [data-type=exercise-question] .os
37353736
}
37363737

37373738
section.practice [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] {
3738-
margin-left: 16px;
3739+
margin-left: initial;
37393740
}
37403741

37413742
section.numbered-exercises > p > [data-effect=bold] {
@@ -3772,7 +3773,7 @@ section.numbered-exercises [data-type=exercise] [data-type=problem] > .os-number
37723773
display: table-cell;
37733774
text-decoration: none;
37743775
color: #000000;
3775-
font-weight: bold;
3776+
font-weight: initial;
37763777
}
37773778

37783779
section.numbered-exercises [data-type=exercise] [data-type=problem] > .os-divider {
@@ -3819,7 +3820,7 @@ section.numbered-exercises [data-type=exercise].material-set-2 [data-type=proble
38193820
display: table-cell;
38203821
text-decoration: none;
38213822
color: #000000;
3822-
font-weight: bold;
3823+
font-weight: initial;
38233824
}
38243825

38253826
section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] > .os-divider {
@@ -3864,7 +3865,7 @@ section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-que
38643865
display: table-cell;
38653866
text-decoration: none;
38663867
color: #000000;
3867-
font-weight: bold;
3868+
font-weight: initial;
38683869
}
38693870

38703871
section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] > .os-divider {
@@ -3904,7 +3905,7 @@ section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-que
39043905
}
39053906

39063907
section.numbered-exercises [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] {
3907-
margin-left: 16px;
3908+
margin-left: initial;
39083909
}
39093910

39103911
.os-key-equations-container > section {

0 commit comments

Comments
 (0)