align 'Applies-to' and actions

* remove the label
* use same height for inputs
* show up/down icons as triangles correctly
* remove extra margin on the right
This commit is contained in:
tophf 2022-01-28 01:50:00 +03:00
parent 5253c863b9
commit 4e68ee1b00
5 changed files with 30 additions and 31 deletions

View File

@ -102,7 +102,7 @@
</p> </p>
<label i18n-text="sectionCode" class="code-label"></label> <label i18n-text="sectionCode" class="code-label"></label>
<div class="applies-to"> <div class="applies-to">
<label i18n-text="appliesLabel"> <label i18n-text="appliesLabel" data-cmd="note" i18n-title="appliesHelp">
<a class="svg-inline-wrapper applies-to-help" tabindex="0"> <a class="svg-inline-wrapper applies-to-help" tabindex="0">
<svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg> <svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg>
</a> </a>

View File

@ -191,9 +191,6 @@ label {
#colorpicker-settings.svg-inline-wrapper { #colorpicker-settings.svg-inline-wrapper {
margin: -2px 0 0 .1rem; margin: -2px 0 0 .1rem;
} }
.svg-inline-wrapper.applies-to-help {
margin: 0 0 0 .25rem;
}
.aligned .svg-inline-wrapper { .aligned .svg-inline-wrapper {
margin: -2px 0 0 .3rem; margin: -2px 0 0 .3rem;
} }
@ -475,19 +472,20 @@ input:invalid {
.section.removed .CodeMirror { .section.removed .CodeMirror {
display: none; display: none;
} }
.move-section-down:after,
.move-section-up:after { .move-section-up:after {
content: ""; content: "";
display: block; display: block;
border-style: solid; border: var(--side) solid transparent;
border-width: 0 .3em .5em .3em; --side: .4em;
border-color: transparent transparent currentColor transparent; }
.move-section-up:after {
border-bottom: calc(var(--side) * 1.3) solid currentColor;
margin: -50% 0 0 0;
} }
.move-section-down:after { .move-section-down:after {
content: ""; border-top: calc(var(--side) * 1.3) solid currentColor;
display: block; margin: 0 0 -60% 0;
border-style: solid;
border-width: .5em .3em 0 .3em;
border-color: currentColor transparent transparent transparent;
} }
/* code */ /* code */
.code { .code {
@ -578,13 +576,12 @@ body:not(.find-open) [data-match-highlight-count="1"] .CodeMirror-selection-high
background-color: #f002; background-color: #f002;
border-color: #f008; border-color: #f008;
} }
.applies-to label { [i18n-text="appliesLabel"] {
display: flex; font-size: 0;
padding: 0; padding: 0;
height: 22px; margin-left: -24px;
align-items: center; position: absolute;
margin: 0 .2em 0 0; line-height: var(--input-height);
white-space: nowrap;
} }
.applies-to ul { .applies-to ul {
flex: auto; flex: auto;
@ -597,16 +594,17 @@ body:not(.find-open) [data-match-highlight-count="1"] .CodeMirror-selection-high
flex-wrap: wrap; flex-wrap: wrap;
list-style-type: none; list-style-type: none;
align-items: center; align-items: center;
margin-bottom: .5em;
} }
.applies-to li.applies-to-everything { .applies-to li.applies-to-everything {
align-items: unset; align-items: unset;
line-height: 22px; line-height: var(--input-height);
} }
.applies-to li > input { .applies-to li > input {
min-height: 1.4rem; min-height: 1.4rem;
} }
.applies-to li:not(.applies-to-everything) > * { .applies-to .select-resizer {
margin: 0 .2rem .5rem 0; margin-right: .5em;
} }
.applies-to li .add-applies-to:first-child { .applies-to li .add-applies-to:first-child {
margin-left: 1rem; margin-left: 1rem;
@ -625,8 +623,8 @@ body:not(.find-open) [data-match-highlight-count="1"] .CodeMirror-selection-high
.add-applies-to, .add-applies-to,
.remove-applies-to { .remove-applies-to {
font-size: 0; font-size: 0;
height: 22px; height: var(--input-height);
width: 22px; width: var(--input-height);
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

View File

@ -613,7 +613,6 @@ function SectionsEditor() {
/** @param {EditorSection} section */ /** @param {EditorSection} section */
function registerEvents(section) { function registerEvents(section) {
const {el, cm} = section; const {el, cm} = section;
$('.applies-to-help', el).onclick = () => helpPopup.show(t('appliesLabel'), t('appliesHelp'));
$('.remove-section', el).onclick = () => removeSection(section); $('.remove-section', el).onclick = () => removeSection(section);
$('.add-section', el).onclick = () => insertSectionAfter(undefined, section); $('.add-section', el).onclick = () => insertSectionAfter(undefined, section);
$('.clone-section', el).onclick = () => insertSectionAfter(section.getModel(), section); $('.clone-section', el).onclick = () => insertSectionAfter(section.getModel(), section);

View File

@ -6,6 +6,7 @@ html#stylus #header *:not(#\1transition-suppressor) {
} }
:root { :root {
--family: Arial, "Helvetica Neue", Helvetica, system-ui, sans-serif; --family: Arial, "Helvetica Neue", Helvetica, system-ui, sans-serif;
--input-height: 22px;
} }
body { body {
font: normal 12px var(--family); font: normal 12px var(--family);
@ -71,9 +72,9 @@ input:not([type]),
input[type=search] { input[type=search] {
background: #fff; background: #fff;
color: #000; color: #000;
height: 22px; height: var(--input-height);
min-height: 22px!important; min-height: var(--input-height)!important;
line-height: 22px; line-height: var(--input-height);
padding: 0 3px; padding: 0 3px;
border: 1px solid hsl(0, 0%, 66%); border: 1px solid hsl(0, 0%, 66%);
} }
@ -164,7 +165,8 @@ label {
select { select {
-moz-appearance: none; -moz-appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
height: 22px; box-sizing: content-box;
height: var(--input-height);
font: inherit; font: inherit;
color: #000; color: #000;
background-color: transparent; background-color: transparent;
@ -371,7 +373,7 @@ body.resizing-v > * {
.firefox select { .firefox select {
padding: 0 20px 0 2px; padding: 0 20px 0 2px;
line-height: 22px!important; line-height: var(--input-height)!important;
} }
svg { svg {

View File

@ -67,7 +67,7 @@
.config-body .onoffswitch { .config-body .onoffswitch {
width: var(--onoffswitch-width); width: var(--onoffswitch-width);
margin: 0; margin: 0;
height: 22px; height: var(--input-height);
box-sizing: border-box; box-sizing: border-box;
vertical-align: middle; vertical-align: middle;
} }
@ -112,7 +112,7 @@
} }
.config-number span, .config-range span { .config-number span, .config-range span {
line-height: 22px; line-height: var(--input-height);
} }
.config-body label:not(.nondefault) .config-reset-icon { .config-body label:not(.nondefault) .config-reset-icon {