Merge pull request #1049 from aeternity/feature/release-quickfixes

Minor design adjustments
aeternity · Apr 12, 2021 · af4bf76 · af4bf76
2 parents 62eda9e + 526d814
commit af4bf76
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 35 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -165,22 +165,19 @@ export default {
         display: none;
       }
 
-      .left-section,
-      .right-section {
-        padding-top: 1rem;
-      }
-
       .left-section {
         width: 9.2rem;
         margin-right: 15px;
+        padding-top: 1rem;
 
         @media (min-width: 1440px) {
           margin-right: calc(15px + 1rem); // TODO: Replace with a rem value
         }
       }
 
       .right-section {
-        width: 17.5rem;
+        padding-top: 8px;
+        width: 360px;
         margin-left: calc(15px + 0.8rem); // TODO: Replace with a rem value
       }
     }

diff --git a/src/components/layout/FooterSection.vue b/src/components/layout/FooterSection.vue
@@ -107,7 +107,7 @@ export default {
     }
 
     .footer-btns {
-      margin-bottom: 0.85rem;
+      margin-bottom: 8px;
     }
 
     .venture {
@@ -130,7 +130,7 @@ export default {
     }
 
     .terms-links {
-      margin-top: 0.85rem;
+      margin-top: 8px;
     }
 
     .gh-link {
@@ -173,6 +173,10 @@ export default {
     }
   }
 
+  p {
+    margin-bottom: 8px;
+  }
+
   @media (max-width: 1024px) {
     .footer .login-footer {
       display: block;

diff --git a/src/components/layout/Navigation.vue b/src/components/layout/Navigation.vue
@@ -18,6 +18,13 @@
       <IconTips />
       {{ $t('components.layout.Navigation.feed') }}
     </RouterLink>
+    <RouterLink
+      v-if="isLoggedIn"
+      :to="{ name: 'user-profile', params: { address } }"
+    >
+      <IconUser />
+      {{ $t('components.layout.Navigation.MyProfile') }}
+    </RouterLink>
     <RouterLink
       v-if="showWordBazaar"
       :to="{ name: 'word-bazaar-assets' }"
@@ -33,13 +40,6 @@
       <IconMeet />
       {{ $t('Networking.MenuLink') }}
     </RouterLink>
-    <RouterLink
-      v-if="isLoggedIn"
-      :to="{ name: 'user-profile', params: { address } }"
-    >
-      <IconUser />
-      {{ $t('components.layout.Navigation.MyProfile') }}
-    </RouterLink>
     <RouterLink :to="{ name: 'league' }">
       <IconDiamond />
       {{ $t('components.layout.Navigation.League') }}

diff --git a/src/components/layout/RightSectionTitle.vue b/src/components/layout/RightSectionTitle.vue
@@ -28,7 +28,7 @@ export default {
 .right-section-title {
   color: $standard_font_color;
   font-weight: 600;
-  padding-bottom: 0.65rem;
+  padding-bottom: 8px;
   display: flex;
   justify-content: space-between;
 
@@ -39,9 +39,10 @@ export default {
 
   .button-plain {
     color: $light_font_color;
+    transition: color 0.3s;
 
     &:hover {
-      color: $lighter_font_color;
+      color: $primary_color;
     }
 
     svg {

diff --git a/src/components/layout/RightSectionTopics.vue b/src/components/layout/RightSectionTopics.vue
@@ -43,7 +43,7 @@ export default {
 
 <style lang="scss" scoped>
 .right-section-topics {
-  padding: 0.8rem 1rem;
+  padding: 8px 16px;
 
   &.closed {
     .right-section-title {
@@ -67,8 +67,8 @@ export default {
       display: none;
     }
 
-    @media (max-height: 800px) {
-      max-height: 10rem;
+    @media (max-height: 900px) {
+      max-height: 160px;
     }
 
     .not-bootstrap-row {

diff --git a/src/components/layout/RightSectionWallet.vue b/src/components/layout/RightSectionWallet.vue
@@ -161,25 +161,25 @@ export default {
 
 <style lang="scss" scoped>
 .right-section-wallet {
-  padding: 0.8rem 1rem;
+  padding: 8px 16px;
 
   &.iframe {
     padding: 0;
 
     .right-section-title {
-      padding: 0.8rem 1rem;
+      padding: 8px 16px;
     }
   }
 
   iframe {
     display: block;
     border: none;
     width: 100%;
-    height: 470px;
+    height: 600px;
     transition: height 0.25s;
 
     &.half-closed {
-      height: 150px;
+      height: 190px;
     }
   }
 

diff --git a/src/components/layout/sendTip/SendPost.vue b/src/components/layout/sendTip/SendPost.vue
@@ -32,15 +32,17 @@
         <ButtonPlain @click="showGifs = !showGifs">
           <IconGif :class="{ active: showGifs }" />
         </ButtonPlain>
-        <ButtonPlain disabled>
-          <IconEmoji />
-        </ButtonPlain>
-        <ButtonPlain disabled>
-          <IconPoll />
-        </ButtonPlain>
-        <ButtonPlain disabled>
-          <IconThreeDots />
-        </ButtonPlain>
+        <template v-if="UNFINISHED_FEATURES">
+          <ButtonPlain disabled>
+            <IconEmoji />
+          </ButtonPlain>
+          <ButtonPlain disabled>
+            <IconPoll />
+          </ButtonPlain>
+          <ButtonPlain disabled>
+            <IconThreeDots />
+          </ButtonPlain>
+        </template>
       </div>
       <ButtonPlain
         class="btn btn-primary post-submit text-nowrap"
@@ -89,6 +91,7 @@ export default {
       sendingPost: false,
       uploadingMedia: false,
       showGifs: false,
+      UNFINISHED_FEATURES: process.env.UNFINISHED_FEATURES,
     };
   },
   computed: mapState(['address', 'balance']),

diff --git a/src/components/tipRecords/TipRecord.vue b/src/components/tipRecords/TipRecord.vue
@@ -64,7 +64,10 @@
             <IconComments />
             <span>{{ tip.commentCount }}</span>
           </ButtonPlain>
-          <ButtonPlain class="action">
+          <ButtonPlain
+            v-if="UNFINISHED_FEATURES"
+            class="action"
+          >
             <IconShare />
           </ButtonPlain>
         </div>
@@ -107,6 +110,9 @@ export default {
   props: {
     tip: { type: Object, required: true },
   },
+  data: () => ({
+    UNFINISHED_FEATURES: process.env.UNFINISHED_FEATURES,
+  }),
   computed: {
     ...mapState(['address']),
     ...mapState('aeternity', ['useSdkWallet']),

diff --git a/src/views/FeedList.vue b/src/views/FeedList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tips-list">
     <div class="actions">
-      <SendTip :post="feed === 'posts'" />
+      <SendTip :post="feed !== 'tips'" />
       <div class="feed-category-row">
         <FilterButton
           :class="{ active: feed === 'main' }"