Skip to content

Commit fa1fdf2

Browse files
committed
[refactor] improve theme preset and nighttab preset font
1 parent 1cd0063 commit fa1fdf2

File tree

6 files changed

+280
-254
lines changed

6 files changed

+280
-254
lines changed

‎src/css/form.css‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,8 +1200,15 @@ input[type="range"]:disabled::-moz-range-progress{
12001200
}
12011201

12021202
.form-inline{
1203-
display: inline-block;
1204-
margin-right:0.5em;
1203+
display: flex;
1204+
flex-direction: row;
1205+
justify-content: flex-start;
1206+
align-items: flex-start;
1207+
flex-wrap: wrap;
1208+
}
1209+
1210+
.form-inline>*{
1211+
margin-right:1em;
12051212
width: initial;
12061213
}
12071214

‎src/css/theme.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.theme-preset-font-display{
78-
font-size:1.6em;
78+
font-size:1.25em;
7979
margin-bottom:0.25em;
8080
}
8181

‎src/index.html‎

Lines changed: 235 additions & 244 deletions
Large diffs are not rendered by default.

‎src/js/control.js‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,16 +2534,35 @@ var control = (function(){
25342534
element: helper.e(".control-theme-preset-nighttab"),
25352535
type: "button",
25362536
func: function(){
2537-
theme.preset("nighttab");
2537+
mod.setValue("theme.accent.current",helper.getObject({
2538+
object: state.get.default(),
2539+
path: "theme.accent.current"
2540+
}));
2541+
mod.setValue("theme.color",helper.getObject({
2542+
object: state.get.default(),
2543+
path: "theme.color"
2544+
}));
2545+
mod.setValue("theme.font",helper.getObject({
2546+
object: state.get.default(),
2547+
path: "theme.font"
2548+
}));
2549+
mod.setValue("theme.style",helper.getObject({
2550+
object: state.get.default(),
2551+
path: "theme.style"
2552+
}));
2553+
mod.setValue("theme.radius",helper.getObject({
2554+
object: state.get.default(),
2555+
path: "theme.radius"
2556+
}));
2557+
render.update();
2558+
render.class();
25382559
theme.render.font.display();
25392560
theme.render.font.ui();
25402561
theme.style.check();
25412562
theme.render.color.shade();
25422563
theme.render.accent.color();
25432564
theme.render.radius();
25442565
link.groupAndItems();
2545-
render.update();
2546-
render.class();
25472566
}
25482567
},{
25492568
element: helper.e(".control-theme-preset-midnight"),

‎src/js/state.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,11 @@ var state = (function(){
367367
b: 160
368368
}
369369
},
370+
font: {
371+
display: "",
372+
ui: ""
373+
},
374+
style: "dark",
370375
radius: 0.25
371376
}
372377
};

‎src/js/theme.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ var theme = (function(){
143143
all: {
144144
nighttab: {
145145
font: {
146-
display: "",
147-
ui: ""
146+
display: "Fjalla One Regular",
147+
ui: "Open Sans Regular"
148148
},
149149
color: {
150150
hsl: {
@@ -742,8 +742,12 @@ var theme = (function(){
742742
renderPreview("--theme-preset-background-"+key+"-",i,rgb);
743743
};
744744
html.style.setProperty("--theme-preset-accent-"+key,preset.accent.r+", "+preset.accent.g+", "+preset.accent.b);
745-
html.style.setProperty("--theme-preset-font-display-"+key,"\""+preset.font.display+"\", sans-serif");
746-
html.style.setProperty("--theme-preset-font-ui-"+key,"\""+preset.font.ui+"\", sans-serif");
745+
if(preset.font.display!=""){
746+
html.style.setProperty("--theme-preset-font-display-"+key,"\""+preset.font.display+"\", sans-serif");
747+
};
748+
if(preset.font.ui!=""){
749+
html.style.setProperty("--theme-preset-font-ui-"+key,"\""+preset.font.ui+"\", sans-serif");
750+
};
747751
if(preset.style=="dark"){
748752
html.style.setProperty("--theme-preset-font-color-"+key,"var(--theme-white)");
749753
}elseif(preset.style=="light"){

0 commit comments

Comments
(0)