Skip to content

Commit c7b7760

Browse files
authored
Small UI tweaks (#467)
* Extend bottom border for mainview underneath window controls * Make sidebar button hover color an accent color * revert 87 to 88 * make mint less bright on light mode * revert modal border change
1 parent 5f6b671 commit c7b7760

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

public/themes/default.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/* global colors */
5252
--app-bg-color: black;
5353
--app-accent-color: rgb(88, 193, 66);
54-
--app-accent-bg-color: rgba(88, 193, 66, 0.2);
54+
--app-accent-bg-color: rgba(88, 193, 66, 0.25);
5555
--app-error-color: rgb(229, 77, 46);
5656
--app-warning-color: rgb(224, 185, 86);
5757
--app-success-color: rgb(78, 154, 6);
@@ -222,5 +222,5 @@
222222
--modal-bg-color: var(--app-bg-color);
223223
--modal-header-bottom-border-color: rgba(241, 246, 243, 0.15);
224224

225-
--logo-button-hover-bg-color: #1e1e1e;
225+
--logo-button-hover-bg-color: var(--app-accent-bg-color);
226226
}

public/themes/light.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/* tab color */
2525
--tab-white: rgb(0, 0, 0, 0.6);
26+
--tab-mint: rgb(70, 235, 156);
2627

2728
/* button colors */
2829
--button-text-color: rgb(50, 50, 50); /* Dark gray for light theme */
@@ -72,6 +73,4 @@
7273

7374
/* toggle colors */
7475
--toggle-thumb-color: var(--app-bg-color);
75-
76-
--logo-button-hover-bg-color: #f0f0f0;
7776
}

src/app/common/elements/mainview.less

+8-5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
display: none;
1010
}
1111

12+
.header-container {
13+
border-bottom: 1px solid var(--app-border-color);
14+
}
15+
1216
.header {
1317
-webkit-app-region: drag;
1418
display: flex;
@@ -18,7 +22,6 @@
1822
vertical-align: middle;
1923
padding: 0 10px 0 10px;
2024
margin: 0;
21-
border-bottom: 1px solid var(--app-border-color);
2225

2326
.title {
2427
font-size: var(--title-font-size);
@@ -42,10 +45,10 @@
4245

4346
// This ensures the tab bar does not collide with the floating logo. The floating logo sits above the sidebar when it is not collapsed, so no additional margin is needed in that case.
4447
// More margin is given on macOS to account for the traffic light buttons
45-
#main.platform-darwin.mainsidebar-collapsed .header {
46-
margin-left: var(--floating-logo-width-darwin);
48+
#main.platform-darwin.mainsidebar-collapsed .header-container {
49+
padding-left: var(--floating-logo-width-darwin);
4750
}
4851

49-
#main:not(.platform-darwin).mainsidebar-collapsed .header {
50-
margin-left: var(--floating-logo-width);
52+
#main:not(.platform-darwin).mainsidebar-collapsed .header-container {
53+
padding-left: var(--floating-logo-width);
5154
}

src/app/common/elements/mainview.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class MainView extends React.Component<{
2323
className={cn("mainview", this.props.className)}
2424
style={{ maxWidth: `calc(100vw - ${maxWidthSubtractor}px)` }}
2525
>
26-
<div className="header-container bottom-border">
26+
<div className="header-container">
2727
<header className="header">
2828
<div className="title text-primary">{this.props.title}</div>
2929
<div className="close-div hoverEffect" title="Close (Escape)" onClick={this.props.onClose}>

0 commit comments

Comments
 (0)