summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-10-15 06:03:15 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-10-15 06:03:15 +0900
commit23045369aab5c2c165a4e46e7fe66f6abded5c9b (patch)
tree60220c4138b0d31de2ef0d0f1f096410cbf0c31d /src
parent10.17.0 (diff)
downloadsharkey-23045369aab5c2c165a4e46e7fe66f6abded5c9b.tar.gz
sharkey-23045369aab5c2c165a4e46e7fe66f6abded5c9b.tar.bz2
sharkey-23045369aab5c2c165a4e46e7fe66f6abded5c9b.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/home.vue38
-rw-r--r--src/client/app/desktop/views/components/ui.vue8
2 files changed, 25 insertions, 21 deletions
diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue
index 9008e26263..42e936edd1 100644
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -38,7 +38,7 @@
</div>
</div>
</div>
- <div class="main">
+ <div class="main" :class="{ side: widgets.left.length == 0 || widgets.right.length == 0 }">
<template v-if="customize">
<x-draggable v-for="place in ['left', 'right']"
:list="widgets[place]"
@@ -359,12 +359,10 @@ export default Vue.extend({
box-shadow var(--shadow)
border-radius var(--round)
- @media (max-width 700px)
- padding 0
-
- > .tl
- border none
- border-radius 0
+ &.side
+ > .main
+ width calc(100% - 280px)
+ max-width 680px
> *:not(.main)
width 280px
@@ -381,14 +379,24 @@ export default Vue.extend({
padding-right 16px
order 3
- @media (max-width 1100px)
- > *:not(.main)
- display none
+ &.side
+ @media (max-width 1000px)
+ > *:not(.main)
+ display none
- > .main
- float none
- width 100%
- max-width 700px
- margin 0 auto
+ > .main
+ width 100%
+ max-width 700px
+ margin 0 auto
+
+ &:not(.side)
+ @media (max-width 1200px)
+ > *:not(.main)
+ display none
+
+ > .main
+ width 100%
+ max-width 700px
+ margin 0 auto
</style>
diff --git a/src/client/app/desktop/views/components/ui.vue b/src/client/app/desktop/views/components/ui.vue
index 2aa259ab19..bd86dd371f 100644
--- a/src/client/app/desktop/views/components/ui.vue
+++ b/src/client/app/desktop/views/components/ui.vue
@@ -96,14 +96,10 @@ export default Vue.extend({
background-attachment fixed
opacity 0.3
- > .header
- @media (max-width 1000px)
- display none
-
> .content.sidebar.left
- padding-left 64px
+ padding-left 68px
> .content.sidebar.right
- padding-right 64px
+ padding-right 68px
</style>