Merge branch 'settings-modal' into shigusegubu
* settings-modal: fix for a previous fix improve big spinner visibility Change flex for tab switcher lines to always have some small space reserved increase gap between buttons in titlebars fix icon changing color fix sidebar not closing in mobile lint lint
This commit is contained in:
commit
64e4fdaeaa
6 changed files with 16 additions and 14 deletions
|
@ -566,7 +566,7 @@ main-router {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-left: .25em;
|
margin-left: .5em;
|
||||||
min-width: 1px;
|
min-width: 1px;
|
||||||
align-self: stretch;
|
align-self: stretch;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,5 +9,8 @@
|
||||||
font-size: 15em;
|
font-size: 15em;
|
||||||
line-height: 0;
|
line-height: 0;
|
||||||
opacity: .6;
|
opacity: .6;
|
||||||
|
> i {
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -65,7 +65,7 @@ const SideDrawer = {
|
||||||
},
|
},
|
||||||
openSettingsModal () {
|
openSettingsModal () {
|
||||||
this.$store.dispatch('openSettingsModal')
|
this.$store.dispatch('openSettingsModal')
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
<li @click="toggleDrawer">
|
<li @click="toggleDrawer">
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
@click.stop="openSettingsModal"
|
@click="openSettingsModal"
|
||||||
>
|
>
|
||||||
<i class="button-icon icon-cog" /> {{ $t("settings.settings") }}
|
<i class="button-icon icon-cog" /> {{ $t("settings.settings") }}
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -65,19 +65,16 @@
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
&::after {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
&::before {
|
|
||||||
flex: 0 0 auto;
|
|
||||||
height: 0.5em;
|
|
||||||
}
|
|
||||||
&::after, &::before {
|
&::after, &::before {
|
||||||
|
flex: 1 0 .5em;
|
||||||
content: '';
|
content: '';
|
||||||
border-right: 1px solid;
|
border-right: 1px solid;
|
||||||
border-right-color: $fallback--border;
|
border-right-color: $fallback--border;
|
||||||
border-right-color: var(--border, $fallback--border);
|
border-right-color: var(--border, $fallback--border);
|
||||||
}
|
}
|
||||||
|
&::before {
|
||||||
|
flex-grow: 0;
|
||||||
|
}
|
||||||
.tab-wrapper {
|
.tab-wrapper {
|
||||||
min-width: 10em;
|
min-width: 10em;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -147,8 +144,10 @@
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
||||||
padding: 6px 1em;
|
padding: 6px 1em;
|
||||||
|
&, &:active .tab-icon {
|
||||||
color: $fallback--text;
|
color: $fallback--text;
|
||||||
color: var(--tabText, $fallback--text);
|
color: var(--tabText, $fallback--text);
|
||||||
|
}
|
||||||
background-color: $fallback--fg;
|
background-color: $fallback--fg;
|
||||||
background-color: var(--tab, $fallback--fg);
|
background-color: var(--tab, $fallback--fg);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue