Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes. sorry for bad commit message i'm tired

Browse source
This commit is contained in:
Henry Jameson 2020-05-27 03:32:57 +03:00
parent 3938ccb8e7
commit 5ffcddd3b9
7 changed files with 96 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/settings_modal/settings_modal.js
View file

@ -24,6 +24,9 @@ const SettingsModal = {
} }
}, },
computed: { computed: {
currentSaveStateNotice () {
return this.$store.state.interface.settings.currentSaveStateNotice
},
modalActivated () { modalActivated () {
return this.$store.state.interface.settingsModalState !== 'hidden' return this.$store.state.interface.settingsModalState !== 'hidden'
}, },

3
src/components/settings_modal/settings_modal_content.js
View file

@ -25,9 +25,6 @@ const SettingsModalContent = {
ThemeTab ThemeTab
}, },
computed: { computed: {
currentSaveStateNotice () {
return this.$store.state.interface.settings.currentSaveStateNotice
},
isLoggedIn () { isLoggedIn () {
return !!this.$store.state.users.currentUser return !!this.$store.state.users.currentUser
} }

2
src/components/settings_modal/settings_modal_content.vue
View file

@ -40,7 +40,7 @@
<div <div
v-if="isLoggedIn" v-if="isLoggedIn"
:label="$t('settings.notifications')" :label="$t('settings.notifications')"
icon="chat" icon="bell-ringing-o"
> >
<NotificationsTab /> <NotificationsTab />
</div> </div>

19
src/components/settings_modal/tabs/theme_tab/theme_tab.scss
View file

@ -95,20 +95,25 @@
align-items: baseline; align-items: baseline;
width: 100%; width: 100%;
min-height: 30px; min-height: 30px;
margin-bottom: 1em;
.btn {
min-width: 1px;
flex: 0 auto;
padding: 0 1em;
}
p { p {
flex: 1; flex: 1;
margin: 0; margin: 0;
margin-right: .5em; margin-right: .5em;
} }
}
margin-bottom: 1em; .tab-header-buttons {
display: flex;
flex-direction: column;
.btn {
min-width: 1px;
flex: 0 auto;
padding: 0 1em;
margin-bottom: .5em;
}
} }
.shadow-selector { .shadow-selector {

26
src/components/settings_modal/tabs/theme_tab/theme_tab.vue
View file

@ -126,18 +126,20 @@
> >
<div class="tab-header"> <div class="tab-header">
<p>{{ $t('settings.theme_help') }}</p> <p>{{ $t('settings.theme_help') }}</p>
<button <div class="tab-header-buttons">
class="btn" <button
@click="clearOpacity" class="btn"
> @click="clearOpacity"
{{ $t('settings.style.switcher.clear_opacity') }} >
</button> {{ $t('settings.style.switcher.clear_opacity') }}
<button </button>
class="btn" <button
@click="clearV1" class="btn"
> @click="clearV1"
{{ $t('settings.style.switcher.clear_all') }} >
</button> {{ $t('settings.style.switcher.clear_all') }}
</button>
</div>
</div> </div>
<p>{{ $t('settings.theme_help_v2_1') }}</p> <p>{{ $t('settings.theme_help_v2_1') }}</p>
<h4>{{ $t('settings.style.common_colors.main') }}</h4> <h4>{{ $t('settings.style.common_colors.main') }}</h4>

19
src/components/tab_switcher/tab_switcher.js
View file

@ -95,9 +95,12 @@ export default Vue.component('tab-switcher', {
disabled={slot.data.attrs.disabled} disabled={slot.data.attrs.disabled}
onClick={this.activateTab(index)} onClick={this.activateTab(index)}
class={classesTab.join(' ')} class={classesTab.join(' ')}
type="button"
> >
{!slot.data.attrs.icon ? '' : (<i class={'tab-icon icon-' + slot.data.attrs.icon}/>)} {!slot.data.attrs.icon ? '' : (<i class={'tab-icon icon-' + slot.data.attrs.icon}/>)}
{slot.data.attrs.label} <span class="text">
{slot.data.attrs.label}
</span>
</button> </button>
</div> </div>
) )
@ -110,13 +113,23 @@ export default Vue.component('tab-switcher', {
if (slot.data.attrs.fullHeight) { if (slot.data.attrs.fullHeight) {
classes.push('full-height') classes.push('full-height')
} }
const newSlot = (
<div class={classes}>
{
this.sideTabBar
? <h1 class="mobile-label">{slot.data.attrs.label}</h1>
: ''
}
{slot}
</div>
)
if (this.renderOnlyFocused) { if (this.renderOnlyFocused) {
return active return active
? <div class={classes.join(' ')}>{slot}</div> ? <div class={classes.join(' ')}>{newSlot}</div>
: <div class={classes.join(' ')}></div> : <div class={classes.join(' ')}></div>
} }
return <div class={classes.join(' ')}>{slot}</div> return <div class={classes.join(' ')}>{newSlot}</div>
}) })
return ( return (

74
src/components/tab_switcher/tab_switcher.scss
View file

@ -10,12 +10,14 @@
&.top-tabs { &.top-tabs {
flex-direction: column; flex-direction: column;
> .tabs { > .tabs {
width: 100%; width: 100%;
overflow-y: hidden; overflow-y: hidden;
overflow-x: auto; overflow-x: auto;
padding-top: 5px; padding-top: 5px;
flex-direction: row; flex-direction: row;
&::after, &::before { &::after, &::before {
content: ''; content: '';
flex: 1 1 auto; flex: 1 1 auto;
@ -51,34 +53,47 @@
&.side-tabs { &.side-tabs {
flex-direction: row; flex-direction: row;
@media all and (max-width: 800px) { @media all and (max-width: 800px) {
overflow-x: auto; overflow-x: auto;
} }
> .contents { > .contents {
flex: 0 1 80%; flex: 1 1 auto;
@media all and (max-width: 800px) {
min-width: 96vw;
}
} }
> .tabs { > .tabs {
flex: 1 0 auto; flex: 0 0 auto;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
flex-direction: column; flex-direction: column;
&::after, &::before { &::after, &::before {
flex: 1 0 .5em; flex-shrink: 0;
flex-basis: .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);
} }
&::after {
flex-grow: 1;
}
&::before { &::before {
flex-grow: 0; flex-grow: 0;
} }
.tab-wrapper { .tab-wrapper {
min-width: 10em; min-width: 10em;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@media all and (max-width: 800px) {
min-width: 1em;
}
&:not(.active)::after { &:not(.active)::after {
top: 0; top: 0;
right: 0; right: 0;
@ -87,6 +102,7 @@
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 { &::before {
flex: 0 0 6px; flex: 0 0 6px;
content: ''; content: '';
@ -94,6 +110,7 @@
border-right-color: $fallback--border; border-right-color: $fallback--border;
border-right-color: var(--border, $fallback--border); border-right-color: var(--border, $fallback--border);
} }
&:last-child .tab { &:last-child .tab {
margin-bottom: 0; margin-bottom: 0;
} }
@ -106,26 +123,23 @@
min-width: 1px; min-width: 1px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
padding-left: 1em;
padding-right: calc(1em + 200px); padding-right: calc(1em + 200px);
margin-right: 6px - 200px; margin-right: calc(1em - 200px);
margin-left: 6px; margin-left: 1em;
} @media all and (max-width: 800px) {
padding-left: .25em;
.tab-wrapper { padding-right: calc(.25em + 200px);
min-width: 10em; margin-right: calc(.25em - 200px);
&:not(.active)::after { margin-left: .25em;
top: 0; .text {
right: 0; display: none
bottom: 0; }
border-right: 1px solid;
border-right-color: $fallback--border;
border-right-color: var(--border, $fallback--border);
} }
} }
} }
} }
.contents { .contents {
flex: 1 0 auto; flex: 1 0 auto;
min-height: 0px; min-height: 0px;
@ -142,14 +156,14 @@
.tab { .tab {
position: relative; position: relative;
white-space: nowrap; white-space: nowrap;
padding: 6px 1em; padding: 6px 1em;
background-color: $fallback--fg;
background-color: var(--tab, $fallback--fg);
&, &:active .tab-icon { &, &: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: var(--tab, $fallback--fg);
&:not(.active) { &:not(.active) {
z-index: 4; z-index: 4;
@ -173,7 +187,6 @@
} }
} }
.tabs { .tabs {
display: flex; display: flex;
position: relative; position: relative;
@ -198,4 +211,17 @@
} }
} }
} }
.mobile-label {
padding-left: .3em;
padding-bottom: .25em;
margin-top: .5em;
margin-left: .2em;
margin-bottom: .25em;
border-bottom: 1px solid var(--border, $fallback--border);
@media all and (min-width: 800px) {
display: none;
}
}
} }