diff --git a/CHANGELOG.md b/CHANGELOG.md index f2cbb6f1a..358ead937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] + +## [v2.12.0] - 2025-08-25 + - Add `UnitToc` to `corn` - Use `UnitToc` in `algebra-1` +- Style `exercises` differently in `algebra-1` so they are more cohesive +- Style tables containing figures with 100% width in `algebra-1` +- Style `th` in `tbody` within `corn` +- Add `text-only` title support for `algebra-1` +- Add baseline `max-width` for images in `algebra-1` +- Visually hide `solutions` in `algebra-1` +- Add borderless table to `algebra-1` +- Style unit page titles the same as chapter page titles in `algebra-1` +- Style `section.numbered-exercises` as `EverydayExercises` +- Use `IconCondensedNoteWithSubtitleShape` for notes in `algebra-1` - Add `folio_new` to `corn` - Use `folio_new` in `algebra-1` +- Add `IconCondensedNoteWithoutTitleShape` to `corn` +- Add `GenericExampleTitleShape` to `corn` ## [v2.11.0] - 2025-05-20 diff --git a/styles/books/algebra-1/book.scss b/styles/books/algebra-1/book.scss index 890e23661..7a0eba36f 100644 --- a/styles/books/algebra-1/book.scss +++ b/styles/books/algebra-1/book.scss @@ -1,7 +1,7 @@ -// Books using those settings: Calculus Vol1, Vol2 and Vol3 +@use "../../lib/corn/features/tables"; $PagesWithBands: ( - (pageName: eoc, firstSelector: '.os-eoc.os-chapter-review-container', generalSelector: '.os-eoc'), + (pageName: eoc, firstSelector: '[data-type=page]:has(.custom-eoc)', generalSelector: '[data-type=page]:has(.custom-eoc)'), (pageName: eob, firstSelector: '.os-eob[data-type="composite-chapter"]', generalSelector: '.os-eob'), (pageName: appendix, firstSelector: '.appendix', generalSelector: '.appendix'), ); @@ -16,9 +16,14 @@ $ChapterIntroType: fullWidth; //Settings +$pageWidth: 6in; +$noteTitlePadding: h-spacing(3); + @include add_settings(( NoClassNote: ( _selectors: ('[data-type="note"]:not([class])'), + 'Container:::margin-top': v-spacing(2), + 'Container:::margin-bottom': v-spacing(2), 'Title:::background-color': (_ref: "colorMap:::boxedBackgroundColor"), 'Title:::border-bottom-color': (_ref: "colorMap:::boxedBorderColor"), 'Title:::color': (_ref: "colorMap:::boxedTitleColor"), @@ -26,74 +31,201 @@ $ChapterIntroType: fullWidth; 'Body:::color': (_ref: "colorMap:::boxedTextColor"), 'Body:::font-family': (_ref: "typography:::baseFont"), 'Body:::background-color': (_ref: "colorMap:::boxedBackgroundColor"), + 'ImageInMedia:::width': 3in, + 'ImageInMedia:::margin-left': auto, + 'ImageInMedia:::margin-right': auto, ), Try: ( _selectors: ('[data-type="note"].try'), - 'Container:::display': table, - 'Title:::display': table-cell, - 'Title:::padding-right': h-spacing(3), + 'Container:::display': flex, + 'Container:::margin-top': v-spacing(4), + 'Container:::margin-bottom': v-spacing(4), + 'Title:::padding-right': $noteTitlePadding, + 'Title:::max-width': 15%, 'Title:::white-space': nowrap, + 'TitleLabel:::color': (_ref: "colorMap:::iconCondensedLabelColor"), + 'TitleLabel:::font-family': (_ref: "typography:::baseFont"), + 'TitleLabel:::margin-right': h-spacing(2), 'TitleNumber:::color': (_ref: "colorMap:::iconCondensedTextColor"), 'TitleNumber:::font-family': (_ref: "typography:::titleFont"), - 'Body:::color': (_ref: "colorMap:::iconCondensedTextColor"), + 'Body:::color': (_ref: "colorMap:::fontBodyColor"), 'Body:::font-family': (_ref: "typography:::baseFont"), - 'Body:::display': table-cell, - 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-be-prepared.svg")) no-repeat top left, - 'TitleIcon:::flex-shrink': 0, + 'Body:::width': 85%, + 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-tryit.svg")) no-repeat top left, + 'Subtitle:::color': (_ref: "colorMap:::iconBoxedTextColor"), + 'Subtitle:::font-family': (_ref: "typography:::titleFont"), ), GeneralStrategies: ( _selectors: ('[data-type="note"].general-strategies'), - 'Container:::display': table, - 'Title:::display': table-cell, - 'Title:::padding-right': h-spacing(3), + 'Container:::display': flex, + 'Container:::margin-top': v-spacing(4), + 'Container:::margin-bottom': v-spacing(4), + 'Title:::padding-right': $noteTitlePadding, + 'Title:::max-width': 20%, 'Title:::white-space': nowrap, + 'TitleLabel:::color': (_ref: "colorMap:::iconCondensedLabelColor"), + 'TitleLabel:::font-family': (_ref: "typography:::baseFont"), + 'TitleLabel:::margin-right': h-spacing(2), 'TitleNumber:::color': (_ref: "colorMap:::iconCondensedTextColor"), 'TitleNumber:::font-family': (_ref: "typography:::titleFont"), - 'Body:::color': (_ref: "colorMap:::iconCondensedTextColor"), + 'Body:::color': (_ref: "colorMap:::fontBodyColor"), 'Body:::font-family': (_ref: "typography:::baseFont"), - 'Body:::display': table-cell, - 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-be-prepared.svg")) no-repeat top left, - 'TitleIcon:::flex-shrink': 0, + 'Body:::width': 80%, + 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-manipmath.svg")) no-repeat top left, + 'Subtitle:::color': (_ref: "colorMap:::iconBoxedTextColor"), + 'Subtitle:::font-family': (_ref: "typography:::titleFont"), ), MiniLessonQuestion: ( _selectors: ('[data-type="note"].mini-lesson-question'), - 'Container:::display': table, - 'Title:::display': table-cell, - 'Title:::padding-right': h-spacing(3), + 'Container:::display': flex, + 'Container:::margin-top': v-spacing(4), + 'Container:::margin-bottom': v-spacing(4), + 'Title:::padding-right': $noteTitlePadding, + 'Title:::max-width': 30%, 'Title:::white-space': nowrap, + 'TitleLabel:::color': (_ref: "colorMap:::iconCondensedLabelColor"), + 'TitleLabel:::font-family': (_ref: "typography:::baseFont"), + 'TitleLabel:::margin-right': h-spacing(2), 'TitleNumber:::color': (_ref: "colorMap:::iconCondensedTextColor"), 'TitleNumber:::font-family': (_ref: "typography:::titleFont"), - 'Body:::color': (_ref: "colorMap:::iconCondensedTextColor"), + 'Body:::color': (_ref: "colorMap:::fontBodyColor"), 'Body:::font-family': (_ref: "typography:::baseFont"), - 'Body:::display': table-cell, - 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-be-prepared.svg")) no-repeat top left, - 'TitleIcon:::flex-shrink': 0, + 'Body:::width': 70%, + 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-question.svg")) no-repeat top left, + 'Subtitle:::color': (_ref: "colorMap:::iconBoxedTextColor"), + 'Subtitle:::font-family': (_ref: "typography:::titleFont"), ), LinkToLearning: ( _selectors: ('[data-type="note"].link-to-learning'), - 'Container:::display': table, - 'Title:::display': table-cell, - 'Title:::padding-right': h-spacing(3), + 'Container:::display': flex, + 'Container:::margin-top': v-spacing(4), + 'Container:::margin-bottom': v-spacing(4), + 'Title:::padding-right': $noteTitlePadding, + 'Title:::max-width': 30%, 'Title:::white-space': nowrap, + 'TitleLabel:::color': (_ref: "colorMap:::iconCondensedLabelColor"), + 'TitleLabel:::font-family': (_ref: "typography:::baseFont"), + 'TitleLabel:::margin-right': h-spacing(2), 'TitleNumber:::color': (_ref: "colorMap:::iconCondensedTextColor"), 'TitleNumber:::font-family': (_ref: "typography:::titleFont"), - 'Body:::color': (_ref: "colorMap:::iconCondensedTextColor"), + 'Body:::color': (_ref: "colorMap:::fontBodyColor"), + 'Body:::font-family': (_ref: "typography:::baseFont"), + 'Body:::width': 70%, + 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-link.svg")) no-repeat top left, + 'Subtitle:::color': (_ref: "colorMap:::iconBoxedTextColor"), + 'Subtitle:::font-family': (_ref: "typography:::titleFont"), + ), + Document: ( + _selectors: ('[data-type="note"].document'), + 'Container:::display': flex, + 'Container:::margin-top': v-spacing(4), + 'Container:::margin-bottom': v-spacing(4), + 'Container:::margin-left': calc(2.5rem + h-spacing(1)), + 'Body:::color': (_ref: "colorMap:::fontBodyColor"), + 'Body:::font-family': (_ref: "typography:::baseFont"), + 'Body:::text-indent': calc(-2.5rem - h-spacing(1)), + 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-summary.svg")) no-repeat top left, + 'TitleIcon:::width': 2.5rem, + 'TitleIcon:::height': 2.5rem, + 'TitleIcon:::vertical-align': middle, + ), + SelfCheck: ( + _selectors: ('[data-type="note"].self-check'), + 'Container:::margin-top': v-spacing(2), + 'Container:::margin-bottom': v-spacing(2), + 'Title:::background-color': (_ref: "colorMap:::iconBoxedBackgroundColor"), + 'Title:::border-bottom-color': (_ref: "colorMap:::boxedBorderColor"), + 'Title:::color': (_ref: "colorMap:::boxedTitleColor"), + 'Title:::font-family': (_ref: "typography:::titleFont"), + 'Body:::color': (_ref: "colorMap:::boxedTextColor"), 'Body:::font-family': (_ref: "typography:::baseFont"), - 'Body:::display': table-cell, - 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-be-prepared.svg")) no-repeat top left, - 'TitleIcon:::flex-shrink': 0, + 'Body:::background-color': (_ref: "colorMap:::iconBoxedBackgroundColor"), + 'ImageInMedia:::width': 3in, + 'ImageInMedia:::margin-left': auto, + 'ImageInMedia:::margin-right': auto, ), )); @include add_settings(( EverydayExercises: ( - _selectors: ('section.practice'), + _selectors: ('section.numbered-exercises'), + FirstLevelOrderedList: ( + margin-left: h-spacing(5), + ), + ExercisesParagraphTitleItalic: ( + font-family: (_ref: 'typography:::baseFont'), + color: null, + margin-top: v-spacing(1), + font-style: null, + ), + MultipartQuestionIdent: ( + margin-left: initial, + ), ), - ReviewExercises: ( - _selectors: ('.os-eoc.os-review-exercises-container > section.review-exercises'), +)); + +@include add_settings(( + PracticeExercises: ( // Two Column Exercise Module + _selectors: ('section.practice'), + FirstLevelOrderedList: ( + margin-left: h-spacing(5), + ), + MultipartQuestionIdent: ( + margin-left: initial, + ), + ExerciseContainer: ( + width: initial, + display: initial, + ), + ProblemWrapper: ( + display: initial, + ), + ExercisesParagraphTitle: ( + font-family: (_ref: 'typography:::baseFont'), + color: (_ref: 'colorMap:::moduleTitleColor'), + margin-top: v-spacing(1), + font-style: normal, + ), + ExercisesParagraphTitleItalic: ( + font-family: (_ref: 'typography:::baseFont'), + color: null, + margin-top: v-spacing(1), + font-style: null, + ), + ProblemSolutionNumber: ( + color: (_ref: 'colorMap:::fontBodyColor'), + ), ), )); +[data-type=injected-exercise] ol:not(.os-raise-noindent), [data-type=exercise] ol:not(.os-raise-noindent) { + margin-left: 16px; +} + +[data-type=injected-exercise] ul:not(.os-raise-noindent), [data-type=exercise] ul:not(.os-raise-noindent) { + margin-left: 16px; +} + +// Ensure proper scaling +section:has([data-type=note]) { + width: 100%; +} + +@mixin PracticeQuestionNumbers { + section.practice [data-type=injected-exercise] { + > [data-type=exercise-stimulus], + > [data-type=exercise-question] [data-type=question-stem] { + > ol:not([type=a]) > li::marker { + @content; + } + } + } +} + +@include PracticeQuestionNumbers { + font-weight: bold; +}; + @include add_settings (( AnswerKeyExercisesSolutionLists: ( _selectors: ('.os-eob.os-solutions-container [data-type="solution"]'), @@ -118,11 +250,299 @@ $ChapterIntroType: fullWidth; ), )); +@include add_settings(( + ModuleTitles: ( + _selectors: ( + settings('ModuleTitles:::_selectors'), + '[data-type=unit] > [data-type=page]:not(.introduction)', + ), + 'H2Title:::margin-top': v-spacing(3), + 'H3Title:::margin-top': v-spacing(2), + ) +)); + +@include add_settings(( + ModuleSectionWithBorder: ( + _selectors: ('section.check-understanding'), + ModuleSectionWithBorder: ( + border-top-style: solid, + border-bottom-style: solid, + border-color: (_ref: 'colorMap:::moduleTitleColor'), + border-width: 1px, + padding: v-spacing(2) 0, + break-inside: avoid, + ) + ) +)); + +@include add_settings(( + BasicTable: ( + 'TableHeadCell:::background-color': (_ref: 'colorMap:::algebra1TableColor'), + 'TableData:::border-color': (_ref: 'colorMap:::algebra1TableColor'), + ), + ColumnHeader: ( + 'TableHeadCell:::background-color': (_ref: 'colorMap:::algebra1TableColor'), + 'TableData:::border-color': (_ref: 'colorMap:::algebra1TableColor'), + ), + UnnumberedUnstyledTable: ( + 'TableHeadCell:::background-color': (_ref: 'colorMap:::algebra1TableColor'), + 'TableData:::border-color': (_ref: 'colorMap:::algebra1TableColor'), + ), + DataTable: ( + 'TableHeadCell:::background-color': (_ref: 'colorMap:::algebra1TableColor'), + 'TableData:::border-color': (_ref: 'colorMap:::algebra1TableColor'), + ), +)); + +// For when answers are incorrectly included in questions as first level lists +[data-type="exercise-question"] > div > div > ol[type="a"]:not(.circled):not(.os-stepwise):not(.os-raise-noindent):nth-of-type(2) { + margin-left: h-spacing(5); +} + +@include tables.distributed-table-images((2, 3, 4, 5, 6), $pageWidth); + +// We do not want these tables to be centered on the page +@mixin TableSettings { + .os-table { + [data-type=injected-exercise] + [data-type=exercise-question] + .os-problem-container + [data-type=answer-content] > & { + display: initial; + margin-left: initial; + margin-right: initial; + } + } +} + +// Add support for custom numbering +.custom-question-container { + display: table; +} + +span.custom-question-number { + display: table-cell; + padding-right: 10px; + font-weight: bold; +} + +// Align the ordered list with the other questions +ol.custom-question-number { + list-style: none; + margin: 0 !important; + counter-set: question 0; +} + +ol.custom-question-number > li { + display: table; +} + +ol.custom-question-number > li::before { + counter-increment: question; + content: counter(question)"."; + font-weight: bold; + padding-right: 10px; + display: table-cell; +} + +.custom-numbering { + font-weight: bold; + display: inline-block; + padding-right: 10px; +} + +// Avoid breaks between `p` describing `media` +section.numbered-exercises, section.practice [data-type=problem] { + > p:has(+ [data-type=media]) { + break-after: avoid; + break-inside: avoid-page; + } +} + +section.numbered-exercises [data-type=exercise]:has([data-type=problem] .os-problem-container [data-type=media]) { + display: inline-block; + vertical-align: top; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem]:has(.os-problem-container [data-type=media]) { + display: flex; + overflow-wrap: break-word; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container:has([data-type=media]) { + display: flex; + flex-wrap: wrap; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container:has([data-type=media]) > p:not(:has([data-type=media])) { + width: 100%; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container [data-type=media] { + width: 100%; +} + +section.numbered-exercises [data-type=exercise] img { + max-width: 95%; +} + +@include add_settings(( + HiddenElements: ( + _selectors: ('[data-type=solution]') + ) +)); + +@mixin BorderlessTable { + .os-table table.borderless { + thead > tr > th, + tbody > tr > td { + border: none !important; + } + } +} + +@mixin ImageBaseline { + img { + max-width: 4in; + max-height: 3in; + height: auto; + width: auto; + + [data-type=media] > & { + display: block; + margin-bottom: #{v-spacing(2)}; + } + } +} + +@mixin TextOnlyChapterTitle( + $mainFontColor, + $mainFontFamily, + $borderColor, + $mainFontSize: font-scale(4) +) { + [data-type=unit] > h1[data-type=document-title] { + display: none; + } + + [data-type=chapter] > h1[data-type=document-title] { + display: flex; + align-items: center; + color: #{$mainFontColor}; + font-family: #{$mainFontFamily}; + font-size: #{$mainFontSize}; + line-height: #{$mainFontSize}; + height: font-scale(8); + + > .os-number { + border-style: solid; + border-width: 0.07rem; + border-color: #{$borderColor}; + text-transform: uppercase; + padding: 0.5rem; + margin-right: 1rem; + } + + > .os-part-text { + display: none; + } + + > .os-text { + font-weight: bold; + text-transform: uppercase; + prince-filter-resolution: 300dpi; + justify-content: center; + align-items: center; + } + } +} + +@mixin SplitMultipart { + [data-type=exercise-stimulus] { + > ol:not(.circled):not(.os-stepwise), + > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { + margin-left: #{h-spacing(3)}; + } + } +} + +@include add_settings(( + GenericImageSized: ( + _selectors: ( + 'section.numbered-exercises [data-type=exercise]', + 'section.practice > [data-type=injected-exercise]', + 'section.practice > [data-type=exercise]', + '[data-type="note"][class] > .os-note-body' + ), + ImageInMedia: ( + max-height: 2in, + display: null, + margin-bottom: null, + margin-left: null, + margin-right: null, + ), + ) +)); + +// Use the global image constraints instead +@include add_settings(( + FigureFromExercisesProblem: ( + 'Image:::max-width': null, + ), + FigureFromExercisesSolution: ( + 'Image:::max-width': null, + ), + FigureFromInjectedQuestion: ( + 'Image:::max-width': null, + ), + FigureFromInjectedSolution: ( + 'Image:::max-width': null, + ), +)); + +@include add_settings(( + LabeledImage: ( + _selectors: ('[data-type=exercise] > [data-type=problem] > .os-problem-container > div.half.labeled-image'), + 'FixedWidth:::width': 45%, + ) +)); + +@include add_settings(( + ExampleTitlePara: ( + _selectors: ('p.example-title'), + ExampleContainer: ( + border-top-color: (_ref: 'colorMap:::exampleBorderColor'), + border-bottom-width: null, + border-bottom-style: null, + border-bottom-color: null, + ), + ExampleTitle: ( + font-family: (_ref: 'typography:::baseFont'), + color: (_ref: 'colorMap:::exampleTitleColor'), + background-color: (_ref: 'colorMap:::exampleBorderColor'), + ), + ) +)); + +@include BorderlessTable(); +@include ImageBaseline(); +@include TextOnlyChapterTitle( + $mainFontColor: settings("colorMap:::boxedTitleColor"), + $mainFontFamily: settings("typography:::titleFont"), + $borderColor: settings("colorMap:::boxedTitleColor"), +); +@include TableSettings(); +@include SplitMultipart(); @include use('BookRoot', "common:::BookRoot"); +@include use('HiddenElements', 'common:::Hidden'); @include use('LearningObjectivesNumbered', 'corn:::LearningObjectivesNumberedShape'); @include use('TocUnit', 'corn:::UnitToc'); @include use('Example', 'corn:::ExampleShape'); +@include use('ExampleTitlePara', 'corn:::GenericExampleTitleShape'); @include use('ModuleWithoutTitleLinks','common:::ModuleWithoutTitleLinksShape'); // Used in eoc, eos exercises +@include use('ModuleSectionWithBorder', 'common:::ModuleSectionWithBorderShape'); +@include use('GenericImageSized', 'corn:::GenericImageShape'); +@include use('LabeledImage', 'common:::LabeledItem'); // Chapter Intro @include use('ChapterOutline', 'corn:::ChapterOutlineShape'); @@ -152,7 +572,7 @@ $ChapterIntroType: fullWidth; @include use('ListsFromExercises', 'corn:::ListsFromExercisesShape'); //Titles -@include use('ChapterTitles', 'corn:::ChapterTitlesShape'); +// @include use('ChapterTitles', 'corn:::ChapterTitlesShape'); @include use('ChapterIntroTitles', 'corn:::ChapterIntroTitlesShape'); @include use('ModuleTitles', 'corn:::ModuleTitlesShape'); @include use('CompositeChapterTitles', 'corn:::CompositeChapterTitlesShape'); @@ -161,10 +581,12 @@ $ChapterIntroType: fullWidth; //Notes @include use('NoClassNote', 'corn:::BoxedNoteShape'); -@include use('Try', 'corn:::IconCondensedNoteWithHiddenLabelShape'); -@include use('GeneralStrategies', 'corn:::IconCondensedNoteWithHiddenLabelShape'); -@include use('MiniLessonQuestion', 'corn:::IconCondensedNoteWithHiddenLabelShape'); -@include use('LinkToLearning', 'corn:::IconCondensedNoteWithHiddenLabelShape'); +@include use('Try', 'corn:::IconCondensedNoteWithSubtitleShape'); +@include use('GeneralStrategies', 'corn:::IconCondensedNoteWithSubtitleShape'); +@include use('MiniLessonQuestion', 'corn:::IconCondensedNoteWithSubtitleShape'); +@include use('LinkToLearning', 'corn:::IconCondensedNoteWithSubtitleShape'); +@include use('Document', 'corn:::IconCondensedNoteWithoutTitleShape'); +@include use('SelfCheck', 'corn:::BoxedNoteShape'); //Equations @include use('Equation', 'corn:::EquationShape'); @@ -189,12 +611,13 @@ $ChapterIntroType: fullWidth; //Section Exercises @include use('EverydayExercises', 'corn:::ExercisesModuleShape'); +@include use('PracticeExercises', 'corn:::ExercisesModuleShape'); //Key Equations spacing @include use('KeyEquations','corn:::ModuleWithUnstyledTableShape'); // EoC Exercises -@include use('ReviewExercises', 'corn:::ExercisesModuleShape'); +// @include use('ReviewExercises', 'corn:::ExercisesModuleShape'); //EOB @include use('AnswerKey', 'corn:::AnswerKeyShape'); diff --git a/styles/books/contemporary-math/book.scss b/styles/books/contemporary-math/book.scss index f453be6cb..78f714310 100644 --- a/styles/books/contemporary-math/book.scss +++ b/styles/books/contemporary-math/book.scss @@ -173,8 +173,6 @@ $bandColor: #093D4C; 'Body:::display': table-cell, 'TitleIcon:::background': url(toDataUri("svg+xml", "designs/corn/resources/corn-checkpoint.svg")) no-repeat top left, 'TitleIcon:::flex-shrink': 0, - 'TitleIcon:::width': h-spacing(3), - 'TitleIcon:::height': v-spacing(3), 'Title:::vertical-align': text-top, 'TitleIcon:::background-size': contain, ), diff --git a/styles/design-settings/corn/_colors.scss b/styles/design-settings/corn/_colors.scss index 535b1b103..56fb6ebd7 100644 --- a/styles/design-settings/corn/_colors.scss +++ b/styles/design-settings/corn/_colors.scss @@ -10,6 +10,7 @@ G2: #C6CE33, G4: #e9f4f1, G5: #092d23, + G6: #0B5B51, Grey1: #F1F1F1, Grey2: #F9F9F9, Grey3: #757474, @@ -85,5 +86,6 @@ statsLabTitleColor: (_ref: "scheme:::B1"), instructionsListItemColor: (_ref: "scheme:::B2"), keyEquationsBorderColor: (_ref: "scheme:::Grey1"), + algebra1TableColor: (_ref: "scheme:::G6"), ), )); diff --git a/styles/designs/common/pdf/_common-components.scss b/styles/designs/common/pdf/_common-components.scss index 5db35c44f..6600d2664 100644 --- a/styles/designs/common/pdf/_common-components.scss +++ b/styles/designs/common/pdf/_common-components.scss @@ -111,3 +111,22 @@ $CodeSnippet__LineNumbers--Code: ( text-align: enum('ValueSet:::REQUIRED'), ) ); + +$FixedWidth: ( + _name: 'FixedWidth', + _subselector: '', + _properties: ( + width: enum('ValueSet:::REQUIRED'), + ) +); + +$LabelContainer: ( + _name: 'LabelContainer', + _subselector: '', + _properties: ( + display: (enum('ValueSet:::OPTIONAL'), flex), + align-items: (enum('ValueSet:::OPTIONAL'), center), + padding-right: (enum('ValueSet:::OPTIONAL'), 10px), + padding-left: (enum('ValueSet:::OPTIONAL'), 10px), + ) +); diff --git a/styles/designs/common/pdf/_common-shapes.scss b/styles/designs/common/pdf/_common-shapes.scss index 5675a8910..1ab8fbdb2 100644 --- a/styles/designs/common/pdf/_common-shapes.scss +++ b/styles/designs/common/pdf/_common-shapes.scss @@ -66,3 +66,13 @@ )), )), )); + +@include create_shape('common:::LabeledItem', ( + _components: ( + map-merge($LabelContainer, ( + _components: ( + $FixedWidth + ), + )), + ) +)); diff --git a/styles/designs/common/pdf/_module-components.scss b/styles/designs/common/pdf/_module-components.scss index c9de8a134..05f3b1e96 100644 --- a/styles/designs/common/pdf/_module-components.scss +++ b/styles/designs/common/pdf/_module-components.scss @@ -14,4 +14,19 @@ $Module__Section--WithoutMarginBottom:( _properties:( margin-bottom: 0, ) -); \ No newline at end of file +); + +$Module__Section--WithBorders:( + _name: "ModuleSectionWithBorder", + _subselector: "", + _properties:( + border-color: enum('ValueSet:::OPTIONAL'), + border-width: enum('ValueSet:::OPTIONAL'), + padding: enum('ValueSet:::OPTIONAL'), + border-top-style: enum('ValueSet:::OPTIONAL'), + border-left-style: enum('ValueSet:::OPTIONAL'), + border-bottom-style: enum('ValueSet:::OPTIONAL'), + border-right-style: enum('ValueSet:::OPTIONAL'), + break-inside: enum('ValueSet:::OPTIONAL'), + ) +); diff --git a/styles/designs/common/pdf/_module-shapes.scss b/styles/designs/common/pdf/_module-shapes.scss index 840efc527..2e4cba34a 100644 --- a/styles/designs/common/pdf/_module-shapes.scss +++ b/styles/designs/common/pdf/_module-shapes.scss @@ -18,3 +18,14 @@ )), ) )); + +// Use to add borders to sections +@include create_shape('common:::ModuleSectionWithBorderShape', ( + _components: ( + map-merge($Module__Container,( + _components:( + $Module__Section--WithBorders + ), + )), + ) +)); diff --git a/styles/designs/corn/parts/_example-components.scss b/styles/designs/corn/parts/_example-components.scss index 1cd8bce6f..f8fc398fc 100644 --- a/styles/designs/corn/parts/_example-components.scss +++ b/styles/designs/corn/parts/_example-components.scss @@ -5,9 +5,9 @@ $Example__Container: ( border-top-width: 0.09rem, border-top-style: solid, border-top-color: enum('ValueSet:::REQUIRED'), - border-bottom-width: 0.09rem, - border-bottom-style: solid, - border-bottom-color: enum('ValueSet:::REQUIRED'), + border-bottom-width: (enum('ValueSet:::OPTIONAL'), 0.09rem), + border-bottom-style: (enum('ValueSet:::OPTIONAL'), solid), + border-bottom-color: enum('ValueSet:::OPTIONAL'), margin-bottom: v-spacing(2), display: block, box-decoration-break: slice, diff --git a/styles/designs/corn/parts/_example-shapes.scss b/styles/designs/corn/parts/_example-shapes.scss index 4151e698a..7bb62295b 100644 --- a/styles/designs/corn/parts/_example-shapes.scss +++ b/styles/designs/corn/parts/_example-shapes.scss @@ -16,3 +16,15 @@ )), ) )); + +@include create_shape('corn:::GenericExampleTitleShape', ( + _components: ( + map-merge($Example__Container, ( + _components: ( + map-merge($Example__Title, ( + _subselector: ' > :first-child', + )) + ) + )), + ) +)); diff --git a/styles/designs/corn/parts/_exercises-components.scss b/styles/designs/corn/parts/_exercises-components.scss index a6a7ddb08..3c7bd186f 100644 --- a/styles/designs/corn/parts/_exercises-components.scss +++ b/styles/designs/corn/parts/_exercises-components.scss @@ -31,7 +31,7 @@ $Exercise__Problem__Wrapper: ( _name: "ProblemWrapper", _subselector: " [data-type='problem']", _properties:( - display: table, + display: (enum('ValueSet:::OPTIONAL'), table), overflow-wrap: break-word, ) ); @@ -112,7 +112,7 @@ $Exercise__ProblemSolution__Number: ( display: table-cell, text-decoration: none, color: enum('ValueSet:::REQUIRED'), - font-weight: bold, + font-weight: (enum('ValueSet:::OPTIONAL'), bold), width: enum('ValueSet:::OPTIONAL'), // Used in one column exercises, answer key text-align: enum('ValueSet:::OPTIONAL'), // Used in one column exercises, answer key ) @@ -141,7 +141,7 @@ $InjectedExercise--Multipart__QuestionIndent: ( _name: "MultipartQuestionIdent", _subselector: ' [data-type="injected-exercise"][data-is-multipart="True"] > [data-type="exercise-question"]', _properties: ( - margin-left: h-spacing(2), + margin-left: (enum('ValueSet:::OPTIONAL'), h-spacing(2)), ) ); diff --git a/styles/designs/corn/parts/_figureimage-components.scss b/styles/designs/corn/parts/_figureimage-components.scss index 96075c2bc..48eb57126 100644 --- a/styles/designs/corn/parts/_figureimage-components.scss +++ b/styles/designs/corn/parts/_figureimage-components.scss @@ -51,7 +51,7 @@ $Image: ( _name: "Image", _subselector: " img", _properties:( - max-width: 100%, + max-width: (enum('ValueSet:::OPTIONAL'), 100%), ) ); @@ -68,10 +68,14 @@ $Image--InMedia: ( _name: "ImageInMedia", _subselector: ' > [data-type="media"] > img', _properties: ( - display: block, - margin-bottom: v-spacing(2), - margin-left: auto, - margin-right: auto, + display: (enum('ValueSet:::OPTIONAL'), block), + margin-bottom: (enum('ValueSet:::OPTIONAL'), v-spacing(2)), + margin-left: (enum('ValueSet:::OPTIONAL'), auto), + margin-right: (enum('ValueSet:::OPTIONAL'), auto), + max-width: enum('ValueSet:::OPTIONAL'), + max-height: enum('ValueSet:::OPTIONAL'), + width: enum('ValueSet:::OPTIONAL'), + height: enum('ValueSet:::OPTIONAL'), ) ); diff --git a/styles/designs/corn/parts/_figureimage-shapes.scss b/styles/designs/corn/parts/_figureimage-shapes.scss index 8a37f5d8f..6fc501b5c 100644 --- a/styles/designs/corn/parts/_figureimage-shapes.scss +++ b/styles/designs/corn/parts/_figureimage-shapes.scss @@ -105,3 +105,13 @@ $Image--InMedia, ) )); + +// Helper for styling images in random places +@include create_shape('corn:::GenericImageShape', ( + _components: ( + map-merge($Image--InMedia, ( + // A little more generic for this + _subselector: ' img' + )) + ) +)); diff --git a/styles/designs/corn/parts/_table-components.scss b/styles/designs/corn/parts/_table-components.scss index d6ca46b9c..d92e00df1 100644 --- a/styles/designs/corn/parts/_table-components.scss +++ b/styles/designs/corn/parts/_table-components.scss @@ -53,6 +53,7 @@ $Table__Head__Cell: ( padding-right: enum('ValueSet:::REQUIRED'), //used in Exercises padding-left: enum('ValueSet:::REQUIRED'), //used in Exercises background-color: enum('ValueSet:::OPTIONAL'), + border-color: enum('ValueSet:::OPTIONAL'), ) ); @@ -122,6 +123,7 @@ $Table__Data--Centered: ( $Table__Head__Row: empty_wrapper(TableHeadRow, ' > tr'); +$Table__Row--First: empty_wrapper(TableFirstRow, ' > tr:first-of-type'); $Table__Row--Last: empty_wrapper(TableLastRow, ' > tr:last-of-type'); $Table__Data--Last: ( @@ -152,6 +154,22 @@ $Table__Data--First--ColHeader: ( ) ); +$Table__Head__Cell--First--ColHeader: ( + _name: "FirstTableHeadColHeader", + _subselector: " > th[scope=col]:first-child", + _properties: ( + border-top-left-radius: 0.25rem, + ) +); + +$Table__Head__Cell--Last--ColHeader: ( + _name: "LastTableHeadColHeader", + _subselector: " > th[scope=col]:first-child", + _properties: ( + border-bottom-left-radius: 0.25rem, + ) +); + $Table__Data--FirstType: ( _name: "FirstTableDataType", _subselector: " > td:first-of-type", diff --git a/styles/designs/corn/parts/_table-shapes.scss b/styles/designs/corn/parts/_table-shapes.scss index b94bb41ba..bb6ef3896 100644 --- a/styles/designs/corn/parts/_table-shapes.scss +++ b/styles/designs/corn/parts/_table-shapes.scss @@ -11,6 +11,11 @@ _components: ( map-merge($Table__Head, ( _components: ( + map-merge($Table__Row--First, ( + _components: ( + $Table__Head__Cell--First--ColHeader, + ) + )), map-merge($Table__Head__Row, ( _components: ( map-merge($Table__Head__Cell, ( @@ -25,38 +30,45 @@ )), map-merge($Table__Body, ( _components: ( + map-merge($Table__Row--First, ( + _components: ( + $Table__Head__Cell--First--ColHeader, + ) + )), map-merge($Table__Row, ( _components: ( - map-merge($Table__Data, ( - _components: ( - $UnorderedList--FirstLevel, - $OrderedList--FirstLevel, - ) - )), - map-merge($Table__Data--LeftAligned, ( - _components: ( - $UnorderedList--FirstLevel, - $OrderedList--FirstLevel, - ) - )), - map-merge($Table__Data--RightAligned, ( - _components: ( - $UnorderedList--FirstLevel, - $OrderedList--FirstLevel, - ) - )), - map-merge($Table__Data--Centered, ( - _components: ( - $UnorderedList--FirstLevel, - $OrderedList--FirstLevel, - ) - )), + $Table__Head__Cell, + map-merge($Table__Data, ( + _components: ( + $UnorderedList--FirstLevel, + $OrderedList--FirstLevel, + ) + )), + map-merge($Table__Data--LeftAligned, ( + _components: ( + $UnorderedList--FirstLevel, + $OrderedList--FirstLevel, + ) + )), + map-merge($Table__Data--RightAligned, ( + _components: ( + $UnorderedList--FirstLevel, + $OrderedList--FirstLevel, + ) + )), + map-merge($Table__Data--Centered, ( + _components: ( + $UnorderedList--FirstLevel, + $OrderedList--FirstLevel, + ) + )), ) )), map-merge($Table__Row--Last, ( _components: ( $Table__Data--First, $Table__Data--Last, + $Table__Head__Cell--Last--ColHeader, ) )), ) diff --git a/styles/designs/corn/parts/_titles-components.scss b/styles/designs/corn/parts/_titles-components.scss index f49ebd90a..01ccc3e1b 100644 --- a/styles/designs/corn/parts/_titles-components.scss +++ b/styles/designs/corn/parts/_titles-components.scss @@ -18,7 +18,8 @@ $H1: ( font-family: enum('ValueSet:::REQUIRED'), font-size: font-scale(4), line-height: line-height(4), - margin-bottom: v-spacing(1), + margin-top: enum('ValueSet:::OPTIONAL'), + margin-bottom: (enum('ValueSet:::OPTIONAL'), v-spacing(1)), column-span: all, //used in Index ) ); @@ -138,6 +139,7 @@ $H2: ( font-family: enum('ValueSet:::REQUIRED'), font-size: font-scale(3), line-height: line-height(3), + margin-top: enum('ValueSet:::OPTIONAL'), margin-bottom: v-spacing(1), column-span: enum('ValueSet:::OPTIONAL'), // used only in Formula Review in Statistics ) @@ -184,6 +186,7 @@ $H3: ( font-family: enum('ValueSet:::REQUIRED'), font-size: font-scale(2), line-height: line-height(2), + margin-top: enum('ValueSet:::OPTIONAL'), margin-bottom: v-spacing(1), ) ); diff --git a/styles/designs/corn/parts/lists/_lists-components.scss b/styles/designs/corn/parts/lists/_lists-components.scss index f41195052..6da2193a5 100644 --- a/styles/designs/corn/parts/lists/_lists-components.scss +++ b/styles/designs/corn/parts/lists/_lists-components.scss @@ -25,7 +25,7 @@ $UnorderedList--FirstLevel: ( _name: "FirstLevelUnorderedList", _subselector: ' > ul:not(.circled):not(.os-stepwise):not([data-labeled-item="true"])', _properties:( - margin-left: h-spacing(3), + margin-left: (enum('ValueSet:::OPTIONAL'), h-spacing(3)), ) ); @@ -33,7 +33,7 @@ $OrderedList--FirstLevel: ( _name: "FirstLevelOrderedList", _subselector: " > ol:not(.circled):not(.os-stepwise)", _properties:( - margin-left: h-spacing(3), + margin-left: (enum('ValueSet:::OPTIONAL'), h-spacing(3)), ) ); diff --git a/styles/designs/corn/parts/notes/_notes-boxed-shapes.scss b/styles/designs/corn/parts/notes/_notes-boxed-shapes.scss index 74eac0459..6c5806322 100644 --- a/styles/designs/corn/parts/notes/_notes-boxed-shapes.scss +++ b/styles/designs/corn/parts/notes/_notes-boxed-shapes.scss @@ -5,8 +5,12 @@ map-merge($Notes--Boxed__Container, ( _components: ( $Notes--Boxed__Title, - $Notes--Boxed__Body, - ) + map-merge($Notes--Boxed__Body, ( + _components: ( + $Image--InMedia, + ), + )), + ), )), ) )); diff --git a/styles/designs/corn/parts/notes/_notes-components.scss b/styles/designs/corn/parts/notes/_notes-components.scss index 0118c9391..833a690b0 100644 --- a/styles/designs/corn/parts/notes/_notes-components.scss +++ b/styles/designs/corn/parts/notes/_notes-components.scss @@ -7,7 +7,20 @@ $Notes--IconCondensed__Container: ( _subselector: '', _properties: ( display: enum('ValueSet:::OPTIONAL'), //use in notes with note body next to title - margin-bottom: v-spacing(2), + justify-content: enum('ValueSet:::OPTIONAL'), + margin-bottom: (enum('ValueSet:::OPTIONAL'), v-spacing(2)), + margin-top: enum('ValueSet:::OPTIONAL'), + margin-left: enum('ValueSet:::OPTIONAL'), + ) +); + +$Image--InMedia: ( + _name: "ImageInMedia", + _subselector: ' > [data-type="media"] > img', + _properties: ( + margin-left: enum('ValueSet:::OPTIONAL'), + margin-right: enum('ValueSet:::OPTIONAL'), + width: enum('ValueSet:::OPTIONAL'), ) ); @@ -21,6 +34,7 @@ $Notes--IconCondensed__Title: ( display: enum('ValueSet:::OPTIONAL'), //use in notes with note body next to title white-space: enum('ValueSet:::OPTIONAL'), //use in notes with note body next to title margin-bottom: enum('ValueSet:::OPTIONAL'), //use in notes with note body under title + max-width: enum('ValueSet:::OPTIONAL'), ) ); @@ -64,12 +78,12 @@ $Notes--IconCondensed__Title__Icon: ( _properties: ( background: enum('ValueSet:::REQUIRED'), background-size: contain, - height: 1.45rem, - width: 1.45rem, + height: (enum('ValueSet:::OPTIONAL'), 1.45rem), + width: (enum('ValueSet:::OPTIONAL'), 1.45rem), padding-right: h-spacing(1), content: "''", display: inline-block, - vertical-align: text-bottom, + vertical-align: (enum('ValueSet:::OPTIONAL'), text-bottom), ) ); @@ -83,6 +97,8 @@ $Notes--IconCondensed__Body: ( line-height: line-height(0), margin-left: enum('ValueSet:::OPTIONAL'), //use in notes with note body under title display: enum('ValueSet:::OPTIONAL'), //use in notes with note body next to title + width: enum('ValueSet:::OPTIONAL'), + text-indent: enum('ValueSet:::OPTIONAL'), ) ); @@ -186,7 +202,8 @@ $Notes--Boxed__Container: ( _name: "Container", _subselector: '', _properties: ( - margin-bottom: v-spacing(2), + margin-bottom: (enum('ValueSet:::OPTIONAL'), v-spacing(2)), + margin-top: enum('ValueSet:::OPTIONAL'), ) ); diff --git a/styles/designs/corn/parts/notes/_notes-iconCondensed-shapes.scss b/styles/designs/corn/parts/notes/_notes-iconCondensed-shapes.scss index 9a26a262d..840da5dda 100644 --- a/styles/designs/corn/parts/notes/_notes-iconCondensed-shapes.scss +++ b/styles/designs/corn/parts/notes/_notes-iconCondensed-shapes.scss @@ -55,3 +55,19 @@ )), ) )); + +@include create_shape('corn:::IconCondensedNoteWithoutTitleShape', ( + _components: ( + map-merge($Notes--IconCondensed__Container, ( + _components: ( + map-merge($Notes--IconCondensed__Body, ( + _components: ( + map-merge($Notes--IconCondensed__Title__Icon, ( + _subselector: ' > :first-child::before' + )), + ) + )) + ) + )), + ) +)); diff --git a/styles/designs/corn/resources/corn-summary.svg b/styles/designs/corn/resources/corn-summary.svg new file mode 100644 index 000000000..cbdfa6e70 --- /dev/null +++ b/styles/designs/corn/resources/corn-summary.svg @@ -0,0 +1 @@ +Summary diff --git a/styles/lib/corn/_corn.scss b/styles/lib/corn/_corn.scss new file mode 100644 index 000000000..9b09b6b62 --- /dev/null +++ b/styles/lib/corn/_corn.scss @@ -0,0 +1 @@ +@forward 'lib/corn/features/tables'; diff --git a/styles/lib/corn/features/_tables.scss b/styles/lib/corn/features/_tables.scss new file mode 100644 index 000000000..f91a37af9 --- /dev/null +++ b/styles/lib/corn/features/_tables.scss @@ -0,0 +1,199 @@ +@mixin table-column() { + .os-table [data-columns="2"][data-ratio="1,1"] col[data-width="1*"] { + width: 50%; + } + + .os-table [data-columns="2"][data-ratio="1,2"] col[data-width="1*"] { + width: 33.3333333333%; + } + + .os-table [data-columns="2"][data-ratio="1,2"] col[data-width="2*"] { + width: 66.6666666667%; + } + + .os-table [data-columns="2"][data-ratio="1,3"] col[data-width="1*"] { + width: 25%; + } + + .os-table [data-columns="2"][data-ratio="2,2"] col[data-width="2*"] { + width: 50%; + } + + .os-table [data-columns="2"][data-ratio="1,3"] col[data-width="3*"] { + width: 75%; + } + + .os-table [data-columns="2"][data-ratio="2,3"] col[data-width="2*"] { + width: 40%; + } + + .os-table [data-columns="2"][data-ratio="2,3"] col[data-width="3*"] { + width: 60%; + } + + .os-table [data-columns="2"][data-ratio="3,2"] col[data-width="3*"] { + width: 60%; + } + + .os-table [data-columns="3"][data-ratio="1,1,1"] col[data-width="1*"] { + width: 33.3333333333%; + } + + .os-table [data-columns="3"][data-ratio="1,2,1"] col[data-width="1*"] { + width: 25%; + } + + .os-table [data-columns="3"][data-ratio="1,2,1"] col[data-width="2*"] { + width: 50%; + } + + .os-table [data-columns="3"][data-ratio="1,2,2"] col[data-width="1*"] { + width: 20%; + } + + .os-table [data-columns="3"][data-ratio="1,2,2"] col[data-width="2*"] { + width: 40%; + } + + .os-table [data-columns="3"][data-ratio="1,3,2"] col[data-width="1*"] { + width: 16.6666666667%; + } + + .os-table [data-columns="3"][data-ratio="1,3,2"] col[data-width="2*"] { + width: 33.3333333333%; + } + + .os-table [data-columns="3"][data-ratio="1,3,2"] col[data-width="3*"] { + width: 50%; + } + + .os-table [data-columns="3"][data-ratio="1,3,3"] col[data-width="1*"] { + width: 14.2857142857%; + } + + .os-table [data-columns="3"][data-ratio="2,2,3"] col[data-width="1*"] { + width: 14.2857142857%; + } + + .os-table [data-columns="3"][data-ratio="2,2,3"] col[data-width="2*"] { + width: 28.5714285714%; + } + + .os-table [data-columns="3"][data-ratio="1,3,3"] col[data-width="3*"] { + width: 42.8571428571%; + } + + + .os-table [data-columns="3"][data-ratio="2,2,3"] col[data-width="3*"] { + width: 42.8571428571%; + } + + .os-table [data-columns="3"][data-ratio="2,3,3"] col[data-width="1*"] { + width: 12.5%; + } + + .os-table [data-columns="3"][data-ratio="2,3,3"] col[data-width="2*"] { + width: 25%; + } + + + .os-table [data-columns="3"][data-ratio="2,3,3"] col[data-width="3*"] { + width: 37.5%; + } + + .os-table [data-columns="3"][data-ratio="3,3,3"] col[data-width="3*"] { + width: 33.3333333333%; + } + + .os-table [data-columns="3"][data-ratio="1,8,8"] col[data-width="1*"] { + width: 5.8823529412%; + } + + .os-table [data-columns="3"][data-ratio="1,8,8"] col[data-width="8*"] { + width: 47.0588235294%; + } + + .os-table [data-columns="4"][data-ratio="1,1,1,1"] col[data-width="1*"] { + width: 25%; + } + + .os-table [data-columns="4"][data-ratio="1,2,1,1"] col[data-width="1*"] { + width: 20%; + } + + .os-table [data-columns="4"][data-ratio="1,2,1,1"] col[data-width="2*"] { + width: 40%; + } + + .os-table [data-columns="4"][data-ratio="1,1,3,1"] col[data-width="1*"] { + width: 16.6666666667%; + } + + .os-table [data-columns="4"][data-ratio="1,1,3,1"] col[data-width="3*"] { + width: 50%; + } + + .os-table [data-columns="4"][data-ratio="1,1,2,2"] col[data-width="1*"] { + width: 16.6666666667%; + } + + .os-table [data-columns="4"][data-ratio="1,1,2,2"] col[data-width="2*"] { + width: 33.3333333333%; + } + + .os-table [data-columns="4"][data-ratio="1,2,2,2"] col[data-width="1*"] { + width: 14.2857142857%; + } + + .os-table [data-columns="4"][data-ratio="1,2,2,2"] col[data-width="2*"] { + width: 28.5714285714%; + } + + .os-table [data-columns="4"][data-ratio="1,2,3,2"] col[data-width="1*"] { + width: 12.5%; + } + + .os-table [data-columns="4"][data-ratio="2,1,3,2"] col[data-width="1*"] { + width: 12.5%; + } + + .os-table [data-columns="4"][data-ratio="1,2,3,2"] col[data-width="2*"] { + width: 25%; + } + + .os-table [data-columns="4"][data-ratio="2,1,3,2"] col[data-width="2*"] { + width: 25%; + } + + .os-table [data-columns="4"][data-ratio="1,2,3,2"] col[data-width="3*"] { + width: 37.5%; + } + + .os-table [data-columns="5"][data-ratio="1,1,1,1,1"] col[data-width="1*"] { + width: 20%; + } + + .os-table [data-columns="5"][data-ratio="1,2,2,2,2"] col[data-width="1*"] { + width: 11.1111111111%; + } + + .os-table [data-columns="5"][data-ratio="1,2,2,2,2"] col[data-width="2*"] { + width: 22.2222222222%; + } + .os-table [data-columns="6"][data-ratio="1,2,2,2,2,2"] col[data-width="1*"] { + width: 9.0909090909%; + } + + .os-table [data-columns="6"][data-ratio="1,2,2,2,2,2"] col[data-width="2*"] { + width: 18.1818181818%; + } +} + +@mixin distributed-table-images($colCounts, $pageWidth) { + @each $cols in $colCounts { + .os-table > table:has(tr > td:nth-of-type(#{$cols})):not(:has(tr > td:nth-of-type(#{$cols + 1}))) + img { + max-width: calc($pageWidth / $cols); + } + } +} diff --git a/styles/output/additive-manufacturing-pdf.css b/styles/output/additive-manufacturing-pdf.css index b3a284208..8d7a2c042 100644 --- a/styles/output/additive-manufacturing-pdf.css +++ b/styles/output/additive-manufacturing-pdf.css @@ -1457,6 +1457,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -1477,6 +1481,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -1544,6 +1564,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/algebra-1-pdf.css b/styles/output/algebra-1-pdf.css index ce693f206..6b2bd3ac4 100644 --- a/styles/output/algebra-1-pdf.css +++ b/styles/output/algebra-1-pdf.css @@ -308,12 +308,12 @@ a { font-size: 0.8333333333rem; } -.os-eoc.os-chapter-review-container { +[data-type=page]:has(.custom-eoc) { page: eoc; prince-page-group: start; } -.os-eoc { +[data-type=page]:has(.custom-eoc) { page: eoc; } @@ -985,6 +985,172 @@ div[data-type=composite-page].os-eob { margin-bottom: 0.8in; margin-top: 0.8in; } +[data-type=injected-exercise] ol:not(.os-raise-noindent), [data-type=exercise] ol:not(.os-raise-noindent) { + margin-left: 16px; +} + +[data-type=injected-exercise] ul:not(.os-raise-noindent), [data-type=exercise] ul:not(.os-raise-noindent) { + margin-left: 16px; +} + +section:has([data-type=note]) { + width: 100%; +} + +section.practice [data-type=injected-exercise] > [data-type=exercise-stimulus] > ol:not([type=a]) > li::marker, +section.practice [data-type=injected-exercise] > [data-type=exercise-question] [data-type=question-stem] > ol:not([type=a]) > li::marker { + font-weight: bold; +} + +[data-type=exercise-question] > div > div > ol[type=a]:not(.circled):not(.os-stepwise):not(.os-raise-noindent):nth-of-type(2) { + margin-left: 40px; +} + +.os-table > table:has(tr > td:nth-of-type(2)):not(:has(tr > td:nth-of-type(3))) img { + max-width: 3in; +} + +.os-table > table:has(tr > td:nth-of-type(3)):not(:has(tr > td:nth-of-type(4))) img { + max-width: 2in; +} + +.os-table > table:has(tr > td:nth-of-type(4)):not(:has(tr > td:nth-of-type(5))) img { + max-width: 1.5in; +} + +.os-table > table:has(tr > td:nth-of-type(5)):not(:has(tr > td:nth-of-type(6))) img { + max-width: 1.2in; +} + +.os-table > table:has(tr > td:nth-of-type(6)):not(:has(tr > td:nth-of-type(7))) img { + max-width: 1in; +} + +.custom-question-container { + display: table; +} + +span.custom-question-number { + display: table-cell; + padding-right: 10px; + font-weight: bold; +} + +ol.custom-question-number { + list-style: none; + margin: 0 !important; + counter-set: question 0; +} + +ol.custom-question-number > li { + display: table; +} + +ol.custom-question-number > li::before { + counter-increment: question; + content: counter(question) "."; + font-weight: bold; + padding-right: 10px; + display: table-cell; +} + +.custom-numbering { + font-weight: bold; + display: inline-block; + padding-right: 10px; +} + +section.numbered-exercises > p:has(+ [data-type=media]), section.practice [data-type=problem] > p:has(+ [data-type=media]) { + break-after: avoid; + break-inside: avoid-page; +} + +section.numbered-exercises [data-type=exercise]:has([data-type=problem] .os-problem-container [data-type=media]) { + display: inline-block; + vertical-align: top; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem]:has(.os-problem-container [data-type=media]) { + display: flex; + overflow-wrap: break-word; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container:has([data-type=media]) { + display: flex; + flex-wrap: wrap; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container:has([data-type=media]) > p:not(:has([data-type=media])) { + width: 100%; +} + +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container [data-type=media] { + width: 100%; +} + +section.numbered-exercises [data-type=exercise] img { + max-width: 95%; +} + +.os-table table.borderless thead > tr > th, +.os-table table.borderless tbody > tr > td { + border: none !important; +} + +img { + max-width: 4in; + max-height: 3in; + height: auto; + width: auto; +} +[data-type=media] > img { + display: block; + margin-bottom: 1.4rem; +} + +[data-type=unit] > h1[data-type=document-title] { + display: none; +} + +[data-type=chapter] > h1[data-type=document-title] { + display: flex; + align-items: center; + color: #1E7E91; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 2.0736rem; + line-height: 2.0736rem; + height: 4.29981696rem; +} +[data-type=chapter] > h1[data-type=document-title] > .os-number { + border-style: solid; + border-width: 0.07rem; + border-color: #1E7E91; + text-transform: uppercase; + padding: 0.5rem; + margin-right: 1rem; +} +[data-type=chapter] > h1[data-type=document-title] > .os-part-text { + display: none; +} +[data-type=chapter] > h1[data-type=document-title] > .os-text { + font-weight: bold; + text-transform: uppercase; + prince-filter-resolution: 300dpi; + justify-content: center; + align-items: center; +} + +[data-type=injected-exercise] [data-type=exercise-question] .os-problem-container [data-type=answer-content] > .os-table { + display: initial; + margin-left: initial; + margin-right: initial; +} + +[data-type=exercise-stimulus] > ol:not(.circled):not(.os-stepwise), +[data-type=exercise-stimulus] > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { + margin-left: 24px; +} + :root { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 11px; @@ -994,6 +1160,10 @@ div[data-type=composite-page].os-eob { prince-background-image-resolution: 200dpi; } +[data-type=solution] { + display: none; +} + [data-type=abstract] > h3[data-type=title] { color: #1E7E91; font-family: Roboto Slab, serif, StixGeneral; @@ -1283,6 +1453,28 @@ nav#toc > ol > li.os-toc-composite-chapter > ol { font-weight: bold; } +p.example-title { + border-top-width: 0.09rem; + border-top-style: solid; + border-top-color: #093D4C; + margin-bottom: 1.4rem; + display: block; + box-decoration-break: slice; +} + +p.example-title > :first-child { + font-family: Noto Sans, sans-serif, StixGeneral; + color: #C6CE33; + font-size: 1rem; + line-height: 1rem; + font-weight: bold; + text-transform: uppercase; + background-color: #093D4C; + display: table; + padding: 0.7rem; + vertical-align: top; +} + .os-eos.os-section-exercises-container section { margin-bottom: 0; } @@ -1291,6 +1483,42 @@ nav#toc > ol > li.os-toc-composite-chapter > ol { margin-bottom: 0; } +section.check-understanding { + border-color: #1E7E91; + border-width: 1px; + padding: 1.4rem 0; + border-top-style: solid; + border-bottom-style: solid; + break-inside: avoid; +} + +section.numbered-exercises [data-type=exercise] img { + max-height: 2in; +} + +section.practice > [data-type=injected-exercise] img { + max-height: 2in; +} + +section.practice > [data-type=exercise] img { + max-height: 2in; +} + +[data-type=note][class] > .os-note-body img { + max-height: 2in; +} + +[data-type=exercise] > [data-type=problem] > .os-problem-container > div.half.labeled-image { + display: flex; + align-items: center; + padding-right: 10px; + padding-left: 10px; +} + +[data-type=exercise] > [data-type=problem] > .os-problem-container > div.half.labeled-image { + width: 45%; +} + .os-chapter-outline { font-family: Noto Sans, sans-serif, StixGeneral; font-weight: 500; @@ -1450,10 +1678,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { margin-top: 1rem; } -[data-type=problem] img { - max-width: 100%; -} - [data-type=problem] > div > ol:not(.circled):not(.os-stepwise) > li > .os-figure:first-child img { vertical-align: top; display: inline; @@ -1472,10 +1696,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-top: 0.7rem; } -[data-type=solution] img { - max-width: 100%; -} - [data-type=solution] > div > ol:not(.circled):not(.os-stepwise) > li > .os-figure:first-child img { vertical-align: top; display: inline; @@ -1494,10 +1714,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-top: 0.7rem; } -[data-type=exercise-question] img { - max-width: 100%; -} - [data-type=exercise-question] > div > ol:not(.circled):not(.os-stepwise) > li > .os-figure:first-child img { vertical-align: top; display: inline; @@ -1516,10 +1732,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-top: 0.7rem; } -[data-type=question-solution] img { - max-width: 100%; -} - [data-type=question-solution] > div > ol:not(.circled):not(.os-stepwise) > li > .os-figure:first-child img { vertical-align: top; display: inline; @@ -2208,49 +2420,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { margin-left: 16px; } -[data-type=chapter] > h1[data-type=document-title] { - display: flex; - align-items: center; - position: relative; - top: 14rem; - z-index: 2; - color: white; - font-family: Roboto Slab, serif, StixGeneral; - font-size: 2.0736rem; - line-height: 2.0736rem; - max-width: 5.9in; - height: 4.29981696rem; -} - -[data-type=chapter] > h1[data-type=document-title] > .os-part-text { - display: none; -} - -[data-type=chapter] > h1[data-type=document-title] > .os-text { - display: flex; - font-weight: bold; - text-transform: uppercase; - margin-left: 8rem; - filter: drop-shadow(0.18rem 0.18rem 0.36rem #000); - prince-filter-resolution: 300dpi; - justify-content: center; - align-items: center; -} - -[data-type=chapter] > h1[data-type=document-title] > .os-number { - border-style: solid; - border-width: 0.07rem; - border-color: white; - text-transform: uppercase; - padding: 0.5rem; - left: 0; - width: 2.8rem; - height: 2.8rem; - display: flex; - justify-content: center; - align-items: center; -} - [data-type=page].introduction .intro-text > h2[data-type=document-title]:first-of-type { font-size: 1.728rem; margin-bottom: 0.7rem; @@ -2298,6 +2467,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { font-family: Roboto Slab, serif, StixGeneral; font-size: 1.728rem; line-height: 1.5rem; + margin-top: 2.1rem; margin-bottom: 0.7rem; } @@ -2306,6 +2476,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { font-family: Roboto Slab, serif, StixGeneral; font-size: 1.44rem; line-height: 1.5rem; + margin-top: 1.4rem; margin-bottom: 0.7rem; } @@ -2355,6 +2526,70 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { margin-top: 0.7rem; } +[data-type=unit] > [data-type=page]:not(.introduction) h2[data-type=document-title], h2[data-type=title] { + color: #1E7E91; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1.728rem; + line-height: 1.5rem; + margin-top: 2.1rem; + margin-bottom: 0.7rem; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > section > h3[data-type=title], [data-type=composite-page] h3[data-type=title], [data-type=composite-page] h3[data-type=document-title], section > section > h3[data-type=title] { + color: #1E7E91; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1.44rem; + line-height: 1.5rem; + margin-top: 1.4rem; + margin-bottom: 0.7rem; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > section > section > h4[data-type=title] { + font-family: Roboto Slab, serif, StixGeneral; + color: #1E7E91; + font-size: 1.2rem; + line-height: 1.5rem; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > section > section > section > h5[data-type=title] { + font-family: Roboto Slab, serif, StixGeneral; + color: #1E7E91; + font-size: 1rem; + line-height: 1.5rem; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > .os-eos.os-section-exercises-container > h3[data-type=document-title] { + color: #1E7E91; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1.44rem; + line-height: 1.5rem; + margin-bottom: 0.7rem; + text-transform: uppercase; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > .os-eos.os-section-exercises-container > h3[data-type=document-title]::before { + background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAyMSAyMy44IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyMSAyMy44OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGw6IzFGN0U5MTt9Cgkuc3Qxe2ZpbGw6IzA5M0Q0Qzt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTIxLDIzLjhIMFYwaDIxVjIzLjh6IE0wLjksMjIuOWgxOS4zdi0yMkgwLjlWMjIuOXoiLz4KCTwvZz4KCTxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik0xMi43LDcuNFY2LjZoLTAuOXYwbC0wLjYsMHYwaC0wLjl2MC44SDYuNHY5LjloOC4yVjcuNEgxMi43eiBNMTEuOCw3LjN2NC44aC0wLjZWNy4zSDExLjh6IE0xMy43LDE2LjRINy4zCgkJVjguMWgzLjF2NC4zbDEuMiwxbDEuMi0xVjguMWgxLjFWMTYuNHoiLz4KPC9nPgo8L3N2Zz4K") no-repeat top left; + background-size: contain; + height: 2.8rem; + width: 2.8rem; + display: inline-block; + content: ''; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > .os-eos.os-section-exercises-container > h3[data-type=document-title] > .os-text { + display: inline-block; + margin-left: 0.7rem; +} + +[data-type=unit] > [data-type=page]:not(.introduction) > .os-eos.os-section-exercises-container > section > section > h4[data-type=title] { + font-family: Noto Sans, sans-serif, StixGeneral; + color: #093D4C; + font-size: 1.2rem; + line-height: 1.5rem; + margin-bottom: 1.4rem; + margin-top: 0.7rem; +} + [data-type=composite-chapter] > h1 { color: #1E7E91; font-family: Roboto Slab, serif, StixGeneral; @@ -2552,6 +2787,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { [data-type=note]:not([class]) { margin-bottom: 1.4rem; + margin-top: 1.4rem; } [data-type=note]:not([class]) > .os-title, [data-type=note]:not([class]) [data-type=composite-page] h3[data-type=title] { @@ -2576,21 +2812,28 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding: 0.7rem; } +[data-type=note]:not([class]) > .os-note-body > [data-type=media] > img { + margin-left: auto; + margin-right: auto; + width: 3in; +} + [data-type=note].try { - display: table; - margin-bottom: 1.4rem; + display: flex; + margin-bottom: 2.8rem; + margin-top: 2.8rem; } [data-type=note].try > .os-title { font-size: 1rem; line-height: 1.5rem; padding-right: 24px; - display: table-cell; white-space: nowrap; + max-width: 15%; } [data-type=note].try > .os-title::before { - background: url("data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMC43MyAyMC43MyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxZjdlOTE7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiMwOTNkNGM7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjAuNzVweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmJlLXByZXBhcmVkPC90aXRsZT48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMi44LDI4LjY1VjQ3LjczSDEzLjcyVjI4LjY1SDMyLjhtLjgzLS44MkgxMi45VjQ4LjU2SDMzLjYzVjI3LjgzWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEyLjkgLTI3LjgzKSIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjYuMzEiIHkxPSIxMC42NiIgeDI9IjkuNzEiIHkyPSIxMy40NCIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjE0LjQyIiB5MT0iNy4yOSIgeDI9IjkuMjIiIHkyPSIxMy40Ii8+PC9zdmc+") no-repeat top left; + background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAxNi4yIDE2LjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDE2LjIgMTYuMjsiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtmaWxsOiMxRTdFOTE7fQoJLnN0MXtmaWxsOiMwOTNENEM7fQo8L3N0eWxlPgo8Zz4KCTxnPgoJCTxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xNS41LDAuNnYxNC45SDAuNlYwLjZIMTUuNSBNMTYuMiwwSDB2MTYuMmgxNi4yVjBMMTYuMiwweiIvPgoJPC9nPgoJPGc+CgkJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSI2LjcsMTEuNSA2LjIsMTEuMSA5LjIsOC4xIDYuMiw1LjEgNi43LDQuNiAxMC4yLDguMSAJCSIvPgoJPC9nPgo8L2c+Cjwvc3ZnPgo=") no-repeat top left; background-size: contain; height: 1.45rem; width: 1.45rem; @@ -2601,38 +2844,48 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { } [data-type=note].try > .os-title > .os-title-label { - display: none; -} - -[data-type=note].try > .os-title > .os-number { - color: #757474; - font-family: Roboto Slab, serif, StixGeneral; - font-weight: normal; + color: #093D4C; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + text-transform: uppercase; + margin-right: 16px; } [data-type=note].try > .os-note-body { - color: #757474; + color: #000000; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - display: table-cell; + width: 85%; +} + +[data-type=note].try > .os-note-body > .os-subtitle { + color: #093D4C; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; +} + +[data-type=note].try > .os-note-body > ul:not(.circled):not(.os-stepwise) { + list-style-type: none; } [data-type=note].general-strategies { - display: table; - margin-bottom: 1.4rem; + display: flex; + margin-bottom: 2.8rem; + margin-top: 2.8rem; } [data-type=note].general-strategies > .os-title { font-size: 1rem; line-height: 1.5rem; padding-right: 24px; - display: table-cell; white-space: nowrap; + max-width: 20%; } [data-type=note].general-strategies > .os-title::before { - background: url("data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMC43MyAyMC43MyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxZjdlOTE7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiMwOTNkNGM7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjAuNzVweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmJlLXByZXBhcmVkPC90aXRsZT48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMi44LDI4LjY1VjQ3LjczSDEzLjcyVjI4LjY1SDMyLjhtLjgzLS44MkgxMi45VjQ4LjU2SDMzLjYzVjI3LjgzWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEyLjkgLTI3LjgzKSIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjYuMzEiIHkxPSIxMC42NiIgeDI9IjkuNzEiIHkyPSIxMy40NCIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjE0LjQyIiB5MT0iNy4yOSIgeDI9IjkuMjIiIHkyPSIxMy40Ii8+PC9zdmc+") no-repeat top left; + background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAxNS45IDE4LjQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDE1LjkgMTguNDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtmaWxsOiMwOTNENEM7fQo8L3N0eWxlPgo8cGF0aCBjbGFzcz0ic3QwIiBkPSJNOCwwTDgsMGwtOCw0LjVMMCw0LjZ2OS4ybDcuOSw0LjZsMC4xLDBsNy45LTQuNmwwLjEsMFY0LjZMOCwweiBNNywxMy40TDEuMywxM2wxLjYtNkw3LDEzLjR6IE0xLjYsNC44bDQtMi4zCglsLTMsMi43TDEuNiw0Ljh6IE0xMyw3bDEuNiw2bC01LjcsMC40TDEzLDd6IE0xMy4zLDUuMmwtMy0yLjdsNCwyLjNMMTMuMyw1LjJ6IE04LDEuN2wzLjksMy42SDRMOCwxLjd6IE0xMi4zLDYuM0w4LDEzTDMuNyw2LjMKCUgxMi4zeiBNMTMuNCwxNC4xTDguNSwxN3YtMi41TDEzLjQsMTQuMXogTTEzLjgsNi4xbDEuMS0wLjV2NC44TDEzLjgsNi4xeiBNMi4xLDYuMUwxLDEwLjRWNS42TDIuMSw2LjF6IE03LjUsMTQuNFYxN2wtNC45LTIuOAoJTDcuNSwxNC40eiIvPgo8L3N2Zz4K") no-repeat top left; background-size: contain; height: 1.45rem; width: 1.45rem; @@ -2643,38 +2896,48 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { } [data-type=note].general-strategies > .os-title > .os-title-label { - display: none; -} - -[data-type=note].general-strategies > .os-title > .os-number { - color: #757474; - font-family: Roboto Slab, serif, StixGeneral; - font-weight: normal; + color: #093D4C; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + text-transform: uppercase; + margin-right: 16px; } [data-type=note].general-strategies > .os-note-body { - color: #757474; + color: #000000; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - display: table-cell; + width: 80%; +} + +[data-type=note].general-strategies > .os-note-body > .os-subtitle { + color: #093D4C; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; +} + +[data-type=note].general-strategies > .os-note-body > ul:not(.circled):not(.os-stepwise) { + list-style-type: none; } [data-type=note].mini-lesson-question { - display: table; - margin-bottom: 1.4rem; + display: flex; + margin-bottom: 2.8rem; + margin-top: 2.8rem; } [data-type=note].mini-lesson-question > .os-title { font-size: 1rem; line-height: 1.5rem; padding-right: 24px; - display: table-cell; white-space: nowrap; + max-width: 30%; } [data-type=note].mini-lesson-question > .os-title::before { - background: url("data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMC43MyAyMC43MyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxZjdlOTE7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiMwOTNkNGM7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjAuNzVweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmJlLXByZXBhcmVkPC90aXRsZT48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMi44LDI4LjY1VjQ3LjczSDEzLjcyVjI4LjY1SDMyLjhtLjgzLS44MkgxMi45VjQ4LjU2SDMzLjYzVjI3LjgzWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEyLjkgLTI3LjgzKSIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjYuMzEiIHkxPSIxMC42NiIgeDI9IjkuNzEiIHkyPSIxMy40NCIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjE0LjQyIiB5MT0iNy4yOSIgeDI9IjkuMjIiIHkyPSIxMy40Ii8+PC9zdmc+") no-repeat top left; + background: url("data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMC43MyAyMC43MyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxZjdlOTE7fS5jbHMtMntmaWxsOiMwOTNkNGM7fTwvc3R5bGU+PC9kZWZzPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTS44Mi44M0gxOS45VjE5LjkxSC44MlYuODNNMCwwVjIwLjczSDIwLjczVjBaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDApIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNOS4yLDEyLjg1Yy0uMjgtMiwxLjY4LTMuMzYsMi44MS00LjQ4QzE0LjI1LDUuNTYsOS43Niw0LjQ0LDcuOCw1Ljg0TDcuMjQsNC43MmMzLjA4LTIuMjQsOSwuMjgsNS44OSw0LjIxLS44NC44NC0zLjA5LDItMi41MywzLjkyWk04LjkyLDE1LjFhMSwxLDAsMSwxLDIsMEMxMC44OCwxNi43OCw4LjkyLDE2Ljc4LDguOTIsMTUuMVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgMCkiLz48L3N2Zz4=") no-repeat top left; background-size: contain; height: 1.45rem; width: 1.45rem; @@ -2685,38 +2948,48 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { } [data-type=note].mini-lesson-question > .os-title > .os-title-label { - display: none; -} - -[data-type=note].mini-lesson-question > .os-title > .os-number { - color: #757474; - font-family: Roboto Slab, serif, StixGeneral; - font-weight: normal; + color: #093D4C; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + text-transform: uppercase; + margin-right: 16px; } [data-type=note].mini-lesson-question > .os-note-body { - color: #757474; + color: #000000; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - display: table-cell; + width: 70%; +} + +[data-type=note].mini-lesson-question > .os-note-body > .os-subtitle { + color: #093D4C; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; +} + +[data-type=note].mini-lesson-question > .os-note-body > ul:not(.circled):not(.os-stepwise) { + list-style-type: none; } [data-type=note].link-to-learning { - display: table; - margin-bottom: 1.4rem; + display: flex; + margin-bottom: 2.8rem; + margin-top: 2.8rem; } [data-type=note].link-to-learning > .os-title { font-size: 1rem; line-height: 1.5rem; padding-right: 24px; - display: table-cell; white-space: nowrap; + max-width: 30%; } [data-type=note].link-to-learning > .os-title::before { - background: url("data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMC43MyAyMC43MyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxZjdlOTE7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiMwOTNkNGM7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjAuNzVweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmJlLXByZXBhcmVkPC90aXRsZT48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMi44LDI4LjY1VjQ3LjczSDEzLjcyVjI4LjY1SDMyLjhtLjgzLS44MkgxMi45VjQ4LjU2SDMzLjYzVjI3LjgzWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEyLjkgLTI3LjgzKSIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjYuMzEiIHkxPSIxMC42NiIgeDI9IjkuNzEiIHkyPSIxMy40NCIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjE0LjQyIiB5MT0iNy4yOSIgeDI9IjkuMjIiIHkyPSIxMy40Ii8+PC9zdmc+") no-repeat top left; + background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMiwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAxNC4zIDE1IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAxNC4zIDE1OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGw6IzA5M0Q0Qzt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPHBvbHlnb24gY2xhc3M9InN0MCIgcG9pbnRzPSIxMS4zLDEzLjggMS4yLDEzLjggMS4yLDEuMiAxMS4zLDEuMiAxMS4zLDIuMiAxMi41LDMuNCAxMi41LDAgMCwwIDAsMTUgMTIuNSwxNSAxMi41LDkuMiAxMS4zLDEwLjMgCgkJCQkJIi8+CgkJPHBvbHlnb24gY2xhc3M9InN0MCIgcG9pbnRzPSIxMS4zLDkuMyAxNC4zLDYuMyAxMS4zLDMuMyAxMC41LDQuMSAxMi4xLDUuNyA2LjcsNS43IDYuNyw2LjkgMTIuMSw2LjkgMTAuNSw4LjUgCQkiLz4KCTwvZz4KPC9nPgo8L3N2Zz4K") no-repeat top left; background-size: contain; height: 1.45rem; width: 1.45rem; @@ -2727,21 +3000,89 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { } [data-type=note].link-to-learning > .os-title > .os-title-label { - display: none; + color: #093D4C; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + text-transform: uppercase; + margin-right: 16px; } -[data-type=note].link-to-learning > .os-title > .os-number { - color: #757474; +[data-type=note].link-to-learning > .os-note-body { + color: #000000; + font-family: Noto Sans, sans-serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; + width: 70%; +} + +[data-type=note].link-to-learning > .os-note-body > .os-subtitle { + color: #093D4C; font-family: Roboto Slab, serif, StixGeneral; - font-weight: normal; + font-size: 1rem; + line-height: 1.5rem; } -[data-type=note].link-to-learning > .os-note-body { - color: #757474; +[data-type=note].link-to-learning > .os-note-body > ul:not(.circled):not(.os-stepwise) { + list-style-type: none; +} + +[data-type=note].document { + display: flex; + margin-bottom: 2.8rem; + margin-top: 2.8rem; + margin-left: calc(2.5rem + 8px); +} + +[data-type=note].document > .os-note-body { + color: #000000; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - display: table-cell; + text-indent: calc(-2.5rem - 8px); +} + +[data-type=note].document > .os-note-body > :first-child::before { + background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMSAyMy43NiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxRjdFOTE7fS5jbHMtMntmaWxsOiMwOTNENEM7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5TdW1tYXJ5PC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iTGF5ZXJfMS0yIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTIxLDIzLjc2SDBWMEgyMVpNLjg2LDIyLjg5SDIwLjE0Vi44NkguODZaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMTMuNzUsNy43OFY2LjE3SDUuNjFWMTZINy4yNXYxLjYxaDguMTRWNy43OFpNNi4zNiw2LjkySDEzdjguM0g2LjM2Wm04LjI3LDkuOTFIOFYxNmg1Ljc2VjguNTNoLjg4WiIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgeD0iOC4zOCIgeT0iOS4xNSIgd2lkdGg9IjIuNTkiIGhlaWdodD0iMC42NCIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgeD0iOC40IiB5PSIxMC43NSIgd2lkdGg9IjIuNTkiIGhlaWdodD0iMC42NCIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgeD0iOC40IiB5PSIxMi4zNiIgd2lkdGg9IjIuNTkiIGhlaWdodD0iMC42NCIvPjwvZz48L2c+PC9zdmc+Cg==") no-repeat top left; + background-size: contain; + height: 2.5rem; + width: 2.5rem; + padding-right: 8px; + content: ''; + display: inline-block; + vertical-align: middle; +} + +[data-type=note].self-check { + margin-bottom: 1.4rem; + margin-top: 1.4rem; +} + +[data-type=note].self-check > .os-title, [data-type=note]:not([class]) [data-type=composite-page] h3[data-type=title] { + color: #1E7E91; + font-family: Roboto Slab, serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; + font-weight: bold; + background-color: #E7EBED; + padding: 0.7rem; + border-bottom-width: 0.09rem; + border-bottom-style: solid; + border-bottom-color: #F1F1F1; +} + +[data-type=note].self-check > .os-note-body { + color: #093D4C; + font-family: Noto Sans, sans-serif, StixGeneral; + font-size: 1rem; + line-height: 1.5rem; + background-color: #E7EBED; + padding: 0.7rem; +} + +[data-type=note].self-check > .os-note-body > [data-type=media] > img { + margin-left: auto; + margin-right: auto; + width: 3in; } [data-type=equation].unnumbered { @@ -2785,6 +3126,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -2794,7 +3139,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-bottom: 0.7rem; padding-right: 0.7rem; padding-left: 0.7rem; - background-color: #093D4C; + background-color: #0B5B51; } .os-table:not(.os-unstyled-container) > table > thead > tr > th:first-child { @@ -2805,12 +3150,28 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #0B5B51; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; border-width: 0.09rem; border-style: solid; - border-color: #757474; + border-color: #0B5B51; padding-top: 0.7rem; padding-bottom: 0.7rem; padding-left: 0.7rem; @@ -2872,6 +3233,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; @@ -2926,7 +3291,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-bottom: 0.7rem; padding-right: 0.7rem; padding-left: 0.7rem; - background-color: #093D4C; + background-color: #0B5B51; } .os-table.os-column-header-container > table > thead > tr > th:first-child { @@ -2942,7 +3307,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { font-size: 1rem; border-width: 0.09rem; border-style: solid; - border-color: #757474; + border-color: #0B5B51; padding-top: 0.7rem; padding-bottom: 0.7rem; padding-left: 1rem; @@ -3028,11 +3393,13 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-bottom: 0.7rem; padding-right: 0.7rem; padding-left: 0.7rem; + background-color: #0B5B51; } .os-table.os-unstyled-container > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; + border-color: #0B5B51; padding-top: 0.7rem; padding-bottom: 0.7rem; padding-left: 0.7rem; @@ -3075,6 +3442,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table.os-data-table-container > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table.os-data-table-container > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -3084,7 +3455,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { padding-bottom: 0.16rem; padding-right: 0.16rem; padding-left: 0.16rem; - background-color: #093D4C; + background-color: #0B5B51; } .os-table.os-data-table-container > table > thead > tr > th:first-child { @@ -3095,12 +3466,28 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table.os-data-table-container > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.16rem; + padding-bottom: 0.16rem; + padding-right: 0.16rem; + padding-left: 0.16rem; + background-color: #0B5B51; +} + .os-table.os-data-table-container > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; border-width: 0.09rem; border-style: solid; - border-color: #757474; + border-color: #0B5B51; padding-top: 0.16rem; padding-bottom: 0.16rem; padding-left: 0.16rem; @@ -3162,6 +3549,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table.os-data-table-container > .os-caption-container { display: table-caption; caption-side: bottom; @@ -3484,7 +3875,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { font-weight: bold; } -section.practice > p > [data-effect=bold] { +section.numbered-exercises > p > [data-effect=bold] { color: #1E7E91; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3493,192 +3884,165 @@ section.practice > p > [data-effect=bold] { font-style: normal; } -section.practice > p { - color: #1E7E91; +section.numbered-exercises > p { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - font-style: italic; margin-top: 0.7rem; } -section.practice [data-type=exercise] { +section.numbered-exercises [data-type=exercise] { margin-bottom: 0.7rem; display: inline-table; width: 48%; padding-right: 0.7rem; } -section.practice [data-type=exercise] [data-type=problem] { +section.numbered-exercises [data-type=exercise] [data-type=problem] { display: table; overflow-wrap: break-word; } -section.practice [data-type=exercise] [data-type=problem] > .os-number { +section.numbered-exercises [data-type=exercise] [data-type=problem] > .os-number { display: table-cell; text-decoration: none; color: #000000; font-weight: bold; } -section.practice [data-type=exercise] [data-type=problem] > .os-divider { +section.numbered-exercises [data-type=exercise] [data-type=problem] > .os-divider { margin-right: 8px; } -section.practice [data-type=exercise] [data-type=problem] .os-problem-container { +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container { display: table-cell; width: 100%; } -section.practice [data-type=exercise] [data-type=problem] .os-problem-container > p { +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -section.practice [data-type=exercise] [data-type=problem] .os-problem-container.has-first-element { +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -section.practice [data-type=exercise] [data-type=problem] .os-problem-container.has-first-inline-list-element { +section.numbered-exercises [data-type=exercise] [data-type=problem] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -section.practice [data-type=exercise].material-set-2 { +section.numbered-exercises [data-type=exercise].material-set-2 { display: inline-table; margin-bottom: 0.7rem; width: 48%; padding-right: 0.7rem; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] { display: table; overflow-wrap: break-word; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-number { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] > .os-number { display: table-cell; text-decoration: none; color: #000000; font-weight: bold; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-divider { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] > .os-divider { margin-right: 8px; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container { display: table-cell; width: 100%; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container > p { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-element { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-inline-list-element { +section.numbered-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -section.practice [data-type=injected-exercise] { +section.numbered-exercises [data-type=injected-exercise] { margin-bottom: 0.7rem; padding-right: 0.7rem; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] { display: table; overflow-wrap: break-word; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] > .os-number { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] > .os-number { display: table-cell; text-decoration: none; color: #000000; font-weight: bold; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] > .os-divider { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] > .os-divider { margin-right: 8px; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container { display: table-cell; width: 100%; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > p { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { margin-left: 24px; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ol:not(.circled):not(.os-stepwise) { - margin-left: 24px; +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ol:not(.circled):not(.os-stepwise) { + margin-left: 40px; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-element { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-inline-list-element { +section.numbered-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -section.practice [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] { - margin-left: 16px; -} - -.os-key-equations-container > section { - margin-bottom: 0; +section.numbered-exercises [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] { + margin-left: initial; } -.os-key-equations-container > section > .os-table.os-unstyled-container { - margin-bottom: 0; -} - -.os-key-equations-container > section > .os-table.os-unstyled-container > table.unstyled { - margin-bottom: 0; -} - -.os-key-equations-container > section > .os-table.os-unstyled-container > table.unstyled > tbody > tr > td { - font-family: Noto Sans, sans-serif, StixGeneral; - font-size: 1rem; - padding-top: 0.7rem; - padding-bottom: 0.7rem; - padding-left: 0.7rem; - padding-right: 0.7rem; - color: #093D4C; - border-bottom-width: 0.09rem; - border-bottom-style: solid; - border-bottom-color: #F1F1F1; -} - -.os-eoc.os-review-exercises-container > section.review-exercises > p > [data-effect=bold] { +section.practice > p > [data-effect=bold] { color: #1E7E91; font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3687,164 +4051,187 @@ section.practice [data-type=injected-exercise][data-is-multipart=True] > [data-t font-style: normal; } -.os-eoc.os-review-exercises-container > section.review-exercises > p { - color: #1E7E91; +section.practice > p { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; line-height: 1.5rem; - font-style: italic; margin-top: 0.7rem; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] { +section.practice [data-type=exercise] { margin-bottom: 0.7rem; - display: inline-table; - width: 29%; + display: initial; + width: initial; padding-right: 0.7rem; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] { - display: table; +section.practice [data-type=exercise] [data-type=problem] { + display: initial; overflow-wrap: break-word; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] > .os-number { +section.practice [data-type=exercise] [data-type=problem] > .os-number { display: table-cell; text-decoration: none; - color: black; + color: #000000; font-weight: bold; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] > .os-divider { +section.practice [data-type=exercise] [data-type=problem] > .os-divider { margin-right: 8px; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] .os-problem-container { +section.practice [data-type=exercise] [data-type=problem] .os-problem-container { display: table-cell; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] .os-problem-container > p { +section.practice [data-type=exercise] [data-type=problem] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] .os-problem-container.has-first-element { +section.practice [data-type=exercise] [data-type=problem] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise] [data-type=problem] .os-problem-container.has-first-inline-list-element { +section.practice [data-type=exercise] [data-type=problem] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 { +section.practice [data-type=exercise].material-set-2 { display: inline-table; margin-bottom: 0.7rem; width: 48%; padding-right: 0.7rem; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] { - display: table; +section.practice [data-type=exercise].material-set-2 [data-type=problem] { + display: initial; overflow-wrap: break-word; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] > .os-number { +section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-number { display: table-cell; text-decoration: none; - color: black; + color: #000000; font-weight: bold; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] > .os-divider { +section.practice [data-type=exercise].material-set-2 [data-type=problem] > .os-divider { margin-right: 8px; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container { +section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container { display: table-cell; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container > p { +section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-element { +section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-inline-list-element { +section.practice [data-type=exercise].material-set-2 [data-type=problem] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] { +section.practice [data-type=injected-exercise] { margin-bottom: 0.7rem; padding-right: 0.7rem; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] { +section.practice [data-type=injected-exercise] [data-type=exercise-question] { display: table; overflow-wrap: break-word; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] > .os-number { +section.practice [data-type=injected-exercise] [data-type=exercise-question] > .os-number { display: table-cell; text-decoration: none; - color: black; + color: #000000; font-weight: bold; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] > .os-divider { +section.practice [data-type=injected-exercise] [data-type=exercise-question] > .os-divider { margin-right: 8px; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container { +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container { display: table-cell; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > p { +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > p { max-width: 100%; padding-right: 0.7rem; margin-bottom: 0; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ul:not(.circled):not(.os-stepwise):not([data-labeled-item=true]) { margin-left: 24px; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ol:not(.circled):not(.os-stepwise) { - margin-left: 24px; +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container > ol:not(.circled):not(.os-stepwise) { + margin-left: 40px; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-element { +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-element { display: table-cell; vertical-align: bottom; padding-top: 0.7rem; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-inline-list-element { +section.practice [data-type=injected-exercise] [data-type=exercise-question] .os-problem-container.has-first-inline-list-element { display: table-cell; vertical-align: bottom; width: 100%; } -.os-eoc.os-review-exercises-container > section.review-exercises [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] { - margin-left: 16px; +section.practice [data-type=injected-exercise][data-is-multipart=True] > [data-type=exercise-question] { + margin-left: initial; +} + +.os-key-equations-container > section { + margin-bottom: 0; +} + +.os-key-equations-container > section > .os-table.os-unstyled-container { + margin-bottom: 0; +} + +.os-key-equations-container > section > .os-table.os-unstyled-container > table.unstyled { + margin-bottom: 0; +} + +.os-key-equations-container > section > .os-table.os-unstyled-container > table.unstyled > tbody > tr > td { + font-family: Noto Sans, sans-serif, StixGeneral; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-left: 0.7rem; + padding-right: 0.7rem; + color: #093D4C; + border-bottom-width: 0.09rem; + border-bottom-style: solid; + border-bottom-color: #F1F1F1; } [data-type=composite-chapter].os-eob.os-solutions-container > [data-type=composite-page] { diff --git a/styles/output/calculus-pdf.css b/styles/output/calculus-pdf.css index 3d0501c83..014b87fe4 100644 --- a/styles/output/calculus-pdf.css +++ b/styles/output/calculus-pdf.css @@ -2672,6 +2672,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -2692,6 +2696,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -2759,6 +2779,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; @@ -2962,6 +2986,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table.os-data-table-container > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table.os-data-table-container > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -2982,6 +3010,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table.os-data-table-container > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.16rem; + padding-bottom: 0.16rem; + padding-right: 0.16rem; + padding-left: 0.16rem; + background-color: #093D4C; +} + .os-table.os-data-table-container > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3049,6 +3093,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table.os-data-table-container > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/contemporary-math-pdf.css b/styles/output/contemporary-math-pdf.css index 0ea348801..2222c65a4 100644 --- a/styles/output/contemporary-math-pdf.css +++ b/styles/output/contemporary-math-pdf.css @@ -2952,6 +2952,10 @@ li > table { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -2972,6 +2976,22 @@ li > table { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #80004C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3039,6 +3059,10 @@ li > table { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/dev-math-pdf.css b/styles/output/dev-math-pdf.css index f4ba2ecaa..c3e6f704f 100644 --- a/styles/output/dev-math-pdf.css +++ b/styles/output/dev-math-pdf.css @@ -3081,6 +3081,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -3101,6 +3105,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3168,6 +3188,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/precalculus-coreq-pdf.css b/styles/output/precalculus-coreq-pdf.css index fd98cb3c0..74da82f6d 100644 --- a/styles/output/precalculus-coreq-pdf.css +++ b/styles/output/precalculus-coreq-pdf.css @@ -2935,6 +2935,10 @@ section.coreq-skills > section.learning-objectives > ul > li { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -2955,6 +2959,22 @@ section.coreq-skills > section.learning-objectives > ul > li { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3022,6 +3042,10 @@ section.coreq-skills > section.learning-objectives > ul > li { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/precalculus-pdf.css b/styles/output/precalculus-pdf.css index 832e60ca3..3d0eefade 100644 --- a/styles/output/precalculus-pdf.css +++ b/styles/output/precalculus-pdf.css @@ -2993,6 +2993,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -3013,6 +3017,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -3080,6 +3100,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; diff --git a/styles/output/statistics-pdf.css b/styles/output/statistics-pdf.css index cbeedb37f..a1d905bce 100644 --- a/styles/output/statistics-pdf.css +++ b/styles/output/statistics-pdf.css @@ -1548,6 +1548,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table:not(.os-unstyled-container) > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -1568,6 +1572,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table:not(.os-unstyled-container) > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.7rem; + padding-bottom: 0.7rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + background-color: #093D4C; +} + .os-table:not(.os-unstyled-container) > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -1635,6 +1655,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table:not(.os-unstyled-container) > .os-caption-container { display: table-caption; caption-side: bottom; @@ -1680,6 +1704,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-spacing: 0; } +.os-table.os-data-table-container > table > thead > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + .os-table.os-data-table-container > table > thead > tr > th { color: #FFFFFF; font-family: Noto Sans, sans-serif, StixGeneral; @@ -1700,6 +1728,22 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-top-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:first-of-type > th[scope=col]:first-child { + border-top-left-radius: 0.25rem; +} + +.os-table.os-data-table-container > table > tbody > tr > th { + color: #FFFFFF; + font-family: Noto Sans, sans-serif, StixGeneral; + font-weight: bold; + font-size: 1rem; + padding-top: 0.16rem; + padding-bottom: 0.16rem; + padding-right: 0.16rem; + padding-left: 0.16rem; + background-color: #093D4C; +} + .os-table.os-data-table-container > table > tbody > tr > td { font-family: Noto Sans, sans-serif, StixGeneral; font-size: 1rem; @@ -1767,6 +1811,10 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure { border-bottom-right-radius: 0.25rem; } +.os-table.os-data-table-container > table > tbody > tr:last-of-type > th[scope=col]:first-child { + border-bottom-left-radius: 0.25rem; +} + .os-table.os-data-table-container > .os-caption-container { display: table-caption; caption-side: bottom;