Merge branch 'chore/electron-33' of github.com:meetfranz/franz into c…

…hore/electron-33
meetfranz · Dec 18, 2024 · e485a31 · e485a31
2 parents 85083f4 + 5b64b38
commit e485a31
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +3,6 @@ name: Build/release
 on: push
 
 env:
-  APPLE_ID: ${{ secrets.APPLEID }}
-  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
 
@@ -23,7 +21,6 @@ jobs:
               out/*.mac.zip.blockmap
               out/latest-mac.yml
             CSC_LINK: CSC_LINK_MAC
-            APPLE_TEAM_ID: TAC9P63ANZ
 
           - platform: ubuntu
             os: ubuntu-latest
@@ -41,6 +38,9 @@ jobs:
 
     env:
       CSC_LINK: ${{ secrets[matrix.CSC_LINK] }}
+      APPLE_TEAM_ID: ${{ matrix.platform == 'mac' && 'TAC9P63ANZ' || '' }}
+      APPLE_ID: ${{ secrets.APPLEID }}
+      APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
 
     steps:
       - name: Check out Git repository

diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
@@ -1,6 +1,6 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+import { Component } from 'react';
 import { defineMessages, intlShape } from 'react-intl';
 
 import Button from '../../ui/Button';
@@ -39,7 +39,7 @@ export default @observer class ServiceDisabled extends Component {
         <h1>{intl.formatMessage(messages.headline, { name })}</h1>
         <Button
           label={intl.formatMessage(messages.action, { name })}
-          buttonType="inverted"
+          buttonType="primary-inverted"
           onClick={() => enable()}
         />
       </div>

diff --git a/src/features/planSelection/index.js b/src/features/planSelection/index.js
@@ -26,6 +26,7 @@ export default function initPlanSelection(stores, actions) {
   reaction(
     () => features.features.isPlanSelectionEnabled,
     (isEnabled) => {
+      console.log('planSelection: isEnabled', isEnabled);
       if (isEnabled) {
         debug('Initializing `planSelection` feature');
         planSelectionStore.start(stores, actions);

diff --git a/src/models/ServiceBrowserView.ts b/src/models/ServiceBrowserView.ts
@@ -493,7 +493,7 @@ export class ServiceBrowserView {
       this.webContents.insertCSS(`
         body:before {
           background: transparent;
-          height: 30px;
+          height: 20px;
           width: 100%;
           position: absolute;
           content: " ";

diff --git a/src/styles/button.scss b/src/styles/button.scss
@@ -96,6 +96,19 @@
     }
   }
 
+  &.franz-form__button--primary-inverted {
+    background: none;
+    border: 2px solid white;
+    color: white;
+    padding: 10px 20px;
+    transition: background .5s, color .5s;
+
+    &:hover {
+      background: darken($theme-brand-primary, 5%);
+      color: #FFF;
+    }
+  }
+
   .loader {
     display: inline-block;
     height: 12px;

diff --git a/src/styles/layout.scss b/src/styles/layout.scss
@@ -77,7 +77,7 @@ body:not(.darwin):not(.isFullScreen) .app .app__content {
 .electron-app-title-bar { z-index: 99999999; }
 
 body.darwin .window-draggable {
-  height: 15px;
+  height: 20px;
   left: 0;
   pointer-events: none;
   position: absolute;

diff --git a/src/styles/services.scss b/src/styles/services.scss
@@ -3,14 +3,14 @@
 .theme__dark {
   .services {
     background: $dark-theme-gray-darkest;
-  
+
     .services__webview-wrapper { background: $dark-theme-gray-darkest; }
   }
 
   .services__no-service,
   .services__info-layer {
     background: $dark-theme-gray-darkest;
-  
+
     h1 { color: $dark-theme-gray-lightest; }
   }
 }
@@ -38,10 +38,10 @@
   text-align: center;
 
   h1 {
-    color: $theme-gray-dark;
+    color: white;
     margin: 25px 0 40px;
   }
 
   a.button,
   button { margin: 40px 0 20px; }
-}
+}