phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-14093] Rename 'team' to 'server' and 'tab' to 'view' in most cases, some additional cleanup (#2711)

Browse Source 
* Rename MattermostTeam -> UniqueServer, MattermostTab -> UniqueView

* Rename 'team' to 'server'

* Some further cleanup

* Rename weirdly named function

* Rename 'tab' to 'view' in most instances

* Fix i18n

* PR feedback
This commit is contained in:
Devin Binnie
2023-05-08 09:17:01 -04:00
committed by GitHub
parent 9f75ddcf0f
commit 316beba950
110 changed files with 1698 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/css/components/AddServerModal.css
View File

@@ -5,7 +5,7 @@ body {
min-height: 100%;
}
.NewTeamModal-noBottomSpace {
.NewServerModal-noBottomSpace {
padding-bottom: 0px;
margin-bottom: 0px;
}

2
src/renderer/css/components/NewTeamModal.css → src/renderer/css/components/NewServerModal.css
View File

@@ -1,4 +1,4 @@
.NewTeamModal-noBottomSpace {
.NewServerModal-noBottomSpace {
padding-bottom: 0px;
margin-bottom: 0px;
}

24
src/renderer/css/components/TeamDropdownButton.scss → src/renderer/css/components/ServerDropdownButton.scss
View File

@@ -1,4 +1,4 @@
.TeamDropdownButton {
.ServerDropdownButton {
background-color: transparent;
border-width: 0 1px;
border-color: rgba(61, 60, 64, 0.08);
@@ -17,7 +17,7 @@
&:not(.disabled):hover {
background-color: #f4f4f4;
.TeamDropdownButton__badge-count, .TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-count, .ServerDropdownButton__badge-unreads {
border-color: #f4f4f4;
}
}
@@ -25,7 +25,7 @@
&:not(.disabled):focus, &.isMenuOpen {
background-color: #fff;
.TeamDropdownButton__badge-count, .TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-count, .ServerDropdownButton__badge-unreads {
border-color: #fff;
}
}
@@ -49,11 +49,11 @@
}
}
.TeamDropdownButton__badge {
.ServerDropdownButton__badge {
position: relative;
}
.TeamDropdownButton__badge-count {
.ServerDropdownButton__badge-count {
background: #F74343;
border-radius: 8px;
display: flex;
@@ -77,7 +77,7 @@
box-sizing: unset;
}
.TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-unreads {
background: #579eff;
border-radius: 100px;
width: 12px;
@@ -88,13 +88,13 @@
border: 2px solid #efefef;
}
.TeamDropdownButton.darkMode {
.ServerDropdownButton.darkMode {
border-color: rgba(221, 221, 221, 0.08);
&:hover {
background-color: #292929;
.TeamDropdownButton__badge-count, .TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-count, .ServerDropdownButton__badge-unreads {
border-color: #292929;
}
}
@@ -102,7 +102,7 @@
&:focus, &.isMenuOpen {
background-color: #1f1f1f;
.TeamDropdownButton__badge-count, .TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-count, .ServerDropdownButton__badge-unreads {
border-color: #1f1f1f;
}
}
@@ -115,15 +115,15 @@
color: rgba(221, 221, 221, 0.56);
}
.TeamDropdownButton__badge-count {
.ServerDropdownButton__badge-count {
border-color: #2e2e2e;
}
.TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-unreads {
border-color: #2e2e2e;
}
.TeamDropdownButton__badge-unreads {
.ServerDropdownButton__badge-unreads {
background: #196CAF;
}
}

28
src/renderer/css/components/TabBar.css
View File

@@ -14,7 +14,7 @@
-webkit-app-region: no-drag;
}
.TabBar .teamTabItem span {
.TabBar .serverTabItem span {
flex: 0 1 auto;
overflow: hidden;
text-overflow: ellipsis;
@@ -64,7 +64,7 @@
text-decoration: none;
}
.TabBar>li.teamTabItem>a>div.TabBar-tabSeperator>.teamTabItem__close {
.TabBar>li.serverTabItem>a>div.TabBar-tabSeperator>.serverTabItem__close {
background: none;
border: none;
color: rgba(61,60,64,0.32);
@@ -72,19 +72,19 @@
padding: 0;
}
.TabBar>li.teamTabItem>a>div.TabBar-tabSeperator>.teamTabItem__close:hover {
.TabBar>li.serverTabItem>a>div.TabBar-tabSeperator>.serverTabItem__close:hover {
color: #3d3c40;
}
.TabBar.darkMode>li.teamTabItem>a>div.TabBar-tabSeperator>.teamTabItem__close:hover {
.TabBar.darkMode>li.serverTabItem>a>div.TabBar-tabSeperator>.serverTabItem__close:hover {
color: #ddd;
}
.TabBar>li.teamTabItem>a>div.TabBar-tabSeperator>.teamTabItem__close>i::before {
.TabBar>li.serverTabItem>a>div.TabBar-tabSeperator>.serverTabItem__close>i::before {
margin: 0;
}
.TabBar.darkMode>li.teamTabItem>a>div.TabBar-tabSeperator>.teamTabItem__close {
.TabBar.darkMode>li.serverTabItem>a>div.TabBar-tabSeperator>.serverTabItem__close {
color: rgba(221,221,221,0.32);
}
@@ -99,39 +99,39 @@
align-items: center;
}
.TabBar>li.teamTabItem.active>a, .TabBar>li.teamTabItem.dragging>a {
.TabBar>li.serverTabItem.active>a, .TabBar>li.serverTabItem.dragging>a {
border: none;
background-color: #fff;
color: #3d3c40;
z-index: 9;
}
.TabBar.darkMode>li.teamTabItem.active>a, .TabBar.darkMode>li.teamTabItem.dragging>a {
.TabBar.darkMode>li.serverTabItem.active>a, .TabBar.darkMode>li.serverTabItem.dragging>a {
background-color: #1f1f1f;
color: #ddd;
}
.TabBar>li.teamTabItem:not(.active)+li.teamTabItem:not(.active)>a>div.TabBar-tabSeperator {
.TabBar>li.serverTabItem:not(.active)+li.serverTabItem:not(.active)>a>div.TabBar-tabSeperator {
border-left: 1px solid rgba(61,60,64,0.08);
margin-left: -1px;
}
.TabBar.darkMode>li.teamTabItem:not(.active)+li.teamTabItem:not(.active)>a>div.TabBar-tabSeperator {
.TabBar.darkMode>li.serverTabItem:not(.active)+li.serverTabItem:not(.active)>a>div.TabBar-tabSeperator {
border-left: 1px solid rgba(221,221,221,0.08);
margin-left: -1px;
}
.TabBar>li.teamTabItem:not(.active):not(.disabled):hover+.TabBar-addServerButton>a>div.TabBar-tabSeperator {
.TabBar>li.serverTabItem:not(.active):not(.disabled):hover+.TabBar-addServerButton>a>div.TabBar-tabSeperator {
border-left: none;
margin-left: 0px;
}
.TabBar>li.teamTabItem:not(.active):not(.disabled):hover+li.teamTabItem:not(.active)>a>div.TabBar-tabSeperator {
.TabBar>li.serverTabItem:not(.active):not(.disabled):hover+li.serverTabItem:not(.active)>a>div.TabBar-tabSeperator {
border-left: none;
margin-left: 0px;
}
.TabBar>li.teamTabItem:not(.active):not(.disabled)+li.teamTabItem:not(.active)>a:hover>div.TabBar-tabSeperator {
.TabBar>li.serverTabItem:not(.active):not(.disabled)+li.serverTabItem:not(.active)>a:hover>div.TabBar-tabSeperator {
border-left: none;
margin-left: 0px;
}
@@ -194,6 +194,6 @@
border-radius: 50%;
}
.TabBar .teamTabItem-unread {
.TabBar .serverTabItem-unread {
font-weight: bold;
}

2
src/renderer/css/components/index.css
View File

@@ -2,7 +2,7 @@
@import url("HoveringURL.css");
@import url("MainPage.css");
@import url("MattermostView.css");
@import url("NewTeamModal.css");
@import url("NewServerModal.css");
@import url("PermissionRequestDialog.css");
@import url("TabBar.css");
@import url("UpdaterPage.css");

70
src/renderer/css/dropdown.scss
View File

@@ -14,7 +14,7 @@ body {
max-width: 600px;
}
.TeamDropdown {
.ServerDropdown {
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -26,7 +26,7 @@ body {
min-width: 180px;
}
.TeamDropdown__droppable {
.ServerDropdown__droppable {
width: 100%;
overflow-y: scroll;
@@ -40,21 +40,21 @@ body {
}
}
.TeamDropdown__header {
.ServerDropdown__header {
padding: 6px 20px;
display: flex;
align-items: center;
width: -webkit-fill-available;
user-select: none;
.TeamDropdown__servers {
.ServerDropdown__servers {
font-weight: 600;
font-size: 14px;
line-height: 20px;
color: #3D3C40;
}
.TeamDropdown__keyboardShortcut {
.ServerDropdown__keyboardShortcut {
font-weight: 400;
font-size: 12px;
line-height: 16px;
@@ -63,14 +63,14 @@ body {
}
}
.TeamDropdown__divider {
.ServerDropdown__divider {
border-top: 1px solid rgba(61, 60, 64, 0.08);
border-bottom: 0;
width: 100%;
margin: 8px 0;
}
.TeamDropdown__button {
.ServerDropdown__button {
background-color: transparent;
border: none;
padding: 8px 18px 8px 7px;
@@ -83,12 +83,12 @@ body {
&:not(.anyDragging):hover {
background-color: rgba(61, 60, 64, 0.08);
.TeamDropdown__button-edit, .TeamDropdown__button-remove {
.ServerDropdown__button-edit, .ServerDropdown__button-remove {
opacity: 1;
pointer-events: all;
}
.TeamDropdown__draggable-handle > i.icon-drag-vertical {
.ServerDropdown__draggable-handle > i.icon-drag-vertical {
opacity: 1;
}
}
@@ -97,17 +97,17 @@ body {
background-color: rgba(22, 109, 224, 0.08);
outline: none;
.TeamDropdown__button-edit, .TeamDropdown__button-remove {
.ServerDropdown__button-edit, .ServerDropdown__button-remove {
opacity: 1;
pointer-events: all;
}
.TeamDropdown__draggable-handle > i.icon-drag-vertical {
.ServerDropdown__draggable-handle > i.icon-drag-vertical {
opacity: 1;
}
}
&.dragging .TeamDropdown__draggable-handle {
&.dragging .ServerDropdown__draggable-handle {
opacity: 1;
pointer-events: all;
}
@@ -126,7 +126,7 @@ body {
color: #166de0;
}
> .TeamDropdown__draggable-handle > span, &.addServer > span {
> .ServerDropdown__draggable-handle > span, &.addServer > span {
font-size: 14px;
line-height: 20px;
color: #3D3C40;
@@ -147,7 +147,7 @@ body {
}
}
.TeamDropdown__draggable-handle {
.ServerDropdown__draggable-handle {
cursor: pointer !important;
display: flex;
overflow: hidden;
@@ -174,7 +174,7 @@ body {
}
}
.TeamDropdown__badge {
.ServerDropdown__badge {
display: flex;
justify-content: center;
align-items: center;
@@ -182,7 +182,7 @@ body {
min-width: 32px;
}
.TeamDropdown__badge-dot {
.ServerDropdown__badge-dot {
background: #579EFF;
height: 8px;
width: 8px;
@@ -190,7 +190,7 @@ body {
flex: 0 0 8px;
}
.TeamDropdown__badge-count {
.ServerDropdown__badge-count {
background: #F74343;
text-align: center;
border-radius: 8px;
@@ -211,7 +211,7 @@ body {
}
}
.TeamDropdown__indicators {
.ServerDropdown__indicators {
margin-left: auto;
display: flex;
@@ -229,7 +229,7 @@ body {
outline: none;
}
&.TeamDropdown__button-remove:hover, &.TeamDropdown__button-remove:focus {
&.ServerDropdown__button-remove:hover, &.ServerDropdown__button-remove:focus {
background: rgba(247, 67, 67, 0.16);
box-shadow: 0px 0px 0px 4px rgba(247, 67, 67, 0.16);
}
@@ -240,7 +240,7 @@ body {
}
}
.TeamDropdown__button-edit, .TeamDropdown__button-remove {
.ServerDropdown__button-edit, .ServerDropdown__button-remove {
opacity: 0;
pointer-events: none;
@@ -250,10 +250,10 @@ body {
}
}
.TeamDropdown__button-remove {
.ServerDropdown__button-remove {
margin-right: 7px;
+ .TeamDropdown__badge {
+ .ServerDropdown__badge {
margin-left: 3px;
}
@@ -262,22 +262,22 @@ body {
}
}
.TeamDropdown.darkMode {
.ServerDropdown.darkMode {
background: #1f1f1f;
.TeamDropdown__header > span {
.ServerDropdown__header > span {
color: #DDD;
&.TeamDropdown__keyboardShortcut {
&.ServerDropdown__keyboardShortcut {
color: rgba(221, 221, 221, 0.56);
}
}
.TeamDropdown__divider {
.ServerDropdown__divider {
border-color: rgba(221, 221, 221, 0.08);
}
.TeamDropdown__button {
.ServerDropdown__button {
&:not(.anyDragging):hover {
background-color: rgba(221, 221, 221, 0.08);
}
@@ -290,37 +290,37 @@ body {
color: rgba(221, 221, 221, 0.56);
}
> .TeamDropdown__draggable-handle > span, &.addServer > span {
> .ServerDropdown__draggable-handle > span, &.addServer > span {
color: #DDD;
}
.TeamDropdown__button-remove i {
.ServerDropdown__button-remove i {
color: #F74343;
}
.TeamDropdown__button-edit:hover, .TeamDropdown__button-edit:focus {
.ServerDropdown__button-edit:hover, .ServerDropdown__button-edit:focus {
background: rgba(221, 223, 228, 0.08);
box-shadow: 0px 0px 0px 4px rgba(221, 223, 228, 0.08);
}
}
.TeamDropdown__badge-expired i {
.ServerDropdown__badge-expired i {
color: rgba(221, 221, 221, 0.56);
}
.TeamDropdown__button-edit > i {
.ServerDropdown__button-edit > i {
color: rgba(221, 221, 221, 0.56);
}
.TeamDropdown__draggable-handle > i.icon-drag-vertical::before {
.ServerDropdown__draggable-handle > i.icon-drag-vertical::before {
color:rgba(221, 221, 221, 0.32);
}
.TeamDropdown__badge-count i {
.ServerDropdown__badge-count i {
color: #e81023;
}
.TeamDropdown__badge-dot {
.ServerDropdown__badge-dot {
background: #196CAF;
}
}

2
src/renderer/css/lazy/settings-dark.lazy.css
View File

@@ -1,6 +1,6 @@
@import '~bootstrap-dark/src/bootstrap-dark.css';
.TeamListItem:hover {
.ServerListItem:hover {
background: #242a30;
}