[DDW-269] Styling adjustments

input-output-hk · Sep 22, 2020 · cd7fa15 · cd7fa15
1 parent b06c090
commit cd7fa15
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/source/renderer/app/components/appUpdate/AppUpdateOverlay.js b/source/renderer/app/components/appUpdate/AppUpdateOverlay.js
@@ -204,8 +204,16 @@ export default class AppUpdateOverlay extends Component<Props, State> {
       : messages.buttonLaunchInstallerLabel;
     const postponeLinkStyles = classnames([
       styles.postponeLink,
-      isWaitingToQuitDaedalus ? styles.disabled : null,
+      !isLinux && isWaitingToQuitDaedalus ? styles.disabled : null,
+      isLinux && isWaitingToQuitDaedalus ? styles.noLink : null,
     ]);
+    const postponeLabel =
+      isLinux && isWaitingToQuitDaedalus
+        ? messages.installingUpdateLabel
+        : messages.postponeInstallLinkLabel;
+    const postponeAction = !isWaitingToQuitDaedalus
+      ? onPostponeUpdate
+      : () => {};
     return (
       <div className={styles.actions}>
         <Checkbox
@@ -225,17 +233,13 @@ export default class AppUpdateOverlay extends Component<Props, State> {
           label={intl.formatMessage(buttonLabel)}
           disabled={isButtonDisabled}
         />
-        {isLinux && isWaitingToQuitDaedalus ? (
-          intl.formatMessage(messages.installingUpdateLabel)
-        ) : (
-          <Link
-            className={postponeLinkStyles}
-            onClick={!isWaitingToQuitDaedalus ? onPostponeUpdate : () => {}}
-            label={intl.formatMessage(messages.postponeInstallLinkLabel)}
-            skin={LinkSkin}
-            hasIconAfter={false}
-          />
-        )}
+        <Link
+          className={postponeLinkStyles}
+          onClick={postponeAction}
+          label={intl.formatMessage(postponeLabel)}
+          skin={LinkSkin}
+          hasIconAfter={false}
+        />
       </div>
     );
   };

diff --git a/source/renderer/app/components/appUpdate/AppUpdateOverlay.scss b/source/renderer/app/components/appUpdate/AppUpdateOverlay.scss
@@ -18,7 +18,7 @@
     background-color: var(--theme-news-overlay-update-content-background-color);
     font-size: 16px;
     line-height: 1.2;
-    margin-bottom: 30px;
+    margin-bottom: 20px;
     max-height: 464px;
     opacity: 0.8;
     overflow-y: scroll;
@@ -198,7 +198,11 @@
       color: var(--theme-app-update-overlay-text-color);
       &.disabled {
         border-bottom-color: transparent;
+        cursor: default;
         opacity: 0.4;
+      }
+      &.noLink {
+        border-bottom-color: transparent;
         cursor: default;
       }
     }
@@ -216,7 +220,7 @@
     font-family: var(--font-medium);
     line-height: 1.38;
     margin-bottom: 30px;
-    margin-top: -10px;
+    // margin-top: -10px;
     text-align: center;
   }