Skip to content

Commit a298651

Browse files
Merge pull request #38 from DOI-USGS/fsp-edits
Quote and Narration Layout Edits: Desktop
2 parents 92b1723 + 6fc3e33 commit a298651

35 files changed

+513
-559
lines changed

3_visualize.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ p3_targets <- list(
9393
us_data = p3_states,
9494
regions = FALSE,
9595
region_sf = NA,
96-
focal_stations = TRUE,
96+
focal_stations = FALSE,
9797
focal_station_data = p3_metadata_sf |> filter(national_1921),
9898
file_out = 'src/assets/images/states_stations_inset1921.png',
9999
svg_export = FALSE,
@@ -106,7 +106,7 @@ p3_targets <- list(
106106
us_data = p3_states,
107107
regions = FALSE,
108108
region_sf = NA,
109-
focal_stations = TRUE,
109+
focal_stations = FALSE,
110110
focal_station_data = p3_metadata_sf |> filter(national_1951),
111111
file_out = 'src/assets/images/states_stations_inset1951.png',
112112
svg_export = FALSE,
@@ -119,7 +119,7 @@ p3_targets <- list(
119119
us_data = p3_states,
120120
regions = FALSE,
121121
region_sf = NA,
122-
focal_stations = TRUE,
122+
focal_stations = FALSE,
123123
focal_station_data = p3_metadata_sf |> filter(national_1981),
124124
file_out = 'src/assets/images/states_stations_inset1981.png',
125125
svg_export = FALSE,

3_visualize/src/plot_inset.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ plot_inset <- function(station_data, station, us_data, regions, region_sf, focal
3535
p <- p + geom_sf(data = region_sf,
3636
color = NA,
3737
alpha = 0.5,
38-
fill = color_scheme$drought_event_highlight)
38+
fill = color_scheme$drought_event_dark)
3939

4040
if (station)
4141
# add stations

3_visualize/src/plot_stripswarm.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ event_violin_vertical <- function(drought_data, major_drought_periods,
8080
expand = c(0,0),
8181
position = 'right')+
8282
# Here this scale gives equidistant spacing on either side of "2" (the threshold)
83-
scale_x_continuous(limits = c(1.25, 2.75))+
84-
ggtitle(focal_CASC)
83+
scale_x_continuous(limits = c(1.25, 2.75))#+
84+
#ggtitle(focal_CASC)
8585

8686

8787
ggsave(file_out,

src/App.vue

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,72 +85,91 @@ $writeFont: 'Nanum Pen Script', cursive;
8585
8686
// Type
8787
html,
88+
:root {
89+
font-size: 62.5%;
90+
}
8891
body {
8992
height: 100%;
9093
background-color: white;
9194
margin: 0;
9295
padding: 0;
9396
line-height: 1.2;
94-
font-size: 20px;
97+
font-size: 2rem;
9598
font-weight: 400;
9699
-webkit-font-smoothing: antialiased;
97100
-moz-osx-font-smoothing: grayscale;
98101
width: 100%;
99102
@media screen and (max-width: 600px) {
100-
font-size: 16px;
103+
font-size: 1.6rem;
101104
}
102105
}
103106
h1{
104-
font-size: 4.5em;
107+
font-size: 4.5rem;
105108
font-weight: 500;
106109
font-family: $SourceSans;
107110
line-height: 1;
108111
text-align: left;
109112
text-shadow: 1px 1px 100px rgba(0,0,0,.8);
110113
color: $textcolor;
111114
@media screen and (max-width: 600px) {
112-
font-size: 4.75em;
115+
font-size: 4.75rem;
113116
}
114117
}
115118
h2{
116119
font-weight: 700;
117120
text-align: left;
118121
font-family: $SourceSans;
119-
font-size: 3em;
122+
font-size: 6rem;
120123
margin-top: 5px;
121124
line-height: 1.2;
122125
color: $textcolor;
123126
@media screen and (max-width: 600px) {
124-
font-size: 2em;
127+
font-size: 4rem;
125128
}
126129
}
127130
h3{
128-
font-size: 2em;
131+
font-size: 3.5rem;
129132
padding-top: 1em;
130133
padding-bottom: .25em;
131134
font-family: $SourceSans;
132135
font-weight: 700;
133136
color: $textcolor;
134137
@media screen and (max-width: 600px) {
135-
font-size: 1.5em;
138+
font-size: 3.2rem;
136139
}
137140
}
138141
h4{
139-
font-size: 1em;
142+
font-size: 2.5rem;
140143
padding-top: 0em;
141144
padding-bottom: .25em;
142145
font-family: $SourceSans;
143-
font-weight: 700;
146+
font-weight: 600;
144147
color: $textcolor;
145148
@media screen and (max-width: 600px) {
146-
font-size: 18px;
149+
font-size: 1.8rem;
147150
}
148151
}
149152
p, text {
150153
// padding: 1em 0 0 0;
151154
font-family: $SourceSans;
152155
color: $textcolor;
153156
}
157+
a:link {
158+
color:#032a56;
159+
}
160+
a:visited {
161+
color: #032a56;
162+
}
163+
a:hover {
164+
color: #032a56;
165+
}
166+
a:active {
167+
color: #032a56;
168+
}
169+
.droughtText.notesText{
170+
font-family: $writeFont;
171+
font-size: 2.5rem;
172+
}
154173
input[type=button] {
155174
font-family: $SourceSans;
156175
}
@@ -210,19 +229,19 @@ input[type=button] {
210229
.legend-text {
211230
fill: black;
212231
font-family: $SourceSans;
213-
font-size: 16px;
232+
font-size: 1.6rem;
214233
}
215234
.viz-comment {
216235
font-family: $SourceSans;
217-
font-size: 26px;
236+
font-size: 2.6rem;
218237
font-weight: 400;
219238
fill:rgb(224, 222, 222);
220239
}
221240
.viz-emph {
222241
font-weight:700;
223242
fill: white;
224243
font-family: $SourceSans;
225-
font-size: 26px;
244+
font-size: 2.6rem;
226245
}
227246
.emph {
228247
font-weight: bold;
@@ -231,7 +250,7 @@ input[type=button] {
231250
font-style: italic;
232251
}
233252
.pseudo-caption {
234-
font-size: .9em;
253+
font-size: 1.0rem;
235254
margin: 0 10px;
236255
}
237256
// Link Styling
316 KB
Loading
173 KB
Loading
-75.1 KB
Binary file not shown.
217 KB
Loading
-247 KB
Binary file not shown.
280 KB
Loading

0 commit comments

Comments
 (0)