Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

* Style table headers in middle of table in `nursing-internal`
* Change `caption` color in `cardboard`
* Style `LO references` on `webview`
* Add styles for problem title to cardboard `example` elements
Expand Down
4 changes: 3 additions & 1 deletion styles/books/nursing-internal/book.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ $ChapterIntroType: fullWidth;
BasicTable: (
_selectors: ('.os-table:not(.os-unstyled-container)'),
'TableBottomBorderAfterTable:::border-top-color': (_ref: 'colorMap:::nursingTableColor'),
'HeaderRow:::font-family': (_ref: 'typography:::titleOption1Font'),
'TableData:::font-family': (_ref: 'typography:::titleOption1Font'),
),
ColumnHeaderTable: (
_selectors: ('.os-table.os-column-header-container'),
Expand Down Expand Up @@ -271,12 +273,12 @@ $ChapterIntroType: fullWidth;
@include use('FigureFromInjectedSolution','carnival:::FigureFromExercisesShape');

// Tables
@include use('BasicTable', 'carnival:::BasicTableShape');
@include use('TableFromEoCExercises','carnival:::TableFromExercisesShape');
@include use('TableAfterExercisePara', 'carnival:::TableTopSpacingShape');
@include use('ColumnHeaderTable', 'carnival:::ColumnHeaderTableShape');
@include use('VerticallyTightTable', 'carnival:::VerticallyTightTableShape');
@include use('ColumnsFromTable', 'carnival:::ColumnsShape');
@include use('BasicTable', 'carnival:::BasicTableShape');

// Lists
@include use('PageLists', 'carnival:::PageListsShape');
Expand Down
1 change: 1 addition & 0 deletions styles/designs/carnival/parts/_table-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ $Table__Row--HeaderRowClass: (
padding-top: 0.7rem,
padding-bottom: 0.7rem,
font-weight: 700,
font-family: enum('ValueSet:::OPTIONAL'),
padding-left: table-h-spacing(1),
padding-right: table-h-spacing(1),
)
Expand Down
279 changes: 140 additions & 139 deletions styles/output/nursing-internal-pdf.css
Original file line number Diff line number Diff line change
Expand Up @@ -1799,145 +1799,6 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-top: 0.7rem;
}

.os-table:not(.os-unstyled-container) {
margin-bottom: 0.7rem;
display: table;
margin-left: auto;
margin-right: auto;
}

.os-table:not(.os-unstyled-container) > table {
border-collapse: collapse;
width: 100%;
margin-bottom: 0;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th {
border-bottom: 0.1rem solid black;
border-top: 0.1rem solid black;
font-family: Mulish, sans-serif;
font-weight: 700;
padding: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-valign=top] {
vertical-align: top;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=left] {
text-align: left;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=right] {
text-align: right;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=center] {
text-align: center;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr.header-row > td {
border-top-color: black;
border-top-width: 0.1rem;
border-top-style: solid;
border-bottom-color: black;
border-bottom-width: 0.1rem;
border-bottom-style: solid;
padding-top: 0.7rem;
padding-bottom: 0.7rem;
font-weight: 700;
padding-left: 0.7rem;
padding-right: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-valign=top] {
vertical-align: top;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=left] {
text-align: left;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=right] {
text-align: right;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=center] {
text-align: center;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type) {
font-family: IBM Plex Sans, sans-serif;
border-left: 0.025rem solid black;
padding-top: 0.7rem;
padding-bottom: 0.7rem;
padding-right: 0.7rem;
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type) > strong {
word-break: break-word;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td {
border-bottom: 0.025rem solid black;
padding: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > td:only-of-type {
border-right: none;
}

.os-table:not(.os-unstyled-container) > table col:not(:last-child) {
border-right: 0.025rem solid black;
}

.os-table:not(.os-unstyled-container):after {
content: '';
width: 100%;
border-top-color: #0074BC;
border-top-width: 0.12rem;
border-top-style: solid;
display: block;
position: relative;
top: -0.1rem;
}

.os-table:not(.os-unstyled-container) .os-caption-container {
display: table-caption;
caption-side: bottom;
prince-caption-page: all;
font-size: 0.8333333333rem;
line-height: 1.2;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-title-label {
font-family: Mulish, sans-serif;
font-weight: bold;
color: #C31427;
text-transform: uppercase;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-number {
font-family: Mulish, sans-serif;
font-weight: bold;
color: #C31427;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-title {
font-family: Mulish, sans-serif;
font-weight: bold;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-caption {
font-family: IBM Plex Sans, sans-serif;
}

.os-eoc [data-type=problem] > div .os-table > table {
max-width: 100%;
table-layout: fixed;
Expand Down Expand Up @@ -2118,6 +1979,146 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
width: 20%;
}

.os-table:not(.os-unstyled-container) {
margin-bottom: 0.7rem;
display: table;
margin-left: auto;
margin-right: auto;
}

.os-table:not(.os-unstyled-container) > table {
border-collapse: collapse;
width: 100%;
margin-bottom: 0;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th {
border-bottom: 0.1rem solid black;
border-top: 0.1rem solid black;
font-family: Mulish, sans-serif;
font-weight: 700;
padding: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-valign=top] {
vertical-align: top;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=left] {
text-align: left;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=right] {
text-align: right;
}

.os-table:not(.os-unstyled-container) > table > thead > tr > th[data-align=center] {
text-align: center;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr.header-row > td {
border-top-color: black;
border-top-width: 0.1rem;
border-top-style: solid;
border-bottom-color: black;
border-bottom-width: 0.1rem;
border-bottom-style: solid;
padding-top: 0.7rem;
padding-bottom: 0.7rem;
font-weight: 700;
font-family: Mulish, sans-serif;
padding-left: 0.7rem;
padding-right: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-valign=top] {
vertical-align: top;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=left] {
text-align: left;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=right] {
text-align: right;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td[data-align=center] {
text-align: center;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type) {
font-family: Mulish, sans-serif;
border-left: 0.025rem solid black;
padding-top: 0.7rem;
padding-bottom: 0.7rem;
padding-right: 0.7rem;
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type) > strong {
word-break: break-word;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td {
border-bottom: 0.025rem solid black;
padding: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr:last-of-type > td:only-of-type {
border-right: none;
}

.os-table:not(.os-unstyled-container) > table col:not(:last-child) {
border-right: 0.025rem solid black;
}

.os-table:not(.os-unstyled-container):after {
content: '';
width: 100%;
border-top-color: #0074BC;
border-top-width: 0.12rem;
border-top-style: solid;
display: block;
position: relative;
top: -0.1rem;
}

.os-table:not(.os-unstyled-container) .os-caption-container {
display: table-caption;
caption-side: bottom;
prince-caption-page: all;
font-size: 0.8333333333rem;
line-height: 1.2;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-title-label {
font-family: Mulish, sans-serif;
font-weight: bold;
color: #C31427;
text-transform: uppercase;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-number {
font-family: Mulish, sans-serif;
font-weight: bold;
color: #C31427;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-title {
font-family: Mulish, sans-serif;
font-weight: bold;
}

.os-table:not(.os-unstyled-container) .os-caption-container > .os-caption {
font-family: IBM Plex Sans, sans-serif;
}

[data-type=page] > ol {
margin-left: 32px;
}
Expand Down