Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5251 missing rule #333

Merged
merged 14 commits into from
Oct 20, 2023
Merged

5251 missing rule #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
34c0e19
update border-left rule for Basic Table shape
jbwilson8 Oct 10, 2023
5be9ba5
reverse last change
jbwilson8 Oct 11, 2023
fc98061
make border-left an optional attribute
jbwilson8 Oct 12, 2023
2b7f149
building styles
jbwilson8 Oct 12, 2023
1f35ce2
Update _table-components.scss
jbwilson8 Oct 12, 2023
e23f86a
Update nursing-external-pdf.css
jbwilson8 Oct 12, 2023
68b8cda
create new component to target rowspan
jbwilson8 Oct 16, 2023
93493c3
revert changes
jbwilson8 Oct 16, 2023
596081c
Implementing left border
jbwilson8 Oct 16, 2023
ee57cb1
Update CHANGELOG.md
jbwilson8 Oct 16, 2023
cea3ea8
Merge branch 'main' into 5251-missing-rule
jbwilson8 Oct 16, 2023
6ea6719
merge redundant table components and build all books
jbwilson8 Oct 18, 2023
8a4404b
Merge branch 'main' into 5251-missing-rule
jbwilson8 Oct 18, 2023
0222e0f
update table settings
jbwilson8 Oct 19, 2023
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
View file
Open in desktop
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 `left-border in BasicTableShape` in `nursing-external`
* Style `pl-marketing`
* Add style for `boxed-feature` note for `nursing-external`
* Create files for `columns` to set proportional width
Expand Down
8 changes: 4 additions & 4 deletions styles/design-settings/carnival/parts/_table-settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// Will need to be refactored to make a clean split between
// tables and borders as part of a clean-up sprint.
//border-right: 0.025rem solid black,
FirstTableData: (
TableDataNotLastChild: (
border-right: 0.025rem solid black,
),
TableHeadCell: (
Expand Down Expand Up @@ -90,7 +90,7 @@
// Will need to be refactored to make a clean split between
// tables and borders as part of a clean-up sprint.
//border-right: 0.025rem solid black,
FirstTableData: (
TableDataNotLastChild: (
border-right: 0.025rem solid black,
),
TableHeadCell: (
Expand Down Expand Up @@ -142,7 +142,7 @@
LastTableRowData: (
border-bottom-color: (_ref:"colorMap:::chapterOutlineColor"),
),
FirstTableData: (
TableDataNotLastChild: (
border-right: 0.1rem solid black,
font-family: (_ref: "typography:::titleOption1Font"),
font-weight: 700,
Expand Down Expand Up @@ -189,7 +189,7 @@
LastTableRow: (
border-bottom: .1rem solid black,
),
FirstTableData: (
TableDataNotLastChild: (
border-right: 0.025rem solid black,
),
CaptionTitleLabel:(
Expand Down
14 changes: 3 additions & 11 deletions styles/designs/carnival/parts/_table-components.scss
View file
Open in desktop
jbwilson8 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ $Table__Data--BottomBorder: (
);

// Altered as part of the fix for cnx-recipes#1827.
$Table__Data--First: (
_name: "FirstTableData",
_subselector: " > td:first-of-type:not(:only-of-type)",
$Table__Data--NotLastChild: (
_name: "TableDataNotLastChild",
_subselector: " > td:not(:only-of-type):not(:last-child)",
_properties: (
border-left: none,
border-right: enum('ValueSet:::REQUIRED'),
Expand All @@ -238,14 +238,6 @@ $Table__Data--First: (
)
);

$Table__Data--NotLast: (
_name: "NotLastTableData",
_subselector: " > td:not(:only-of-type):not(:last-of-type)",
_properties: (
border-right: '0.025rem solid black',
)
);

$Table__Row--First: (
_name: "FirstTableRow",
_subselector: " > tr:first-of-type",
Expand Down
9 changes: 4 additions & 5 deletions styles/designs/carnival/parts/_table-shapes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
$Table__Data--RightAligned,
$Table__Data--Centered,
$Table__Data,
$Table__Data--First,
$Table__Data--NotLastChild,
// Added as part of the fix for cnx-recipes#1827
$Table__Data--BottomBorder,
)
Expand Down Expand Up @@ -91,8 +91,7 @@
$Table__Data--RightAligned,
$Table__Data--Centered,
$Table__Data,
$Table__Data--First,
$Table__Data--NotLast,
$Table__Data--NotLastChild,
// Added as part of the fix for cnx-recipes#1827
$Table__Data--BottomBorder,
)
Expand All @@ -119,7 +118,7 @@
map-merge($Table__Row, (
_components: (
$Table__Data,
$Table__Data--First,
$Table__Data--NotLastChild,
)
)),
$Table__Row--First,
Expand Down Expand Up @@ -154,7 +153,7 @@
map-merge($Table__Row, (
_components: (
$Table__Data,
$Table__Data--First,
$Table__Data--NotLastChild,
),
)),
$Table__Row--Last,
Expand Down
2 changes: 1 addition & 1 deletion styles/output/anatomy-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
2 changes: 1 addition & 1 deletion styles/output/anthropology-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,7 @@ nav#toc > ol > .os-toc-composite-chapter > a::after {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
6 changes: 3 additions & 3 deletions styles/output/ap-biology-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1962,7 +1962,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -3472,7 +3472,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-column-header-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-column-header-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.1rem solid black;
font-family: Mulish, sans-serif;
Expand Down
4 changes: 2 additions & 2 deletions styles/output/ap-physics-2e-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1628,7 +1628,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/ap-physics-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1628,7 +1628,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/biology-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1962,7 +1962,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/chemistry-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1810,7 +1810,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/college-physics-2e-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1628,7 +1628,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/college-physics-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1628,7 +1628,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/hs-physics-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,7 +1606,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -1697,7 +1697,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/microbiology-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -2652,7 +2652,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/nursing-external-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@ a[role=doc-noteref] {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -2645,7 +2645,7 @@ a[role=doc-noteref] {
padding-left: 0.7rem;
}

.os-table.os-top-titled-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-top-titled-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/nursing-internal-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.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;
}
Expand Down Expand Up @@ -1968,7 +1968,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.os-column-header-container > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.os-column-header-container > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.1rem solid black;
font-family: Mulish, sans-serif;
Expand Down
6 changes: 1 addition & 5 deletions styles/output/organic-chemistry-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,15 +2602,11 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.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:not(:only-of-type):not(:last-of-type) {
border-right: 0.025rem solid black;
}

.os-table:not(.os-unstyled-container) > table > tbody > tr > td {
font-family: IBM Plex Sans, sans-serif;
border-bottom: 0.025rem solid black;
Expand Down
4 changes: 2 additions & 2 deletions styles/output/pl-u-physics-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -2487,7 +2487,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
4 changes: 2 additions & 2 deletions styles/output/u-physics-pdf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,7 +2356,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table:not(.os-unstyled-container):not(.os-no-cellborder-container) > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down Expand Up @@ -2447,7 +2447,7 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
padding-left: 0.7rem;
}

.os-table.top-titled > table > tbody > tr > td:first-of-type:not(:only-of-type) {
.os-table.top-titled > table > tbody > tr > td:not(:only-of-type):not(:last-child) {
border-left: none;
border-right: 0.025rem solid black;
}
Expand Down
Loading