Skip to content

Commit fcd70ce

Browse files
authored
Merge pull request #353 from openstax/revert-345-neuroscience-splash-image
Revert "Style Neuroscience splash image"
2 parents d122ba1 + df7b381 commit fcd70ce

4 files changed

Lines changed: 3 additions & 94 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9-
* Style `splash images` in `neuroscience`
109

1110
## [v1.139.0] - 2023-11-03
1211

styles/books/neuroscience/book.scss

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@ $ChapterIntroType: side;
1717

1818
@include use('BookRoot', "common:::BookRoot");
1919

20-
21-
// Chapter Intro
22-
23-
24-
//Figures
25-
@include add_settings((
26-
FigureSplash: (
27-
_selectors: (".os-figure.has-splash"),
28-
'FigureSplashBg:::background-color': (_ref: "colorMap:::neuroscienceIntroColor"),
29-
),
30-
));
31-
32-
3320
// TOC
3421
@include add_settings((
3522
TOC: (
@@ -51,8 +38,10 @@ $ChapterIntroType: side;
5138

5239
// Chapter Intro
5340

41+
5442
//Figures
55-
@include use('FigureSplash','carnival:::FigureSplashShape');
43+
44+
5645

5746
//EOC
5847

styles/design-settings/carnival/_colors.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
mediaVideoColor: (_ref: "scheme:::G2"),
121121
mediaPodcastColor: (_ref: "scheme:::B2"),
122122
moduleTitleColor: (_ref: "scheme:::B3"),
123-
neuroscienceIntroColor: (_ref: "scheme:::B2"),
124123
neuroscienceHeaderColor: (_ref: "scheme:::B2"),
125124
notesHeaderColor: (_ref: "scheme:::white"),
126125
nursingBlackBoxColor: (_ref: "scheme:::black"),

styles/output/neuroscience-pdf.css

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -928,84 +928,6 @@ div[data-type=composite-page].os-eob {
928928
prince-background-image-resolution: 200dpi;
929929
}
930930

931-
.os-figure.has-splash {
932-
margin-bottom: 1.4rem;
933-
}
934-
935-
.os-figure.has-splash > figure.splash {
936-
position: relative;
937-
margin: 0;
938-
}
939-
940-
.os-figure.has-splash > figure.splash::before {
941-
content: '';
942-
background-color: #0074BC;
943-
position: absolute;
944-
height: 100%;
945-
width: 8.65in;
946-
margin-left: -1.15in;
947-
z-index: -3;
948-
box-sizing: border-box;
949-
padding: inherit;
950-
top: 0;
951-
}
952-
953-
.os-figure.has-splash > figure.splash > span[data-type=media] {
954-
line-height: 0;
955-
height: 100%;
956-
display: flex;
957-
width: 7.65in;
958-
justify-content: flex-end;
959-
z-index: -2;
960-
position: relative;
961-
}
962-
963-
.os-figure.has-splash > figure.splash > span[data-type=media] > img {
964-
width: 8.15in;
965-
}
966-
967-
.os-figure.has-splash .os-caption-container {
968-
position: relative;
969-
padding-top: 0.7rem;
970-
padding-bottom: 0.7rem;
971-
font-size: 0.8333333333rem;
972-
line-height: 1.2;
973-
}
974-
975-
.os-figure.has-splash .os-caption-container::before {
976-
content: '';
977-
background-color: #EEEAE0;
978-
position: absolute;
979-
height: 100%;
980-
width: 8.8in;
981-
margin-left: -1.15in;
982-
z-index: -1;
983-
box-sizing: border-box;
984-
padding: inherit;
985-
top: 0;
986-
}
987-
988-
.os-figure.has-splash .os-caption-container > .os-number {
989-
font-family: Mulish, sans-serif;
990-
font-weight: bold;
991-
color: #C31427;
992-
}
993-
994-
.os-figure.has-splash .os-caption-container > .os-title-label {
995-
font-family: Mulish, sans-serif;
996-
font-weight: bold;
997-
color: #C31427;
998-
text-transform: uppercase;
999-
}
1000-
1001-
.os-figure.has-splash .os-caption-container > .os-title {
1002-
font-family: Mulish, sans-serif;
1003-
font-weight: bold;
1004-
}
1005-
1006-
.os-figure.has-splash .os-caption-container > .os-caption {
1007-
font-family: IBM Plex Sans, sans-serif;
1008-
=======
1009931
nav#toc > .os-toc-title {
1010932
font-size: 4.29981696rem;
1011933
line-height: 3rem;

0 commit comments

Comments
 (0)