diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2022-06-24 16:51:38 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-24 11:21:38 +0000 |
commit | 0e68007e903d5f010542046813333b683dfcc62e (patch) | |
tree | 492d0f28a44712e82c2c7534773230206d305b32 /src | |
parent | Fix GH action workflow for publishing homebrew cask (diff) | |
download | ferdium-app-0e68007e903d5f010542046813333b683dfcc62e.tar.gz ferdium-app-0e68007e903d5f010542046813333b683dfcc62e.tar.zst ferdium-app-0e68007e903d5f010542046813333b683dfcc62e.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/components/services/tabs/TabItem.js | 11 | ||||
-rw-r--r-- | src/features/appearance/index.ts | 8 | ||||
-rw-r--r-- | src/styles/tabs.scss | 4 |
3 files changed, 7 insertions, 16 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index c2e7baddb..9df07456c 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -366,15 +366,10 @@ class TabItem extends Component { | |||
366 | : '' | 366 | : '' |
367 | }`} | 367 | }`} |
368 | > | 368 | > |
369 | {showServiceNameSetting ? ( | 369 | <img src={service.icon} className="tab-item__icon" alt="" /> |
370 | <div> | 370 | {showServiceNameSetting && ( |
371 | <img src={service.icon} className="tab-item__icon" alt="" /> | 371 | <span className="tab-item__label">{service.name}</span> |
372 | <span className="tab-item__label">{service.name}</span> | ||
373 | </div> | ||
374 | ) : ( | ||
375 | <img src={service.icon} className="tab-item__icon" alt="" /> | ||
376 | )} | 372 | )} |
377 | |||
378 | {notificationBadge} | 373 | {notificationBadge} |
379 | {errorBadge} | 374 | {errorBadge} |
380 | {IS_SERVICE_DEBUGGING_ENABLED && ( | 375 | {IS_SERVICE_DEBUGGING_ENABLED && ( |
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts index 42de5e4cc..17ae5937e 100644 --- a/src/features/appearance/index.ts +++ b/src/features/appearance/index.ts | |||
@@ -231,7 +231,8 @@ function generateServiceRibbonWidthStyle( | |||
231 | ${useGrayscaleServices ? graysacleServices : null}, | 231 | ${useGrayscaleServices ? graysacleServices : null}, |
232 | } | 232 | } |
233 | .tab-item .tab-item__label { | 233 | .tab-item .tab-item__label { |
234 | margin-left: 0px !important; | 234 | margin-left: 4px !important; |
235 | font-size: ${fontSize}px !important; | ||
235 | } | 236 | } |
236 | .tab-item.is-label-enabled { | 237 | .tab-item.is-label-enabled { |
237 | padding-bottom: 0px !important; | 238 | padding-bottom: 0px !important; |
@@ -251,10 +252,7 @@ function generateServiceRibbonWidthStyle( | |||
251 | .darwin .sidebar .sidebar__button--workspaces.is-active { | 252 | .darwin .sidebar .sidebar__button--workspaces.is-active { |
252 | height: ${width - sidebarSizeBias}px !important; | 253 | height: ${width - sidebarSizeBias}px !important; |
253 | } | 254 | } |
254 | .tab-item .tab-item__label{ | 255 | .tab-item div { |
255 | font-size: ${fontSize}px !important; | ||
256 | } | ||
257 | .tab-item div{ | ||
258 | overflow: hidden !important; | 256 | overflow: hidden !important; |
259 | } | 257 | } |
260 | ` | 258 | ` |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index b910b0760..ce843520a 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -34,6 +34,7 @@ | |||
34 | justify-content: center; | 34 | justify-content: center; |
35 | min-height: 50px; | 35 | min-height: 50px; |
36 | position: relative; | 36 | position: relative; |
37 | flex-wrap: wrap; | ||
37 | @media (prefers-reduced-motion: no-preference) { | 38 | @media (prefers-reduced-motion: no-preference) { |
38 | transition: background $theme-transition-time; | 39 | transition: background $theme-transition-time; |
39 | } | 40 | } |
@@ -51,9 +52,6 @@ | |||
51 | .tab-item__icon { | 52 | .tab-item__icon { |
52 | margin-left: -4px; | 53 | margin-left: -4px; |
53 | } | 54 | } |
54 | .tab-item__label { | ||
55 | margin-left: -4px; | ||
56 | } | ||
57 | } | 55 | } |
58 | 56 | ||
59 | &.is-label-enabled{ | 57 | &.is-label-enabled{ |