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.

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

Nursing Internal - Medical Surgical Nursing - Enable Column Width Proportional Values #554

Merged
merged 1 commit into from
Sep 9, 2024
Merged
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

- Add columns to `nursing-internal`
- Reenable local fonts for PDF/EPUB
- Style lists at third section level in `cardboard`
- `Data Science`: Table Vertical alignment
Expand Down
113 changes: 101 additions & 12 deletions styles/designs/carnival/parts/_columns-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ $Columns--TwoColumnsThreeRatioTwo: (
)
);

$Columns--TwoColumnsFourRatioTwo: (
_name: "TwoColumnsFourRatioTwo",
_subselector: " [data-columns='2'][data-ratio='2,2'] col[data-width='2*']",
_properties: (
width: column-width(2,4,2),
)
);


$Columns--TwoColumnsFourRatioOne: (
_name: "TwoColumnsFourRatioOne",
_subselector: " [data-columns='2'][data-ratio='1,3'] col[data-width='1*']",
Expand All @@ -49,14 +58,22 @@ $Columns--TwoColumnsFiveRatioTwo: (
)
);

$Columns--TwoColumnsFiveRatioThree: (
_name: "TwoColumnsFiveRatioThree",
$Columns--TwoColumnsFiveRatioThreeA: (
_name: "TwoColumnsFiveRatioThreeA",
_subselector: " [data-columns='2'][data-ratio='2,3'] col[data-width='3*']",
_properties: (
width: column-width(2,5,3),
)
);

$Columns--TwoColumnsFiveRatioThreeB: (
_name: "TwoColumnsFiveRatioThreeB",
_subselector: " [data-columns='2'][data-ratio='3,2'] col[data-width='3*']",
_properties: (
width: column-width(2,5,3),
)
);

// Three columns
$Columns--ThreeColumnsThreeRatioOne: (
_name: "ThreeColumnsThreeRatioOne",
Expand Down Expand Up @@ -123,19 +140,75 @@ $Columns--ThreeColumnsSixRatioThree: (
)
);

$Columns--ThreeColumnsSevenRatioThree: (
_name: "ThreeColumnsSevenRatioThree",
$Columns--ThreeColumnsSevenRatioOneA: (
_name: "ThreeColumnsSevenRatioOneA",
_subselector: " [data-columns='3'][data-ratio='1,3,3'] col[data-width='1*']",
_properties: (
width: column-width(3,7,1),
)
);

$Columns--ThreeColumnsSevenRatioOneB: (
_name: "ThreeColumnsSevenRatioOneB",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='1*']",
_properties: (
width: column-width(3,7,1),
)
);

$Columns--ThreeColumnsSevenRatioTwo: (
_name: "ThreeColumnsSevenRatioTwo",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='2*']",
_properties: (
width: column-width(3,7,2),
)
);

$Columns--ThreeColumnsSevenRatioThreeA: (
_name: "ThreeColumnsSevenRatioThreeA",
_subselector: " [data-columns='3'][data-ratio='1,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3,7,3),
)
);

$Columns--ThreeColumnsSevenRatioOne: (
_name: "ThreeColumnsSevenRatioOne",
_subselector: " [data-columns='3'][data-ratio='1,3,3'] col[data-width='1*']",
$Columns--ThreeColumnsSevenRatioThreeB: (
_name: "ThreeColumnsSevenRatioThreeB",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='3*']",
_properties: (
width: column-width(3,7,1),
width: column-width(3,7,3),
)
);

$Columns--ThreeColumnsEightRatioOne: (
_name: "ThreeColumnsEightRatioOne",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='1*']",
_properties: (
width: column-width(3,8,1),
)
);

$Columns--ThreeColumnsEightRatioTwo: (
_name: "ThreeColumnsEightRatioTwo",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='2*']",
_properties: (
width: column-width(3,8,2),
)
);

$Columns--ThreeColumnsEightRatioThree: (
_name: "ThreeColumnsEightRatioThree",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3,8,3),
)
);

$Columns--ThreeColumnsNineRatioThree: (
_name: "ThreeColumnsNineRatioThree",
_subselector: " [data-columns='3'][data-ratio='3,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3,9,3),
)
);

Expand Down Expand Up @@ -230,22 +303,38 @@ $Columns--FourColumnsSevenRatioTwo: (
)
);

$Columns--FourColumnsEightRatioOne: (
_name: "FourColumnsEightRatioOne",
$Columns--FourColumnsEightRatioOneA: (
_name: "FourColumnsEightRatioOneA",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='1*']",
_properties: (
width: column-width(4,8,1),
)
);

$Columns--FourColumnsEightRatioTwo: (
_name: "FourColumnsEightRatioTwo",
$Columns--FourColumnsEightRatioOneB: (
_name: "FourColumnsEightRatioOneB",
_subselector: " [data-columns='4'][data-ratio='2,1,3,2'] col[data-width='1*']",
_properties: (
width: column-width(4,8,1),
)
);

$Columns--FourColumnsEightRatioTwoA: (
_name: "FourColumnsEightRatioTwoA",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='2*']",
_properties: (
width: column-width(4,8,2),
)
);

$Columns--FourColumnsEightRatioTwoB: (
_name: "FourColumnsEightRatioTwoB",
_subselector: " [data-columns='4'][data-ratio='2,1,3,2'] col[data-width='2*']",
_properties: (
width: column-width(4,8,2),
)
);

$Columns--FourColumnsEightRatioThree: (
_name: "FourColumnsEightRatioThree",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='3*']",
Expand Down
21 changes: 16 additions & 5 deletions styles/designs/carnival/parts/_columns-shapes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
$Columns--TwoColumnsThreeRatioOne,
$Columns--TwoColumnsThreeRatioTwo,
$Columns--TwoColumnsFourRatioOne,
$Columns--TwoColumnsFourRatioTwo,
$Columns--TwoColumnsFourRatioThree,
$Columns--TwoColumnsFiveRatioTwo,
$Columns--TwoColumnsFiveRatioThree,
$Columns--TwoColumnsFiveRatioThreeA,
$Columns--TwoColumnsFiveRatioThreeB,
$Columns--ThreeColumnsThreeRatioOne,
$Columns--ThreeColumnsFourRatioOne,
$Columns--ThreeColumnsFourRatioTwo,
Expand All @@ -23,8 +25,15 @@
$Columns--ThreeColumnsSixRatioOne,
$Columns--ThreeColumnsSixRatioTwo,
$Columns--ThreeColumnsSixRatioThree,
$Columns--ThreeColumnsSevenRatioOne,
$Columns--ThreeColumnsSevenRatioThree,
$Columns--ThreeColumnsSevenRatioOneA,
$Columns--ThreeColumnsSevenRatioOneB,
$Columns--ThreeColumnsSevenRatioTwo,
$Columns--ThreeColumnsSevenRatioThreeA,
$Columns--ThreeColumnsSevenRatioThreeB,
$Columns--ThreeColumnsEightRatioOne,
$Columns--ThreeColumnsEightRatioTwo,
$Columns--ThreeColumnsEightRatioThree,
$Columns--ThreeColumnsNineRatioThree,
$Columns--ThreeColumnsSeventeenRatioOne,
$Columns--ThreeColumnsSeventeenRatioEight,
$Columns--FourColumnsFourRatioOne,
Expand All @@ -36,8 +45,10 @@
$Columns--FourColumnsSixRatioTwoA,
$Columns--FourColumnsSevenRatioOne,
$Columns--FourColumnsSevenRatioTwo,
$Columns--FourColumnsEightRatioOne,
$Columns--FourColumnsEightRatioTwo,
$Columns--FourColumnsEightRatioOneA,
$Columns--FourColumnsEightRatioOneB,
$Columns--FourColumnsEightRatioTwoA,
$Columns--FourColumnsEightRatioTwoB,
$Columns--FourColumnsEightRatioThree,
$Columns--FiveColumnsFiveRatioOne,
$Columns--FiveColumnsNineRatioOne,
Expand Down
109 changes: 99 additions & 10 deletions styles/designs/webview/parts/_columns-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ $Columns--TwoColumnsThreeRatioTwo: (
),
);

$Columns--TwoColumnsFourRatioTwo: (
_name: "TwoColumnsFourRatioTwo",
_subselector: " [data-columns='2'][data-ratio='2,2'] col[data-width='2*']",
_properties: (
width: column-width(2,4,2),
)
);

$Columns--TwoColumnsFourRatioOne: (
_name: "TwoColumnsFourRatioOne",
_subselector: " [data-columns='2'][data-ratio='1,3'] col[data-width='1*']",
Expand All @@ -49,14 +57,22 @@ $Columns--TwoColumnsFiveRatioTwo: (
),
);

$Columns--TwoColumnsFiveRatioThree: (
_name: "TwoColumnsFiveRatioThree",
$Columns--TwoColumnsFiveRatioThreeA: (
_name: "TwoColumnsFiveRatioThreeA",
_subselector: " [data-columns='2'][data-ratio='2,3'] col[data-width='3*']",
_properties: (
width: column-width(2, 5, 3),
),
);

$Columns--TwoColumnsFiveRatioThreeB: (
_name: "TwoColumnsFiveRatioThreeB",
_subselector: " [data-columns='2'][data-ratio='3,2'] col[data-width='3*']",
_properties: (
width: column-width(2,5,3),
)
);

// Three columns
$Columns--ThreeColumnsFourRatioOne: (
_name: "ThreeColumnsFourRatioOne",
Expand Down Expand Up @@ -90,22 +106,79 @@ $Columns--ThreeColumnsFiveRatioTwo: (
),
);

$Columns--ThreeColumnsSevenRatioOne: (
_name: "ThreeColumnsSevenRatioOne",
$Columns--ThreeColumnsSevenRatioOneA: (
_name: "ThreeColumnsSevenRatioOneA",
_subselector: " [data-columns='3'][data-ratio='1,3,3'] col[data-width='1*']",
_properties: (
width: column-width(3, 7, 1),
),
);

$Columns--ThreeColumnsSevenRatioThree: (
_name: "ThreeColumnsSevenRatioThree",
$Columns--ThreeColumnsSevenRatioOneB: (
_name: "ThreeColumnsSevenRatioOneB",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='1*']",
_properties: (
width: column-width(3,7,1),
)
);

$Columns--ThreeColumnsSevenRatioTwo: (
_name: "ThreeColumnsSevenRatioTwo",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='2*']",
_properties: (
width: column-width(3,7,2),
)
);


$Columns--ThreeColumnsSevenRatioThreeA: (
_name: "ThreeColumnsSevenRatioThreeA",
_subselector: " [data-columns='3'][data-ratio='1,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3, 7, 3),
),
);

$Columns--ThreeColumnsSevenRatioThreeB: (
_name: "ThreeColumnsSevenRatioThreeB",
_subselector: " [data-columns='3'][data-ratio='2,2,3'] col[data-width='3*']",
_properties: (
width: column-width(3,7,3),
)
);

$Columns--ThreeColumnsEightRatioOne: (
_name: "ThreeColumnsEightRatioOne",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='1*']",
_properties: (
width: column-width(3,8,1),
)
);

$Columns--ThreeColumnsEightRatioTwo: (
_name: "ThreeColumnsEightRatioTwo",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='2*']",
_properties: (
width: column-width(3,8,2),
)
);

$Columns--ThreeColumnsEightRatioThree: (
_name: "ThreeColumnsEightRatioThree",
_subselector: " [data-columns='3'][data-ratio='2,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3,8,3),
)
);

$Columns--ThreeColumnsNineRatioThree: (
_name: "ThreeColumnsNineRatioThree",
_subselector: " [data-columns='3'][data-ratio='3,3,3'] col[data-width='3*']",
_properties: (
width: column-width(3,9,3),
)
);

$Columns--ThreeColumnsSeventeenRatioOne: (
_name: "ThreeColumnsSeventeenRatioOne",
_subselector: " [data-columns='3'][data-ratio='1,8,8'] col[data-width='1*']",
Expand Down Expand Up @@ -196,22 +269,38 @@ $Columns--FourColumnsSevenRatioTwo: (
),
);

$Columns--FourColumnsEightRatioOne: (
_name: "FourColumnsEightRatioOne",
$Columns--FourColumnsEightRatioOneA: (
_name: "FourColumnsEightRatioOneA",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='1*']",
_properties: (
width: column-width(4, 8, 1),
),
);

$Columns--FourColumnsEightRatioTwo: (
_name: "FourColumnsEightRatioTwo",
$Columns--FourColumnsEightRatioOneB: (
_name: "FourColumnsEightRatioOneB",
_subselector: " [data-columns='4'][data-ratio='2,1,3,2'] col[data-width='1*']",
_properties: (
width: column-width(4,8,1),
)
);

$Columns--FourColumnsEightRatioTwoA: (
_name: "FourColumnsEightRatioTwoA",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='2*']",
_properties: (
width: column-width(4, 8, 2),
),
);

$Columns--FourColumnsEightRatioTwoB: (
_name: "FourColumnsEightRatioTwoB",
_subselector: " [data-columns='4'][data-ratio='2,1,3,2'] col[data-width='2*']",
_properties: (
width: column-width(4,8,2),
)
);

$Columns--FourColumnsEightRatioThree: (
_name: "FourColumnsEightRatioThree",
_subselector: " [data-columns='4'][data-ratio='1,2,3,2'] col[data-width='3*']",
Expand Down
Loading
Loading