From 469986644fd4d9dbccbd83ea4346ea17208d3153 Mon Sep 17 00:00:00 2001 From: James Young Date: Sat, 22 Feb 2020 01:52:21 -0800 Subject: [PATCH 1/9] Hide Unused Layers Hides the selectors for the layers that are unused in the current keymap. --- src/scss/style.scss | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/scss/style.scss b/src/scss/style.scss index 919d6b496c..231749c137 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -411,16 +411,14 @@ button { } .layers { - column-count: 2; - padding-left: 10px; - padding-right: 9px; + padding: 0 10px; // background: #fff; } .layer { - width: 25px; - height: 25px; - border-radius: 25px; + width: 39px; + height: 17px; + border-radius: 4px; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -430,7 +428,7 @@ button { align-items: center; line-height: 80%; font-size: 80%; - margin-bottom: 10px; + margin-bottom: 2px; // background: #fff; // color: #ccc; } @@ -454,6 +452,10 @@ button { // color: #fff; // } +.layer:not(.non-empty) { + display: none; +} + .split-content::after { content: ' '; display: block; From 3fd52afc96e9b5d3d452a783f46945e2368d7ffb Mon Sep 17 00:00:00 2001 From: James Young Date: Sat, 22 Feb 2020 12:36:32 -0800 Subject: [PATCH 2/9] UI updates Add the Add Layer button. --- src/components/LayerControl.vue | 11 ++++++++++- src/i18n/en.csv | 1 + src/main.js | 2 ++ src/scss/style.scss | 2 +- src/scss/themes.scss | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/LayerControl.vue b/src/components/LayerControl.vue index 3df39c4dc2..dc7e5eea30 100644 --- a/src/components/LayerControl.vue +++ b/src/components/LayerControl.vue @@ -3,6 +3,9 @@

+
diff --git a/src/scss/style.scss b/src/scss/style.scss index 4b7cd126c1..9c9f6fec8e 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -411,8 +411,7 @@ button { } .layers { - padding: 0 10px; - // background: #fff; + padding: 0 8px; } .layer { @@ -452,6 +451,11 @@ button { // color: #fff; // } +.split-content { + display: grid; + grid-template: 1fr / [keymap] 1fr [layer] 70px; +} + .split-content::after { content: ' '; display: block; @@ -472,14 +476,17 @@ button { padding: 30px 0px; } -.left-side { - float: left; +.layer-control { + width: 60px; + grid-column: layer; pointer-events: all; } -.right-side { - float: left; +.keymap-control { + grid-row: 1; + grid-column: keymap; pointer-events: all; + text-align: left; } .rigth-side:after { @@ -773,7 +780,6 @@ input[type='number'] { cursor: pointer; } #favorite-colorway { - float: right; } @media print { .backend-status, From 317169227b23c258f56cf126d8c0b86434ad040a Mon Sep 17 00:00:00 2001 From: James Young Date: Sat, 22 Feb 2020 19:36:14 -0800 Subject: [PATCH 6/9] move Layer Controls to the right, add settings icons --- src/components/LayerControl.vue | 21 ++++++++++++++++----- src/i18n/en.csv | 1 + src/scss/style.scss | 10 +++++++++- src/scss/themes.scss | 13 ++++++++++++- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/components/LayerControl.vue b/src/components/LayerControl.vue index cdb676be1c..28986fb4e1 100644 --- a/src/components/LayerControl.vue +++ b/src/components/LayerControl.vue @@ -9,12 +9,19 @@
{{ layer.name }}
+ class="layer-item" + > +
{{ layer.name }}
+ +
-
+