Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better display in narrow desktop and choosing client type; Fix #1442, Fix #2106, Resolve #4552 #4549

Merged
merged 9 commits into from
Jul 7, 2019
Merged

Better display in narrow desktop and choosing client type; Fix #1442, Fix #2106, Resolve #4552 #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82d2b06
fix #1442, fix #2106
tamaina Mar 20, 2019
c2fc637
revert
tamaina Mar 20, 2019
2afcdda
wip
tamaina Apr 19, 2019
899fc8a
:v:
tamaina Apr 19, 2019
5afe96e
clean up
tamaina Apr 19, 2019
788edd3
fix
tamaina May 2, 2019
22c4842
https://github.com/syuilo/misskey/pull/4549#discussion_r287750004
tamaina May 29, 2019
05862a4
Merge branch 'develop' into pr/4549
syuilo Jul 7, 2019
6064c3a
Add semicolons
syuilo Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions locales/ja-JP.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,15 @@ common/views/components/emoji-picker.vue:
symbols: "記号"
flags: "旗"

common/views/components/settings/app-type.vue:
title: "モード"
intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
choices:
auto: "自動で選択"
desktop: "デスクトップ版に固定"
mobile: "モバイル版に固定"
info: "変更はページの再度読み込み後に反映されます。"

common/views/components/signin.vue:
username: "ユーザー名"
password: "パスワード"
Expand Down
9 changes: 8 additions & 1 deletion src/client/app/boot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,14 @@

// Detect the user agent
const ua = navigator.userAgent.toLowerCase();
const isMobile = /mobile|iphone|ipad|android/.test(ua);
let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
if (settings && settings.device.appTypeForce) {
if (settings.device.appTypeForce === 'mobile') {
isMobile = true;
} else if (settings.device.appTypeForce === 'desktop') {
isMobile = false;
}
}

// Get the <head> element
const head = document.getElementsByTagName('head')[0];
Expand Down
36 changes: 36 additions & 0 deletions src/client/app/common/views/components/settings/app-type.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<template>
<ui-card>
<template #title><fa :icon="faMobileAlt"/> {{ $t('title') }}</template>

<section class="fit-top">
<p>{{ $t('intro') }}</p>
<ui-select v-model="appTypeForce" :placeholder="$t('intro')">
<option v-for="x in ['auto', 'desktop', 'mobile']" :value="x" :key="x">{{ $t(`choices.${x}`) }}</option>
</ui-select>
<ui-info warn>{{ $t('info') }}</ui-info>
</section>
</ui-card>
</template>

<script lang="ts">
import Vue from 'vue';
import i18n from '../../../../i18n';
import { faMobileAlt } from '@fortawesome/free-solid-svg-icons'

export default Vue.extend({
i18n: i18n('common/views/components/settings/app-type.vue'),

data() {
return {
faMobileAlt
};
},

computed: {
appTypeForce: {
get() { return this.$store.state.device.appTypeForce; },
set(value) { this.$store.commit('device/set', { key: 'appTypeForce', value }); }
},
},
});
</script>
3 changes: 3 additions & 0 deletions src/client/app/common/views/components/settings/settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
</ui-card>

<x-language/>
<x-app-type/>
</template>

<template v-if="page == null || page == 'notification'">
Expand Down Expand Up @@ -271,6 +272,7 @@ import XPassword from './password.vue';
import XProfile from './profile.vue';
import XApi from './api.vue';
import XLanguage from './language.vue';
import XAppType from './app-type.vue';
import XNotification from './notification.vue';

import { url, version } from '../../../../config';
Expand All @@ -291,6 +293,7 @@ export default Vue.extend({
XProfile,
XApi,
XLanguage,
XAppType,
XNotification,
},
props: {
Expand Down
4 changes: 2 additions & 2 deletions src/client/app/desktop/views/home/home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
</template>
<template v-else>
<div v-for="place in ['left', 'right']" :class="place">
<div v-for="place in ['left', 'right']" :class="place" :key="place">
<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" platform="desktop"/>
</div>
<div class="main">
Expand Down Expand Up @@ -392,7 +392,7 @@ export default Vue.extend({
margin 0 auto

&:not(.side)
@media (max-width 1200px)
@media (max-width 1100px)
> *:not(.main)
display none

Expand Down
28 changes: 14 additions & 14 deletions src/client/app/desktop/views/home/timeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<div class="main">
<component :is="src == 'list' ? 'mk-user-list-timeline' : 'x-core'" ref="tl" v-bind="options">
<header class="zahtxcqi">
<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</span>
<div :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</div>
<div :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</div>
<div :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</div>
<div :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</div>
<div :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</div>
<div :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</div>
<div class="buttons">
<button :data-active="src == 'mentions'" @click="src = 'mentions'" :title="$t('mentions')"><fa icon="at"/><i class="indicator" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></button>
<button :data-active="src == 'messages'" @click="src = 'messages'" :title="$t('messages')"><fa :icon="['far', 'envelope']"/><i class="indicator" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></button>
Expand Down Expand Up @@ -200,18 +200,19 @@ export default Vue.extend({
&.shadow
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

.zahtxcqi
header.zahtxcqi
display flex
flex-wrap wrap
padding 0 8px
z-index 10
background var(--faceHeader)
box-shadow 0 var(--lineWidth) var(--desktopTimelineHeaderShadow)

> *
flex-shrink 0

> .buttons
position absolute
z-index 2
top 0
right 0
padding-right 8px
margin-left auto

> button
padding 0 8px
Expand Down Expand Up @@ -244,8 +245,7 @@ export default Vue.extend({
height 2px
background var(--primary)

> span
display inline-block
> div:not(.buttons)
padding 0 10px
line-height 42px
font-size 12px
Expand Down
1 change: 1 addition & 0 deletions src/client/app/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const defaultDeviceSettings = {
soundVolume: 0.5,
mediaVolume: 0.5,
lang: null,
appTypeForce: 'auto',
debug: false,
lightmode: false,
loadRawImages: false,
Expand Down