🎨

2018-09-22 15:58:11 +09:00 · 2018-09-22 15:58:11 +09:00 · 251629ab61
commit 251629ab61
parent 82d94b5963
13 changed files with 67 additions and 77 deletions
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@ -1,8 +1,11 @@
 <template>
-<div class="anltbovirfeutcigvwgmgxipejaeozxi"
+<div class="anltbovirfeutcigvwgmgxipejaeozxi">
+	<mk-widget-container :show-header="false" :naked="props.design == 1">
+		<div class="anltbovirfeutcigvwgmgxipejaeozxi-body"
 			:data-found="announcements && announcements.length != 0"
 			:data-melt="props.design == 1"
 			:data-mobile="platform == 'mobile'"
+			:data-darkmode="$store.state.device.darkmode"
 		>
 			<div class="icon">
 				<svg height="32" version="1.1" viewBox="0 0 32 32" width="32">
@ -21,6 +24,8 @@
 			</p>
 			<a v-if="announcements.length > 1" @click="next">%i18n:@next% &gt;&gt;</a>
 		</div>
+	</mk-widget-container>
+</div>
 </template>

 <script lang="ts">
@ -68,11 +73,10 @@ export default define({
 <style lang="stylus" scoped>
 root(isDark)
 	padding 10px
-	border solid 1px #4078c0
-	border-radius 6px
+	background isDark ? #253a50 : #f3f9ff

 	&[data-melt]
-		border none
+		background transparent

 	&[data-found]
 		padding-left 50px
@ -133,7 +137,7 @@ root(isDark)
 		z-index 1
 		margin 0
 		font-size 0.7em
-		color isDark ? #fff : #555
+		color isDark ? #fff : #57616f

 		&.fetching
 			text-align center
@ -146,10 +150,10 @@ root(isDark)
 		> p
 			color #fff

-.anltbovirfeutcigvwgmgxipejaeozxi[data-darkmode]
+.anltbovirfeutcigvwgmgxipejaeozxi-body[data-darkmode]
 	root(true)

-.anltbovirfeutcigvwgmgxipejaeozxi:not([data-darkmode])
+.anltbovirfeutcigvwgmgxipejaeozxi-body:not([data-darkmode])
 	root(false)

 </style>
--- a/src/client/app/desktop/views/components/calendar.vue
+++ b/src/client/app/desktop/views/components/calendar.vue
@ -133,8 +133,7 @@ export default Vue.extend({
 root(isDark)
 	color isDark ? #c5ced6 : #777
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 	overflow hidden

 	&[data-melt]
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@ -231,8 +231,7 @@ root(isDark)
 	overflow hidden
 	text-align left
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.1)
-	border-radius 8px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 	> .read-more
 		display block
--- a/src/client/app/desktop/views/components/timeline.vue
+++ b/src/client/app/desktop/views/components/timeline.vue
@ -179,14 +179,12 @@ export default Vue.extend({

 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 	> header
 		padding 0 8px
 		z-index 10
 		background isDark ? #313543 : #fff
-		border-radius 6px 6px 0 0
 		box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08)

 		> .buttons
--- a/src/client/app/desktop/views/components/ui.header.vue
+++ b/src/client/app/desktop/views/components/ui.header.vue
@ -125,7 +125,7 @@ root(isDark)
 	top 0
 	z-index 1000
 	width 100%
-	box-shadow 0 1px 1px rgba(#000, 0.075)
+	box-shadow 0 0px 8px rgba(#000, 0.2)

 	> .warn
 		display block
--- a/src/client/app/desktop/views/components/widget-container.vue
+++ b/src/client/app/desktop/views/components/widget-container.vue
@ -36,13 +36,12 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, isDark ? 0.2 : 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 	overflow hidden

 	&.naked
 		background transparent !important
-		border none !important
+		box-shadow none !important

 	> header
 		background isDark ? #313543 : #fff
--- a/src/client/app/desktop/views/pages/user/user.followers-you-know.vue
+++ b/src/client/app/desktop/views/pages/user/user.followers-you-know.vue
@ -38,8 +38,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 	> .title
 		z-index 1
--- a/src/client/app/desktop/views/pages/user/user.friends.vue
+++ b/src/client/app/desktop/views/pages/user/user.friends.vue
@ -42,8 +42,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 	overflow hidden

 	> .title
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@ -104,8 +104,7 @@ export default Vue.extend({

 root(isDark)
 	background isDark ? #282C37 : #fff
-	border 1px solid rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 	overflow hidden

 	&[data-is-dark-background]
--- a/src/client/app/desktop/views/pages/user/user.photos.vue
+++ b/src/client/app/desktop/views/pages/user/user.photos.vue
@ -41,8 +41,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 	overflow hidden

 	> .title
--- a/src/client/app/desktop/views/pages/user/user.profile.vue
+++ b/src/client/app/desktop/views/pages/user/user.profile.vue
@ -87,8 +87,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 root(isDark)
 	background isDark ? #282C37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px
+	box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 	> *:first-child
 		border-top none !important
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ b/src/client/app/desktop/views/pages/user/user.vue
@ -118,8 +118,7 @@ root(isDark)
 			margin-right 16px

 			> .timeline
-				border 1px solid rgba(#000, 0.075)
-				border-radius 6px
+				box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 		> .side
 			width 275px
@ -138,8 +137,7 @@ root(isDark)
 				font-size 12px
 				color #aaa
 				background isDark ? #21242f : #fff
-				border solid 1px rgba(#000, 0.075)
-				border-radius 6px
+				box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

 				a
 					color #999
--- a/src/client/app/desktop/views/widgets/profile.vue
+++ b/src/client/app/desktop/views/widgets/profile.vue
@ -1,7 +1,10 @@
 <template>
-<div class="mkw-profile"
+<div class="egwyvoaaryotefqhqtmiyawwefemjfsd">
+	<mk-widget-container :show-header="false" :naked="props.design == 2">
+		<div class="egwyvoaaryotefqhqtmiyawwefemjfsd-body"
 			:data-compact="props.design == 1 || props.design == 2"
 			:data-melt="props.design == 2"
+			:data-darkmode="$store.state.device.darkmode"
 		>
 			<div class="banner"
 				:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
@ -16,6 +19,8 @@
 			<router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link>
 			<p class="username">@{{ $store.state.i | acct }}</p>
 		</div>
+	</mk-widget-container>
+</div>
 </template>

 <script lang="ts">
@ -42,10 +47,6 @@ export default define({

 <style lang="stylus" scoped>
 root(isDark)
-	overflow hidden
-	background isDark ? #282c37 : #fff
-	border solid 1px rgba(#000, 0.075)
-	border-radius 6px

 	&[data-compact]
 		> .banner:before
@ -75,9 +76,6 @@ root(isDark)
 			display none

 	&[data-melt]
-		background transparent !important
-		border none !important
-
 		> .banner
 			visibility hidden

@ -120,10 +118,10 @@ root(isDark)
 		font-size 0.9em
 		color isDark ? #606984 : #999

-.mkw-profile[data-darkmode]
+.egwyvoaaryotefqhqtmiyawwefemjfsd-body[data-darkmode]
 	root(true)

-.mkw-profile:not([data-darkmode])
+.egwyvoaaryotefqhqtmiyawwefemjfsd-body:not([data-darkmode])
 	root(false)

 </style>