summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-07-04 20:38:39 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-07-04 20:38:39 +0900
commit9e4456ac1b51de6eac8c30e30d1a4262af2e4132 (patch)
tree9abf1b2888ba23fef5c0fcab09b0bb61aab65ca0 /src
parentwip (diff)
downloadmisskey-9e4456ac1b51de6eac8c30e30d1a4262af2e4132.tar.gz
misskey-9e4456ac1b51de6eac8c30e30d1a4262af2e4132.tar.bz2
misskey-9e4456ac1b51de6eac8c30e30d1a4262af2e4132.zip
wip
Diffstat (limited to 'src')
-rw-r--r--src/client/app.vue10
-rw-r--r--src/client/components/notes.vue13
-rw-r--r--src/client/init.ts7
-rw-r--r--src/client/style.scss1
4 files changed, 8 insertions, 23 deletions
diff --git a/src/client/app.vue b/src/client/app.vue
index 8c876dc667..ea685881ef 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -571,9 +571,9 @@ export default Vue.extend({
$header-height: 60px;
$nav-width: 250px;
$nav-icon-only-width: 80px;
- $main-width: 650px;
+ $main-width: 670px;
$ui-font-size: 1em;
- $nav-icon-only-threshold: 1300px;
+ $nav-icon-only-threshold: 1279px;
$nav-hide-threshold: 650px;
$side-hide-threshold: 1070px;
@@ -920,9 +920,10 @@ export default Vue.extend({
> * {
min-height: calc(100vh - #{$header-height});
box-sizing: border-box;
+ padding: var(--margin);
- &:not(.full) {
- padding: var(--margin) 0;
+ &.full {
+ padding: 0 var(--margin);
}
&.naked {
@@ -965,7 +966,6 @@ export default Vue.extend({
> .widgets {
box-sizing: border-box;
- margin: 0 var(--margin);
@media (max-width: $side-hide-threshold) {
display: none;
diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue
index c83cbd1aa1..e8461fcb8d 100644
--- a/src/client/components/notes.vue
+++ b/src/client/components/notes.vue
@@ -1,5 +1,5 @@
<template>
-<div class="mk-notes" v-size="[{ max: 500 }]">
+<div class="mk-notes">
<div class="_fullinfo" v-if="empty">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<div>{{ $t('noNotes') }}</div>
@@ -89,16 +89,7 @@ export default Vue.extend({
.mk-notes {
> .notes {
> ::v-deep *:not(:last-child) {
- margin-bottom: var(--marginFull);
- }
- }
-
- &.max-width_500px {
- > .notes {
- > ::v-deep *:not(:last-child) {
- //margin-bottom: var(--marginHalf);
- margin-bottom: 0;
- }
+ margin-bottom: var(--margin);
}
}
}
diff --git a/src/client/init.ts b/src/client/init.ts
index 88e89cb6fc..32d6c2463c 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -102,13 +102,6 @@ const html = document.documentElement;
html.setAttribute('lang', lang);
//#endregion
-// iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする
-try {
- localStorage.setItem('foo', 'bar');
-} catch (e) {
- Storage.prototype.setItem = () => { }; // noop
-}
-
// http://qiita.com/junya/items/3ff380878f26ca447f85
document.body.setAttribute('ontouchstart', '');
diff --git a/src/client/style.scss b/src/client/style.scss
index 022a6657d2..aa7a5b12e1 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -282,6 +282,7 @@ hr {
._panel {
box-shadow: 0 1px 0 0 var(--divider), 0 -1px 0 0 var(--divider);
+ border-radius: none;
}
}