egenn commited on
Commit
73d003b
·
1 Parent(s): 99769ed

update colors

Browse files
Files changed (2) hide show
  1. app.R +5 -3
  2. www/rtemislive.scss +46 -74
app.R CHANGED
@@ -87,9 +87,8 @@ rtemisseq <- function(
87
  ),
88
  # Theme ----
89
  theme = bslib::bs_theme(
90
- bg = "#fff",
91
- fg = "#000",
92
- success = success,
93
  `tooltip-opacity` = 1,
94
  `tooltip-border-radius` = "10px",
95
  `tooltip-padding-x` = "1rem",
@@ -272,6 +271,7 @@ rtemisseq <- function(
272
  label = "Data source",
273
  choices = list(
274
  `Built-in datasets` = "builtin",
 
275
  `File upload` = "upload"
276
  ),
277
  selected = "builtin"
@@ -291,6 +291,8 @@ rtemisseq <- function(
291
  label = "Upload a3 JSON file",
292
  buttonLabel = "Browse local files...",
293
  )
 
 
294
  } else {
295
  # Select built-in data stored in ./data/ directory
296
  if (verbosity > 0) {
 
87
  ),
88
  # Theme ----
89
  theme = bslib::bs_theme(
90
+ # bg = "#fff",
91
+ # fg = "#000",
 
92
  `tooltip-opacity` = 1,
93
  `tooltip-border-radius` = "10px",
94
  `tooltip-padding-x` = "1rem",
 
271
  label = "Data source",
272
  choices = list(
273
  `Built-in datasets` = "builtin",
274
+ # `GitHub repository` = "github",
275
  `File upload` = "upload"
276
  ),
277
  selected = "builtin"
 
291
  label = "Upload a3 JSON file",
292
  buttonLabel = "Browse local files...",
293
  )
294
+ } else if (input$a3_load_switch == "github") {
295
+
296
  } else {
297
  # Select built-in data stored in ./data/ directory
298
  if (verbosity > 0) {
www/rtemislive.scss CHANGED
@@ -2,11 +2,15 @@
2
 
3
  // Define your custom colors
4
  // primary color
5
- $light-primary: #178CCB;
6
- $dark-primary: #B8E6FA;
 
 
7
  // info color
8
- $light-info: #E44C9A; // Default Bootstrap info color
9
- $dark-info: #FEB2E0; // Darker shade for better contrast in dark mode
 
 
10
  // tooltip-bg
11
  $light-tooltipbg: #cdcdcd;
12
  $dark-tooltipbg: #333333;
@@ -15,14 +19,17 @@ $dark-tooltipbg: #333333;
15
  @include color-mode(light) {
16
  // primary color
17
  --bs-primary: #{$light-primary};
18
- --bs-primary-rgb: #{red($light-primary)}, #{green($light-primary)}, #{blue($light-primary)};
19
  // info color
20
  --bs-info: #{$light-info};
21
- --bs-info-rgb: #{red($light-info)}, #{green($light-info)}, #{blue($light-info)};
22
  // button color
23
  --bs-button: #{$light-primary};
24
- // radio button color
25
- --bs-radio: #{$light-primary};
 
 
 
26
 
27
  --rt-tooltipbg: #{$light-tooltipbg};
28
  }
@@ -30,14 +37,16 @@ $dark-tooltipbg: #333333;
30
  @include color-mode(dark) {
31
  // primary color
32
  --bs-primary: #{$dark-primary};
33
- --bs-primary-rgb: #{red($dark-primary)}, #{green($dark-primary)}, #{blue($dark-primary)};
34
  // info color
35
  --bs-info: #{$dark-info};
36
- --bs-info-rgb: #{red($dark-info)}, #{green($dark-info)}, #{blue($dark-info)};
37
  // button color
38
  --bs-button: #{$dark-primary};
39
- // radio button color
40
- --bs-radio: #{$dark-primary};
 
 
41
 
42
  --rt-tooltipbg: #{$dark-tooltipbg};
43
  }
@@ -135,45 +144,6 @@ a {
135
  text-decoration: none;
136
  }
137
 
138
- // Buttons
139
- // .btn-primary {
140
- // background-color: var(--bs-primary);
141
- // border-color: var(--bs-primary);
142
- // }
143
-
144
- // .btn-outline-primary {
145
- // border-color: var(--bs-primary);
146
- // color: var(--bs-primary);
147
-
148
- // }
149
-
150
- // .btn-link {
151
- // color: var(--bs-primary);
152
- // }
153
-
154
- // .form-check-input:checked,
155
- // .form-check-input:focus {
156
- // background-color: var(--bs-primary);
157
- // border-color: var(--bs-primary);
158
- // }
159
-
160
- // Custom styles for buttons
161
- // .btn-primary {
162
- // @include button-variant($primary, $primary);
163
- // }
164
-
165
- // // Custom styles for radio buttons
166
- // .btn-check {
167
- // &:checked+.btn-primary {
168
- // @include button-variant($primary, $primary);
169
-
170
- // &:hover {
171
- // background-color: darken($primary, 10%);
172
- // border-color: darken($primary, 10%);
173
- // }
174
- // }
175
- // }
176
-
177
  // Define a SCSS variable that uses the CSS custom property
178
  $primary-color: var(--bs-primary);
179
 
@@ -182,24 +152,24 @@ $primary-color: var(--bs-primary);
182
  background-color: $primary-color;
183
  border-color: $primary-color;
184
 
185
- &:hover,
186
- &:focus,
187
- &:active {
188
- background-color: rgba($primary-color, 0.8);
189
- border-color: rgba($primary-color, 0.8);
190
- }
191
  }
192
 
193
  .btn-outline-primary {
194
  color: $primary-color;
195
  border-color: $primary-color;
196
 
197
- &:hover,
198
- &:focus,
199
- &:active {
200
- background-color: $primary-color;
201
- border-color: $primary-color;
202
- }
203
  }
204
 
205
  // Customize radio buttons
@@ -209,16 +179,18 @@ $primary-color: var(--bs-primary);
209
  border-color: $primary-color;
210
  }
211
 
212
- &:focus {
213
- border-color: $primary-color;
214
- box-shadow: 0 0 0 0.25rem rgba($primary-color, 0.25);
215
- }
216
  }
217
 
218
- // Customize focus state for buttons
219
- .btn-primary,
220
- .btn-outline-primary {
221
- &:focus {
222
- box-shadow: 0 0 0 0.25rem rgba($primary-color, 0.5);
223
- }
224
- }
 
 
 
2
 
3
  // Define your custom colors
4
  // primary color
5
+ $light-primary: #1295D8;
6
+ $dark-primary: #1295D8;
7
+ $light-primary-rgb: #{red($light-primary)}, #{green($light-primary)}, #{blue($light-primary)};
8
+ $dark-primary-rgb: #{red($dark-primary)}, #{green($dark-primary)}, #{blue($dark-primary)};
9
  // info color
10
+ $light-info: #E44C9A;
11
+ $light-info-rgb: #{red($light-info)}, #{green($light-info)}, #{blue($light-info)};
12
+ $dark-info: #FEB2E0;
13
+ $dark-info-rgb: #{red($dark-info)}, #{green($dark-info)}, #{blue($dark-info)};
14
  // tooltip-bg
15
  $light-tooltipbg: #cdcdcd;
16
  $dark-tooltipbg: #333333;
 
19
  @include color-mode(light) {
20
  // primary color
21
  --bs-primary: #{$light-primary};
22
+ --bs-primary-rgb: #{$light-primary-rgb};
23
  // info color
24
  --bs-info: #{$light-info};
25
+ --bs-info-rgb: #{$light-info-rgb};
26
  // button color
27
  --bs-button: #{$light-primary};
28
+ --bs-button-rgb: #{$light-primary-rgb};
29
+ // link color
30
+ --bs-link-color: #{$light-primary};
31
+ --bs-link-color-rgb: #{$light-primary-rgb};
32
+
33
 
34
  --rt-tooltipbg: #{$light-tooltipbg};
35
  }
 
37
  @include color-mode(dark) {
38
  // primary color
39
  --bs-primary: #{$dark-primary};
40
+ --bs-primary-rgb: #{$dark-primary-rgb};
41
  // info color
42
  --bs-info: #{$dark-info};
43
+ --bs-info-rgb: #{$dark-info-rgb};
44
  // button color
45
  --bs-button: #{$dark-primary};
46
+ --bs-button-rgb: #{$dark-primary-rgb};
47
+ // link color
48
+ --bs-link-color: #{$dark-primary};
49
+ --bs-link-color-rgb: #{$dark-primary-rgb};
50
 
51
  --rt-tooltipbg: #{$dark-tooltipbg};
52
  }
 
144
  text-decoration: none;
145
  }
146
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
147
  // Define a SCSS variable that uses the CSS custom property
148
  $primary-color: var(--bs-primary);
149
 
 
152
  background-color: $primary-color;
153
  border-color: $primary-color;
154
 
155
+ // &:hover,
156
+ // &:focus,
157
+ // &:active {
158
+ // background-color: rgba($primary-color, 0.8);
159
+ // border-color: rgba($primary-color, 0.8);
160
+ // }
161
  }
162
 
163
  .btn-outline-primary {
164
  color: $primary-color;
165
  border-color: $primary-color;
166
 
167
+ // &:hover,
168
+ // &:focus,
169
+ // &:active {
170
+ // background-color: $primary-color;
171
+ // border-color: $primary-color;
172
+ // }
173
  }
174
 
175
  // Customize radio buttons
 
179
  border-color: $primary-color;
180
  }
181
 
182
+ // &:focus {
183
+ // border-color: $primary-color;
184
+ // box-shadow: 0 0 0 0.25rem rgba($primary-color, 0.25);
185
+ // }
186
  }
187
 
188
+ // Radio buttons
189
+ .form-check-input:checked,
190
+ .shiny-input-container .checkbox input:checked,
191
+ .shiny-input-container .checkbox-inline input:checked,
192
+ .shiny-input-container .radio input:checked,
193
+ .shiny-input-container .radio-inline input:checked {
194
+ background-color: $primary-color;
195
+ border-color: $primary-color;
196
+ }