Skip to content

Commit a45cc1d

Browse files
authored
Merge branch 'master' into fix_tab_switch
2 parents 1801ead + 474ff80 commit a45cc1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4425
-548
lines changed

locales/en/messages.json

Lines changed: 294 additions & 15 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"jquery-ui-npm": "^1.12.0",
6565
"lru_map": "^0.3.3",
6666
"marked": "^0.8.0",
67+
"multiple-select": "^1.5.2",
6768
"nw-vue-devtools-prebuilt": "^0.0.10",
6869
"object-hash": "^2.0.3",
6970
"select2": "^4.0.13",
@@ -125,7 +126,7 @@
125126
"temp": "^0.9.1",
126127
"vinyl-source-stream": "^2.0.0",
127128
"vue-template-compiler": "^2.6.12",
128-
"yarn": "^1.22.0"
129+
"yarn": "^1.22.17"
129130
},
130131
"optionalDependencies": {
131132
"gulp-appdmg": "^1.0.3"

src/css/dark-theme.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ dialog {
111111
border: 1px solid #ffbb2a;
112112
}
113113

114+
.standard_input {
115+
background: var(--boxBackground);
116+
color: white;
117+
}
118+
114119
#quad-status_wrapper {
115120
color: #393b3a;
116121
}

src/css/main.css

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@ a.disabled {
7878
background-position: center;
7979
}
8080

81+
.standard_input {
82+
padding-left: 3px;
83+
height: 20px;
84+
line-height: 20px;
85+
text-align: left;
86+
border-radius: 3px;
87+
font-size: 12px;
88+
font-weight: normal;
89+
border: 1px solid var(--subtleAccent);
90+
background: var(--boxBackground);
91+
}
92+
8193
/* Help-Icon */
8294
.helpicon {
8395
float: right;
@@ -740,8 +752,19 @@ input[type="number"]::-webkit-inner-spin-button {
740752
background-image: url(../images/icons/cf_icon_link_active.svg);
741753
}
742754

755+
/** Header (not phones) **/
756+
@media not all and (max-width: 575px) {
757+
.visible-on-phone-only {
758+
display: none !important;
759+
}
760+
}
761+
743762
/** Header (phones) **/
744763
@media all and (max-width: 575px) {
764+
.visible-on-desktop-only {
765+
display: none !important;
766+
}
767+
745768
.headerbar {
746769
height: 56px;
747770
background: rgba(0, 0, 0, 0.15);
@@ -1541,10 +1564,67 @@ dialog .dialog_toolbar .btn a.disabled {
15411564
opacity: 0.5;
15421565
}
15431566

1567+
.dialogYesNo .dialogYesNoContent {
1568+
margin-bottom: 12px;
1569+
margin-top: 12px;
1570+
white-space: pre-line;
1571+
}
1572+
1573+
.dialogYesNo .dialogYesNo-yesButton, .dialogYesNo .dialogYesNo-noButton {
1574+
margin: 0px;
1575+
}
1576+
1577+
.dialogYesNo .dialogYesNo-yesButton {
1578+
margin-right: 12px;
1579+
}
1580+
1581+
.dialogYesNo {
1582+
width: fit-content;
1583+
max-width: 400px;
1584+
}
1585+
1586+
.dialogWait {
1587+
width: fit-content;
1588+
max-width: 500px;
1589+
min-width: 300px;
1590+
}
1591+
1592+
.dialogWait .data-loading {
1593+
margin-top: 16px;
1594+
margin-bottom: 16px;
1595+
margin-left: auto;
1596+
margin-right: auto;
1597+
width: 100px;
1598+
height: 100px;
1599+
}
1600+
1601+
.dialogWait .dialogWaitTitle {
1602+
margin-left: auto;
1603+
margin-right: auto;
1604+
margin-bottom: 16px;
1605+
width: fit-content;
1606+
}
1607+
1608+
.dialogInformation .dialogInformationContent {
1609+
margin-bottom: 12px;
1610+
margin-top: 12px;
1611+
white-space: pre-line;
1612+
}
1613+
1614+
.dialogInformation .dialogInformation-confirmButton {
1615+
margin: 0px;
1616+
}
1617+
1618+
.dialogInformation {
1619+
width: fit-content;
1620+
max-width: 400px;
1621+
}
1622+
15441623
@media all and (max-width: 575px) {
15451624
dialog {
15461625
position: fixed;
1547-
width: calc(100% - 2em) !important;
1626+
width: calc(100% - 2em - 2px) !important; /* 2px - border */
1627+
max-width: unset;
15481628
height: auto !important;
15491629
bottom: 0;
15501630
top: 56px;
@@ -2348,7 +2428,6 @@ input {
23482428
.noUi-connect {
23492429
box-shadow: none;
23502430
}
2351-
23522431
/** Responsive grid **/
23532432
@media all and (max-width: 575px) {
23542433
.sm, .md, .lg, .xl {

src/css/tabs/firmware_flasher.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
cursor: default;
201201
color: #fff;
202202
background-color: #AFAFAF;
203-
border: none;
203+
border: 1px solid #AFAFAF;
204204
pointer-events: none;
205205
text-shadow: none;
206206
opacity: 0.5;

src/css/tabs/options.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
}
88
.tab-options .margin-bottom {
99
margin-bottom: 10px;
10+
display: grid;
11+
grid-template-columns: fit-content(300px) 1fr;
1012
}
1113
.tab-options select {
1214
background: var(--boxBackground);

src/css/tabs/pid_tuning.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,17 @@
163163
padding-right: 5px;
164164
}
165165

166-
.tab-pid_tuning table.compensation td:first-child {
166+
.tab-pid_tuning table.compensation td:first-child:not(.filterTable) {
167167
width: 65px;
168168
text-align: center;
169169
vertical-align: top;
170170
padding-top: 4px;
171171
}
172172

173+
.tab-pid_tuning table.filterTable.compensation td:first-child {
174+
width: 5%;
175+
}
176+
173177
.tab-pid_tuning table.compensation td:last-child {
174178
width: 100%;
175179
}
@@ -914,10 +918,6 @@
914918
table-layout: auto;
915919
}
916920

917-
.tab-pid_tuning table.filterTable td:first-child {
918-
width: 25%;
919-
}
920-
921921
@media only screen and (max-width: 1205px) {
922922

923923
.tab-pid_tuning .subtab-pid .spacer_left {
Lines changed: 6 additions & 0 deletions
Loading
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 22 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)