diff --git a/assets/styles/framework/animations.less b/assets/styles/framework/animations.less index 4fd6442f85..23f62a1128 100644 --- a/assets/styles/framework/animations.less +++ b/assets/styles/framework/animations.less @@ -192,3 +192,30 @@ 20px 0px 0px 0px rgba(255, 255, 255, 1); } } + +@-webkit-keyframes fadeinout { + 0%, + 100% { + opacity: 0; + } + 50% { + opacity: 1; + } +} + +@keyframes fadeinout { + 0%, + 100% { + opacity: 0; + } + 50% { + opacity: 1; + } +} + +.transition(@property, @duration, @function) { + transition: @property @duration @function; + -o-transition: @property @duration @function; + -moz-transition: @property @duration @function; + -webkit-transition: @property @duration @function; +} diff --git a/components/views/settings/pages/profile/Profile.html b/components/views/settings/pages/profile/Profile.html index 3ed4b2154a..54dbe45127 100644 --- a/components/views/settings/pages/profile/Profile.html +++ b/components/views/settings/pages/profile/Profile.html @@ -105,12 +105,9 @@ :text="$t('pages.settings.profile.about.subtitle')" />
- +
@@ -158,21 +155,11 @@ :text="$t('pages.settings.profile.accounts.subtitle_accounts')" /> - - - + + - - diff --git a/components/views/settings/pages/profile/Profile.less b/components/views/settings/pages/profile/Profile.less index 0765973d06..0ef3903c73 100644 --- a/components/views/settings/pages/profile/Profile.less +++ b/components/views/settings/pages/profile/Profile.less @@ -29,7 +29,7 @@ .profile-section { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr; + grid-template-columns: auto 1fr 1fr 1fr; grid-template-rows: 1fr 1fr 1fr; gap: 0px 0px; grid-template-areas: @@ -40,17 +40,11 @@ .photo { align-self: center; - grid-area: photo; - } - - .username { - align-self: center; - grid-area: username; + margin: 0 @normal-spacing @xlight-spacing 0; } .status-input { align-self: center; - grid-area: status-input; } .profile-photo-column { @@ -138,6 +132,7 @@ } .username { + align-self: center; grid-area: username; } @@ -192,12 +187,12 @@ } } - .about-button { + .edit-button { font-style: italic; white-space: nowrap; + color: @text-muted; &:hover { - cursor: pointer; opacity: 0.8; } } diff --git a/components/views/settings/profile/Banner.vue b/components/views/settings/profile/Banner.vue index 9a15627231..7489de6454 100644 --- a/components/views/settings/profile/Banner.vue +++ b/components/views/settings/profile/Banner.vue @@ -1,7 +1,7 @@