diff --git a/src/renderer/components/showCertificateModal.tsx b/src/renderer/components/showCertificateModal.tsx
index 19b0361f..8ef80143 100644
--- a/src/renderer/components/showCertificateModal.tsx
+++ b/src/renderer/components/showCertificateModal.tsx
@@ -105,6 +105,7 @@ export default class ShowCertificateModal extends React.PureComponent
diff --git a/src/renderer/css/components/AddServerModal.css b/src/renderer/css/components/AddServerModal.css
index 42ec2a13..ddd269a6 100644
--- a/src/renderer/css/components/AddServerModal.css
+++ b/src/renderer/css/components/AddServerModal.css
@@ -72,7 +72,7 @@ label {
outline: 0;
}
-.help-block {
+.form-text {
display: block;
margin-top: 5px;
margin-bottom: 10px;
@@ -173,7 +173,7 @@ button.default:focus {
color: #a94442;
}
-.has-error .form-control {
+:invalid .form-control {
border-color: #a94442;
}
diff --git a/src/renderer/css/components/ExtraBar.css b/src/renderer/css/components/ExtraBar.css
index 43e497a4..bd73ba3b 100644
--- a/src/renderer/css/components/ExtraBar.css
+++ b/src/renderer/css/components/ExtraBar.css
@@ -10,7 +10,7 @@
}
#extra-bar.hidden {
- max-height: 0px;
+ display: none;
}
span.backLabel {
@@ -25,9 +25,8 @@ span.backLabel {
span.backIcon {
margin-right: 4px;
- font-size: 1.6rem;
}
.container-fluid button:first-child {
padding-left: 0px;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/css/components/TabBar.css b/src/renderer/css/components/TabBar.css
index c6590eff..46b4f364 100644
--- a/src/renderer/css/components/TabBar.css
+++ b/src/renderer/css/components/TabBar.css
@@ -26,6 +26,7 @@
-webkit-user-select: none;
min-width: 48px;
max-width: 224px;
+ position: relative;
}
.TabBar>li>a {
@@ -41,6 +42,7 @@
font-size: 14px;
letter-spacing: -0.2px;
transition: 0.3s;
+ border: none !important;
}
.TabBar.darkMode>li>a {
@@ -80,7 +82,7 @@
flex: 0 0 6px;
}
-.TabBar>li.teamTabItem.active:before, .TabBar>li.teamTabItem.smooth-dnd-ghost:before {
+.TabBar>li.teamTabItem.active:before, .TabBar>li.teamTabItem.dragging:before {
left: -4px;
border-bottom-right-radius: 6px;
border-right: 2px solid #fff;
@@ -88,12 +90,12 @@
z-index: 9;
}
-.TabBar.darkMode>li.teamTabItem.active:before, .TabBar.darkMode>li.teamTabItem.smooth-dnd-ghost:before {
+.TabBar.darkMode>li.teamTabItem.active:before, .TabBar.darkMode>li.teamTabItem.dragging:before {
border-right: 2px solid #323639;
border-bottom: 2px solid #323639;
}
-.TabBar>li.teamTabItem.active:after, .TabBar>li.teamTabItem.smooth-dnd-ghost:after {
+.TabBar>li.teamTabItem.active:after, .TabBar>li.teamTabItem.dragging:after {
border-bottom-left-radius: 6px;
right: -5px;
border-left: 2px solid #fff;
@@ -101,7 +103,7 @@
z-index: 9;
}
-.TabBar.darkMode>li.teamTabItem.active:after, .TabBar.darkMode>li.teamTabItem.smooth-dnd-ghost:after {
+.TabBar.darkMode>li.teamTabItem.active:after, .TabBar.darkMode>li.teamTabItem.dragging:after {
border-left: 2px solid #323639;
border-bottom: 2px solid #323639;
}
@@ -113,8 +115,6 @@
}
.TabBar>li.TabBar-addServerButton{
- transition: none !important;
- transform: none !important;
flex: 0 0 auto;
min-width: 40px;
}
@@ -124,6 +124,10 @@
transition: opacity 0.3s ease-in;
}
+.TabBar>li.TabBar-addServerButton>a.active{
+ background-color: transparent;
+}
+
.TabBar>li.TabBar-addServerButton svg{
margin: -2px;
}
@@ -132,7 +136,7 @@
color: rgba(243,243,243,0.7);
}
-.TabBar>li.teamTabItem.active>a, .TabBar>li.teamTabItem.smooth-dnd-ghost>a {
+.TabBar>li.teamTabItem.active>a, .TabBar>li.teamTabItem.dragging>a {
border: none;
border-radius: 6px 6px 0 0;
color: rgba(61,60,64,1);
@@ -140,11 +144,7 @@
z-index: 9;
}
-.smooth-dnd-no-user-select li.TabBar-addServerButton>a {
- opacity: 0;
-}
-
-.TabBar.darkMode>li.teamTabItem.active>a, .TabBar.darkMode>li.teamTabItem.smooth-dnd-ghost>a {
+.TabBar.darkMode>li.teamTabItem.active>a, .TabBar.darkMode>li.teamTabItem.dragging>a {
color: #f3f3f3;
background-color: #323639;
}
diff --git a/src/renderer/css/components/TeamListItem.css b/src/renderer/css/components/TeamListItem.css
index 2a61a250..d2516ca6 100644
--- a/src/renderer/css/components/TeamListItem.css
+++ b/src/renderer/css/components/TeamListItem.css
@@ -1,8 +1,21 @@
+.TeamListItem {
+ display: flex;
+}
+
.TeamListItem:hover {
background: #eee;
}
.TeamListItem-left {
- display: inline-block;
- width: calc(100% - 100px);
+ flex-grow: 1;
}
+
+.TeamListItem p {
+ overflow-wrap: break-word;
+ margin-bottom: 0;
+}
+
+.TeamListItem h4 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+};
diff --git a/src/renderer/css/index.css b/src/renderer/css/index.css
index 93d14f76..08a2d9ea 100644
--- a/src/renderer/css/index.css
+++ b/src/renderer/css/index.css
@@ -45,6 +45,7 @@
html {
height: 100%;
+ font-size: 14px;
}
body {
min-height: 100%;
@@ -68,8 +69,8 @@ body {
transition: opacity 500ms ease-in-out;
}
-.has-error .control-label,
-.has-error .help-block {
+:invalid .col-form-label,
+:invalid .form-text {
color: #333;
}
@@ -86,6 +87,7 @@ body {
overflow: hidden;
height: 36px;
background-color: rgba(0,0,0,0.1);
+ width: 100%;
}
.topBar>.topBar-bg.unfocused {
@@ -249,4 +251,4 @@ body {
.topBar.darkMode .overlay-gradient {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, #202124 100%);
-}
\ No newline at end of file
+}
diff --git a/src/renderer/css/modals.css b/src/renderer/css/modals.css
index 67843393..bbb7a301 100644
--- a/src/renderer/css/modals.css
+++ b/src/renderer/css/modals.css
@@ -1,3 +1,8 @@
body {
background-color: transparent;
}
+
+.btn-primary {
+ background-color: #166de0;
+ border-color: #166de0;
+}
diff --git a/src/renderer/css/settings.css b/src/renderer/css/settings.css
index 06bfb3c5..1d57cbf3 100644
--- a/src/renderer/css/settings.css
+++ b/src/renderer/css/settings.css
@@ -17,15 +17,6 @@
transition: opacity 1s cubic-bezier(0.19, 1, 0.22, 1);
}
-.TeamListItem p {
- overflow-wrap: break-word;
-}
-
-.TeamListItem h4 {
- overflow: hidden;
- text-overflow: ellipsis;
-};
-
.checkbox > label {
width: 100%;
}
@@ -39,3 +30,8 @@ body {
#content {
height: 100%;
}
+
+.btn-primary {
+ background-color: #166de0;
+ border-color: #166de0;
+}
diff --git a/src/renderer/index.tsx b/src/renderer/index.tsx
index 6ff8d252..1bbb0957 100644
--- a/src/renderer/index.tsx
+++ b/src/renderer/index.tsx
@@ -46,7 +46,7 @@ class Root extends React.PureComponent, State> {
this.setState({config});
}
- moveTabs = async (originalOrder: number, newOrder: number): Promise => {
+ moveTabs = (originalOrder: number, newOrder: number): number | undefined => {
if (!this.state.config) {
throw new Error('No config');
}
@@ -61,20 +61,27 @@ class Root extends React.PureComponent, State> {
const team = tabOrder.splice(originalOrder, 1);
tabOrder.splice(newOrder, 0, team[0]);
- let teamIndex;
+ let teamIndex: number | undefined;
tabOrder.forEach((t, order) => {
if (order === newOrder) {
teamIndex = t.index;
}
teams[t.index].order = order;
});
- await this.teamConfigChange(teams);
+ this.setState({
+ config: {
+ ...this.state.config,
+ teams,
+ },
+ });
+ this.teamConfigChange(teams);
return teamIndex;
};
teamConfigChange = async (updatedTeams: Team[]) => {
- await window.ipcRenderer.invoke(UPDATE_TEAMS, updatedTeams);
- await this.reloadConfig();
+ window.ipcRenderer.invoke(UPDATE_TEAMS, updatedTeams).then(() => {
+ this.reloadConfig();
+ });
};
reloadConfig = async () => {
diff --git a/src/renderer/modals/certificate/certificateModal.tsx b/src/renderer/modals/certificate/certificateModal.tsx
index 3283796e..bd4a2674 100644
--- a/src/renderer/modals/certificate/certificateModal.tsx
+++ b/src/renderer/modals/certificate/certificateModal.tsx
@@ -164,6 +164,7 @@ export default class SelectCertificateModal extends React.PureComponent