imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6604 from SimonBrandner/task/colors-2

Browse source 
Color de-duplication #2
This commit is contained in:
Travis Ralston 2021-08-24 12:37:18 -06:00 • committed by GitHub
commit 49453f2d49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
121 changed files with 343 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/structures/_ContextualMenu.scss
View file

@ -34,7 +34,7 @@ limitations under the License.
border-radius: 8px;
box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
background-color: $menu-bg-color;
color: $primary-fg-color;
color: $primary-content;
position: absolute;
font-size: $font-14px;
z-index: 5001;

2
res/css/structures/_CreateRoom.scss
View file

@ -18,7 +18,7 @@ limitations under the License.
width: 960px;
margin-left: auto;
margin-right: auto;
color: $primary-fg-color;
color: $primary-content;
}
.mx_CreateRoom input,

4
res/css/structures/_GroupFilterPanel.scss
View file

@ -92,13 +92,13 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
}
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
background-color: $primary-bg-color;
background-color: $background;
border-radius: 6px;
}
.mx_TagTile_selected_prototype {
.mx_TagTile_homeIcon::before {
background-color: $primary-fg-color; // dark-on-light
background-color: $primary-content; // dark-on-light
}
}

6
res/css/structures/_GroupView.scss
View file

@ -132,7 +132,7 @@ limitations under the License.
width: 100%;
height: 31px;
overflow: hidden;
color: $primary-fg-color;
color: $primary-content;
font-weight: bold;
font-size: $font-22px;
padding-left: 19px;
@ -397,7 +397,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
.mx_AccessibleButton_kind_link {
@ -422,7 +422,7 @@ limitations under the License.
mask-position: center;
mask-size: 8px;
mask-image: url('$(res)/img/image-view/close.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
}

4
res/css/structures/_LeftPanel.scss
View file

@ -146,7 +146,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
}
}
@ -169,7 +169,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
}
&.mx_LeftPanel_exploreButton_space::before {

2
res/css/structures/_LeftPanelWidget.scss
View file

@ -113,7 +113,7 @@ limitations under the License.
&:hover .mx_LeftPanelWidget_resizerHandle {
opacity: 0.8;
background-color: $primary-fg-color;
background-color: $primary-content;
}
.mx_LeftPanelWidget_maximizeButton {

2
res/css/structures/_MainSplit.scss
View file

@ -38,7 +38,7 @@ limitations under the License.
width: 4px !important;
border-radius: 4px !important;
background-color: $primary-fg-color;
background-color: $primary-content;
opacity: 0.8;
}
}

4
res/css/structures/_MatrixChat.scss
View file

@ -64,7 +64,7 @@ limitations under the License.
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
background-color: $primary-bg-color;
background-color: $background;
flex: 1 1 0;
min-width: 0;
@ -91,7 +91,7 @@ limitations under the License.
content: ' ';
background-color: $primary-fg-color;
background-color: $primary-content;
opacity: 0.8;
}
}

8
res/css/structures/_NotificationPanel.scss
View file

@ -49,7 +49,7 @@ limitations under the License.
bottom: 0;
left: 0;
right: 0;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
height: 1px;
opacity: 0.4;
content: '';
@ -70,7 +70,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile_roomName a {
color: $primary-fg-color;
color: $primary-content;
}
.mx_NotificationPanel .mx_EventTile_avatar {
@ -79,7 +79,7 @@ limitations under the License.
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
color: $primary-fg-color;
color: $primary-content;
font-size: $font-12px;
display: inline;
}
@ -118,7 +118,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile:hover .mx_EventTile_line {
background-color: $primary-bg-color;
background-color: $background;
}
.mx_NotificationPanel .mx_EventTile_content {

2
res/css/structures/_RightPanel.scss
View file

@ -43,7 +43,7 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
height: 100%;
display: flex;
background-color: $primary-bg-color;
background-color: $background;
padding: 0 9px;
align-items: center;
}

8
res/css/structures/_RoomDirectory.scss
View file

@ -28,7 +28,7 @@ limitations under the License.
.mx_RoomDirectory {
margin-bottom: 12px;
color: $primary-fg-color;
color: $primary-content;
word-break: break-word;
display: flex;
flex-direction: column;
@ -71,14 +71,14 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
color: $primary-fg-color;
color: $primary-content;
}
> p {
margin: 40px auto 60px;
font-size: $font-14px;
line-height: $font-20px;
color: $secondary-fg-color;
color: $secondary-content;
max-width: 464px; // easier reading
}
@ -97,7 +97,7 @@ limitations under the License.
}
.mx_RoomDirectory_table {
color: $primary-fg-color;
color: $primary-content;
display: grid;
font-size: $font-12px;
grid-template-columns: max-content auto max-content max-content max-content;

12
res/css/structures/_RoomSearch.scss
View file

@ -33,14 +33,14 @@ limitations under the License.
height: 16px;
mask: url('$(res)/img/element-icons/roomlist/search.svg');
mask-repeat: no-repeat;
background-color: $secondary-fg-color;
background-color: $secondary-content;
margin-left: 7px;
}
.mx_RoomSearch_input {
border: none !important; // !important to override default app-wide styles
flex: 1 !important; // !important to override default app-wide styles
color: $primary-fg-color !important; // !important to override default app-wide styles
color: $primary-content !important; // !important to override default app-wide styles
padding: 0;
height: 100%;
width: 100%;
@ -48,12 +48,12 @@ limitations under the License.
line-height: $font-16px;
&:not(.mx_RoomSearch_inputExpanded)::placeholder {
color: $tertiary-fg-color !important; // !important to override default app-wide styles
color: $tertiary-content !important; // !important to override default app-wide styles
}
}
&.mx_RoomSearch_hasQuery {
border-color: $secondary-fg-color;
border-color: $secondary-content;
}
&.mx_RoomSearch_focused {
@ -62,7 +62,7 @@ limitations under the License.
}
&.mx_RoomSearch_focused, &.mx_RoomSearch_hasQuery {
background-color: $roomlist-filter-active-bg-color;
background-color: $background;
.mx_RoomSearch_clearButton {
width: 16px;
@ -71,7 +71,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $secondary-fg-color;
background-color: $secondary-content;
margin-right: 8px;
}
}

10
res/css/structures/_RoomStatusBar.scss
View file

@ -27,7 +27,7 @@ limitations under the License.
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_image {
margin-right: -12px;
border: 1px solid $primary-bg-color;
border: 1px solid $background;
}
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_initial {
@ -39,7 +39,7 @@ limitations under the License.
display: inline-block;
color: #acacac;
background-color: #ddd;
border: 1px solid $primary-bg-color;
border: 1px solid $background;
border-radius: 40px;
width: 24px;
height: 24px;
@ -171,14 +171,14 @@ limitations under the License.
}
.mx_RoomStatusBar_connectionLostBar_desc {
color: $primary-fg-color;
color: $primary-content;
font-size: $font-13px;
opacity: 0.5;
padding-bottom: 20px;
}
.mx_RoomStatusBar_resend_link {
color: $primary-fg-color !important;
color: $primary-content !important;
text-decoration: underline !important;
cursor: pointer;
}
@ -187,7 +187,7 @@ limitations under the License.
height: 50px;
line-height: $font-50px;
color: $primary-fg-color;
color: $primary-content;
opacity: 0.5;
overflow-y: hidden;
display: block;

8
res/css/structures/_RoomView.scss
View file

@ -52,7 +52,7 @@ limitations under the License.
pointer-events: none;
background-color: $primary-bg-color;
background-color: $background;
opacity: 0.95;
position: absolute;
@ -99,7 +99,7 @@ limitations under the License.
left: 0;
right: 0;
z-index: 3000;
background-color: $primary-bg-color;
background-color: $background;
}
.mx_RoomView_auxPanel_hiddenHighlights {
@ -172,7 +172,7 @@ limitations under the License.
flex: 0 0 auto;
max-height: 0px;
background-color: $primary-bg-color;
background-color: $background;
z-index: 1000;
overflow: hidden;
@ -257,7 +257,7 @@ hr.mx_RoomView_myReadMarker {
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
background-color: $primary-bg-color;
background-color: $background;
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {

20
res/css/structures/_SpaceHierarchy.scss
View file

@ -37,7 +37,7 @@ limitations under the License.
> div {
font-weight: 400;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}
@ -59,7 +59,7 @@ limitations under the License.
> div {
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
@ -69,7 +69,7 @@ limitations under the License.
align-items: center;
font-size: $font-15px;
line-height: $font-24px;
color: $primary-fg-color;
color: $primary-content;
margin-bottom: 12px;
> h4 {
@ -128,14 +128,14 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;
color: $primary-fg-color;
color: $primary-content;
}
> span {
margin-left: 8px;
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
@ -152,7 +152,7 @@ limitations under the License.
height: 16px;
width: 16px;
border-radius: 4px;
background-color: $primary-bg-color;
background-color: $background;
&::before {
content: '';
@ -163,7 +163,7 @@ limitations under the License.
width: 16px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
mask-size: 16px;
transform: rotate(270deg);
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
@ -206,7 +206,7 @@ limitations under the License.
.mx_InfoTooltip {
display: inline;
margin-left: 12px;
color: $tertiary-fg-color;
color: $tertiary-content;
font-size: $font-12px;
line-height: $font-15px;
@ -227,7 +227,7 @@ limitations under the License.
.mx_SpaceHierarchy_roomTile_info {
font-size: $font-14px;
line-height: $font-18px;
color: $secondary-fg-color;
color: $secondary-content;
grid-row: 2;
grid-column: 1/3;
display: -webkit-box;
@ -292,7 +292,7 @@ limitations under the License.
font-weight: normal;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}

4
res/css/structures/_SpacePanel.scss
View file

@ -20,7 +20,7 @@ $gutterSize: 16px;
$activeBorderTransparentGap: 1px;
$activeBackgroundColor: $roomtile-selected-bg-color;
$activeBorderColor: $secondary-fg-color;
$activeBorderColor: $secondary-content;
.mx_SpacePanel {
background-color: $groupFilterPanel-bg-color;
@ -238,7 +238,7 @@ $activeBorderColor: $secondary-fg-color;
mask-size: contain;
mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/context-menu.svg');
background: $primary-fg-color;
background: $primary-content;
}
}
}

36
res/css/structures/_SpaceRoomView.scss
View file

@ -32,7 +32,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
color: $secondary-fg-color;
color: $secondary-content;
}
&::before {
@ -45,7 +45,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-repeat: no-repeat;
mask-size: 24px;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
}
&:hover {
@ -56,7 +56,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
color: $primary-fg-color;
color: $primary-content;
}
}
}
@ -75,13 +75,13 @@ $SpaceRoomViewInnerWidth: 428px;
margin: 0;
font-size: $font-24px;
font-weight: $font-semi-bold;
color: $primary-fg-color;
color: $primary-content;
width: max-content;
}
.mx_SpaceRoomView_description {
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 12px;
margin-bottom: 24px;
max-width: $SpaceRoomViewInnerWidth;
@ -157,7 +157,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-weight: $font-semi-bold;
font-size: $font-14px;
line-height: $font-24px;
color: $primary-fg-color;
color: $primary-content;
margin-top: 24px;
position: relative;
padding-left: 24px;
@ -179,7 +179,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
@ -210,7 +210,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_inviter_mxid {
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
}
@ -227,7 +227,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_topic {
font-size: $font-14px;
line-height: $font-22px;
color: $secondary-fg-color;
color: $secondary-content;
margin: 20px 0;
max-height: 160px;
overflow-y: auto;
@ -261,7 +261,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_landing_name {
margin: 24px 0 16px;
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
> span {
display: inline-block;
@ -334,7 +334,7 @@ $SpaceRoomViewInnerWidth: 428px;
top: 0;
height: 24px;
width: 24px;
background: $tertiary-fg-color;
background: $tertiary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
@ -358,7 +358,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceFeedbackPrompt {
padding: 7px; // 8px - 1px border
border: 1px solid rgba($primary-fg-color, .1);
border: 1px solid rgba($primary-content, .1);
border-radius: 8px;
width: max-content;
margin: 0 0 -40px auto; // collapse its own height to not push other components down
@ -387,7 +387,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 432px;
border-radius: 8px;
background-color: $info-plinth-bg-color;
color: $secondary-fg-color;
color: $secondary-content;
box-sizing: border-box;
> h3 {
@ -414,7 +414,7 @@ $SpaceRoomViewInnerWidth: 428px;
position: absolute;
top: 14px;
left: 14px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
@ -437,7 +437,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_inviteTeammates_buttons {
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 28px;
.mx_AccessibleButton {
@ -453,7 +453,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 24px;
top: 0;
left: 0;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
@ -472,7 +472,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_info {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
margin: 20px 0;
@ -491,7 +491,7 @@ $SpaceRoomViewInnerWidth: 428px;
left: -2px;
mask-position: center;
mask-repeat: no-repeat;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
}
}

2
res/css/structures/_TabbedView.scss
View file

@ -80,7 +80,7 @@ limitations under the License.
.mx_TabbedView_tabLabel_text {
font-size: 15px;
color: $tertiary-fg-color;
color: $tertiary-content;
}
}

8
res/css/structures/_ToastContainer.scss
View file

@ -36,8 +36,8 @@ limitations under the License.
.mx_Toast_toast {
grid-row: 1 / 3;
grid-column: 1;
color: $primary-fg-color;
background-color: $system;
color: $primary-content;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
border-radius: 8px;
overflow: hidden;
@ -63,7 +63,7 @@ limitations under the License.
&.mx_Toast_icon_verification::after {
mask-image: url("$(res)/img/e2e/normal.svg");
background-color: $primary-fg-color;
background-color: $primary-content;
}
&.mx_Toast_icon_verification_warning {
@ -82,7 +82,7 @@ limitations under the License.
&.mx_Toast_icon_secure_backup::after {
mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
background-color: $primary-fg-color;
background-color: $primary-content;
}
.mx_Toast_title, .mx_Toast_body {
@ -163,7 +163,7 @@ limitations under the License.
}
.mx_Toast_detail {
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_Toast_deviceID {

8
res/css/structures/_UserMenu.scss
View file

@ -35,7 +35,7 @@ limitations under the License.
// we cheat opacity on the theme colour with an after selector here
&::after {
content: '';
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
border-bottom: 1px solid $primary-content;
opacity: 0.2;
display: block;
padding-top: 8px;
@ -58,7 +58,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $tertiary-fg-color;
background: $tertiary-content;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
}
@ -176,7 +176,7 @@ limitations under the License.
width: 85%;
opacity: 0.2;
border: none;
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
border-bottom: 1px solid $primary-content;
}
&.mx_IconizedContextMenu {
@ -292,7 +292,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $primary-fg-color;
background: $primary-content;
}
}

2
res/css/structures/_ViewSource.scss
View file

@ -24,7 +24,7 @@ limitations under the License.
.mx_ViewSource_heading {
font-size: $font-17px;
font-weight: 400;
color: $primary-fg-color;
color: $primary-content;
margin-top: 0.7em;
}