refactor carnival tables

CHANGELOG.md

@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Style `header row` in middle of table and refactor `table shapes` in `nursing-internal`
 * Unnumbered `Learning Objectives` in `computer-science`
 * Style `answer-key` in `neuroscience`
 * Add check for whether output compiled to CI

styles/books/nursing-internal/book.scss

@@ -1,4 +1,5 @@
 @use 'lib/carnival/carnival';
+@use 'lib/carnival/colors';
 
 $PagesWithBands: (
   (pageName: eoc, firstSelector: '.os-eoc.os-summary-container', generalSelector: '.os-eoc'),
@@ -86,25 +87,6 @@ $ChapterIntroType: fullWidth;
   ),
 ));
 
-// Tables
-@include add_settings((
-  BasicTable: (
-    _selectors: ('.os-table:not(.os-unstyled-container)'),
-    'TableBottomBorderAfterTable:::border-top-color': (_ref: 'colorMap:::nursingTableColor'),
-  ),
-  ColumnHeaderTable: (
-    _selectors: ('.os-table.os-column-header-container'),
-    'LastTableRowData:::border-bottom-color': (_ref: "colorMap:::nursingTableColor"),
-    'FirstTableRow:::border-top-color': (_ref: "colorMap:::nursingTableColor"),
-  ),
-));
-
-@include add_settings((
-  VerticallyTightTable: (
-    _selectors: ('.os-table.os-vertically-tight-container > table.vertically-tight')
-  )
-));
-
 //Centered Text
 @include add_settings((
   CenteredText: (
@@ -253,12 +235,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 carnival.basic-table(colors.$B2);
+@include carnival.table-from-exercise();
+@include carnival.table-top-spacing();
+@include carnival.column-header-table(colors.$B2);
+@include carnival.vertically-tight-table();
+@include carnival.table-column();
 
 // Lists
 @include use('PageLists', 'carnival:::PageListsShape');

styles/lib/carnival/_carnival.scss

@@ -1 +1,2 @@
 @forward 'lib/carnival/features/exercises';
+@forward 'lib/carnival/features/tables';

styles/lib/carnival/_theme.scss → styles/lib/carnival/_colors.scss

@@ -1,4 +1,3 @@
-// Colors
 $O1:    #F37541;
 $O1Op5: #F375410D;
 $O2:    #CE472C;

styles/lib/carnival/_fonts.scss

@@ -0,0 +1,2 @@
+$mulish: Mulish, sans-serif;
+$plex: IBM Plex Sans, sans-serif;

styles/lib/carnival/features/_exercises.scss

@@ -1,4 +1,5 @@
-@use 'lib/carnival/theme' as carnival;
+@use 'lib/carnival/colors';
+@use 'lib/carnival/fonts';
 
 @mixin exercises($element, $number-width: null) {
     #{$element} {
@@ -34,7 +35,7 @@
 @mixin -number($width: null) {
     display: table-cell;
     text-decoration: none;
-    color: carnival.$black;
+    color: colors.$black;
     font-weight: bold;
     width: $width;
     text-align: right;