Color cleanup 8 (#7108)

* $accent-color -> $accent

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $notice-primary-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $notice-primary-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-50pct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $warning-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-darker

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $orange-warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $info-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-11-11 14:37:29 +01:00 committed by GitHub
parent 5ad3261cb2
commit 9abb2f5ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
111 changed files with 271 additions and 306 deletions

View File

@ -74,11 +74,11 @@ pre, code {
.error, .warning,
.text-error, .text-warning {
color: $warning-color;
color: $alert;
}
.text-success {
color: $accent-color;
color: $accent;
}
.text-muted {
@ -102,7 +102,7 @@ h2 {
a:hover,
a:link,
a:visited {
color: $accent-color-alt;
color: $accent-alt;
}
input[type=text],
@ -238,7 +238,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
//
// They are not used for layout!!
#mx_theme_accentColor {
color: $accent-color;
color: $accent;
}
#mx_theme_secondaryAccentColor {
@ -364,7 +364,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
}
.mx_Dialog_title.danger {
color: $warning-color;
color: $alert;
}
.mx_Dialog_cancelButton {
@ -414,8 +414,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
// flip colours for the secondary ones
font-weight: 600;
border: 1px solid $accent-color;
color: $accent-color;
border: 1px solid $accent;
color: $accent;
background-color: $button-secondary-bg-color;
font-family: inherit;
}
@ -443,7 +443,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_Dialog_buttons button.mx_Dialog_primary,
.mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
color: $accent-fg-color;
background-color: $accent-color;
background-color: $accent;
min-width: 156px;
}
@ -451,15 +451,15 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_Dialog input[type="submit"].danger,
.mx_Dialog_buttons button.danger,
.mx_Dialog_buttons input[type="submit"].danger {
background-color: $warning-color;
border: solid 1px $warning-color;
background-color: $alert;
border: solid 1px $alert;
color: $accent-fg-color;
}
.mx_Dialog button.warning,
.mx_Dialog input[type="submit"].warning {
border: solid 1px $warning-color;
color: $warning-color;
border: solid 1px $alert;
color: $alert;
}
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):disabled,
@ -499,7 +499,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_linkButton {
cursor: pointer;
color: $accent-color;
color: $accent;
}
.mx_TextInputDialog_label {

View File

@ -44,7 +44,7 @@ limitations under the License.
.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected::before {
content: '';
height: 56px;
background-color: $accent-color-alt;
background-color: $accent-alt;
width: 5px;
position: absolute;
left: -9px;

View File

@ -152,7 +152,7 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected::before {
content: '';
height: 100%;
background-color: $accent-color;
background-color: $accent;
width: 4px;
position: absolute;
left: -12px;
@ -203,5 +203,5 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
}
.mx_TagTile_badgeHighlight {
background-color: $warning-color;
background-color: $alert;
}

View File

@ -81,13 +81,13 @@ limitations under the License.
}
.mx_GroupView_editable:focus {
border-bottom: 1px solid $accent-color !important;
border-bottom: 1px solid $accent !important;
outline: none;
box-shadow: none;
}
.mx_GroupView_header_isUserMember .mx_GroupView_header_name:hover div:not(.mx_GroupView_editable) {
color: $accent-color;
color: $accent;
cursor: pointer;
}
@ -229,7 +229,7 @@ limitations under the License.
vertical-align: top;
line-height: $font-24px;
padding-left: 28px;
color: $accent-color;
color: $accent;
}
.mx_GroupView_rooms .mx_RoomDetailList {

View File

@ -77,7 +77,7 @@ limitations under the License.
font-size: $font-15px;
line-height: $font-20px;
color: #fff; // on all themes
background-color: $accent-color;
background-color: $accent;
&::before {
top: 20px;

View File

@ -52,7 +52,7 @@ limitations under the License.
.mx_MatrixChat_syncError {
color: $accent-fg-color;
background-color: $warning-bg-color;
background-color: #DF2A8B; // Only used here
border-radius: 5px;
display: table;
padding: 30px;

View File

@ -71,10 +71,10 @@ limitations under the License.
}
&:hover {
background: rgba($accent-color, 0.1);
background: rgba($accent, 0.1);
&::before {
background-color: $accent-color;
background-color: $accent;
}
}
}
@ -104,7 +104,7 @@ limitations under the License.
}
$dot-size: 8px;
$pulse-color: $notice-primary-color;
$pulse-color: $alert;
.mx_RightPanel_pinnedMessagesButton {
&::before {
@ -175,7 +175,7 @@ $pulse-color: $notice-primary-color;
.mx_RightPanel_headerButton_highlight {
&::before {
background-color: $accent-color !important;
background-color: $accent !important;
}
}
@ -183,7 +183,7 @@ $pulse-color: $notice-primary-color;
font-size: $font-8px;
border-radius: 8px;
color: $accent-fg-color;
background-color: $accent-color;
background-color: $accent;
font-weight: bold;
position: absolute;
top: -4px;

View File

@ -57,7 +57,7 @@ limitations under the License.
.mx_RoomStatusBar_unreadMessagesBar {
padding-top: 10px;
color: $warning-color;
color: $alert;
cursor: pointer;
}
@ -96,7 +96,7 @@ limitations under the License.
}
.mx_RoomStatusBar_unsentTitle {
color: $warning-color;
color: $alert;
font-size: $font-15px;
}
@ -167,7 +167,7 @@ limitations under the License.
}
.mx_RoomStatusBar_connectionLostBar_title {
color: $warning-color;
color: $alert;
}
.mx_RoomStatusBar_connectionLostBar_desc {

View File

@ -103,7 +103,7 @@ limitations under the License.
.mx_RoomView_auxPanel_hiddenHighlights {
border-bottom: 1px solid $primary-hairline-color;
padding: 10px 26px;
color: $warning-color;
color: $alert;
cursor: pointer;
}
@ -241,8 +241,8 @@ li.mx_RoomView_myReadMarker_container {
}
hr.mx_RoomView_myReadMarker {
border-top: solid 1px $accent-color;
border-bottom: solid 1px $accent-color;
border-top: solid 1px $accent;
border-bottom: solid 1px $accent;
margin-top: 0px;
position: relative;
top: -1px;
@ -299,7 +299,7 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_ongoingConfCallNotification {
width: 100%;
text-align: center;
background-color: $warning-color;
background-color: $alert;
color: $accent-fg-color;
font-weight: bold;
padding: 6px 0;

View File

@ -99,7 +99,7 @@ limitations under the License.
.mx_SpaceHierarchy_error {
position: relative;
font-weight: $font-semi-bold;
color: $notice-primary-color;
color: $alert;
font-size: $font-15px;
line-height: $font-18px;
margin: 20px auto 12px;
@ -238,7 +238,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
}
}

View File

@ -324,10 +324,10 @@ $activeBorderColor: $secondary-content;
}
.mx_IconizedContextMenu_optionList .mx_AccessibleButton.mx_SpacePanel_contextMenu_inviteButton {
color: $accent-color;
color: $accent;
.mx_SpacePanel_iconInvite::before {
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/element-icons/room/invite.svg');
}
}

View File

@ -49,10 +49,10 @@ $SpaceRoomViewInnerWidth: 428px;
}
&:hover {
border-color: $accent-color;
border-color: $accent;
&::before {
background-color: $accent-color;
background-color: $accent;
}
> span {
@ -128,7 +128,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
color: $notice-primary-color;
color: $alert;
margin-bottom: 28px;
}
@ -427,11 +427,11 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_inviteTeammates_inviteDialogButton {
color: $accent-color;
color: $accent;
&::before {
mask-image: url('$(res)/img/element-icons/room/invite.svg');
background-color: $accent-color;
background-color: $accent;
}
}
}

View File

@ -44,7 +44,7 @@ limitations under the License.
}
.mx_TabbedView_tabLabel_active {
background-color: $accent-color;
background-color: $accent;
color: $tab-label-active-fg-color;
}
@ -89,14 +89,14 @@ limitations under the License.
}
.mx_TabbedView_tabLabel_active {
color: $accent-color;
color: $accent;
.mx_TabbedView_tabLabel_text {
color: $accent-color;
color: $accent;
}
}
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
background-color: $accent-color;
background-color: $accent;
}
.mx_TabbedView_maskedIcon {

View File

@ -76,7 +76,7 @@ limitations under the License.
&::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $notice-primary-color;
background-color: $alert;
}
}

View File

@ -63,7 +63,7 @@ limitations under the License.
margin-inline-start: 18px;
&.warning {
color: $warning-color;
color: $alert;
}
}
}

View File

@ -50,7 +50,7 @@ limitations under the License.
}
.mx_Login_error {
color: $warning-color;
color: $alert;
font-weight: bold;
text-align: center;
margin-top: 12px;
@ -63,7 +63,7 @@ limitations under the License.
}
.mx_Login_error.mx_Login_serverError.mx_Login_serverErrorNonFatal {
color: $orange-warning-color;
color: #ff8d13; // Only used here
}
.mx_Login_type_container {
@ -82,7 +82,7 @@ limitations under the License.
.mx_Login_underlinedServerName {
width: max-content;
border-bottom: 1px dashed $accent-color;
border-bottom: 1px dashed $accent;
}
div.mx_AccessibleButton_kind_link.mx_Login_forgot {

View File

@ -19,6 +19,6 @@ limitations under the License.
margin-top: $font-14px;
a.mx_SetupEncryptionBody_reset_link:is(:link, :hover, :visited) {
color: $warning-color;
color: $alert;
}
}

View File

@ -68,7 +68,7 @@ limitations under the License.
}
input.error {
color: $warning-color;
color: $alert;
}
.mx_Field input {

View File

@ -38,7 +38,7 @@ limitations under the License.
margin-right: 4px;
min-width: 80px;
background-color: $accent-color;
background-color: $accent;
color: $background;
cursor: pointer;

View File

@ -56,7 +56,7 @@ limitations under the License.
}
.mx_InteractiveAuthEntryComponents_msisdnEntry:focus {
border: 1px solid $accent-color;
border: 1px solid $accent;
}
.mx_InteractiveAuthEntryComponents_msisdnSubmit {
@ -78,7 +78,7 @@ limitations under the License.
}
.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
background-color: $accent-color-darker;
background-color: #92caad; // Only used here
cursor: default;
}

View File

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
$PassphraseStrengthHigh: $accent-color;
$PassphraseStrengthHigh: $accent;
$PassphraseStrengthMedium: $username-variant5-color;
$PassphraseStrengthLow: $notice-primary-color;
$PassphraseStrengthLow: $alert;
progress.mx_PassphraseField_progress {
appearance: none;

View File

@ -56,7 +56,7 @@ limitations under the License.
}
.mx_DecoratedRoomAvatar_icon_online::before {
background-color: $accent-color;
background-color: $accent;
}
.mx_DecoratedRoomAvatar_icon_away::before {

View File

@ -25,5 +25,5 @@ limitations under the License.
}
.mx_MemberStatusMessageAvatar_hasStatus .mx_BaseAvatar {
border-color: $accent-color;
border-color: $accent;
}

View File

@ -85,7 +85,7 @@ limitations under the License.
}
.mx_BetaCard_betaPill {
background-color: $accent-color-alt;
background-color: $accent-alt;
padding: 4px 10px;
border-radius: 8px;
text-transform: uppercase;
@ -100,7 +100,7 @@ limitations under the License.
}
}
$pulse-color: $accent-color-alt;
$pulse-color: $accent-alt;
$dot-size: 12px;
.mx_BetaDot {

View File

@ -125,21 +125,21 @@ limitations under the License.
.mx_IconizedContextMenu_optionList_red {
.mx_AccessibleButton {
color: $warning-color !important;
color: $alert !important;
}
.mx_IconizedContextMenu_icon::before {
background-color: $warning-color;
background-color: $alert;
}
}
.mx_IconizedContextMenu_active {
&.mx_AccessibleButton, .mx_AccessibleButton {
color: $accent-color !important;
color: $accent !important;
}
.mx_IconizedContextMenu_icon::before {
background-color: $accent-color;
background-color: $accent;
}
}

View File

@ -55,9 +55,9 @@ input.mx_StatusMessageContextMenu_message {
}
.mx_StatusMessageContextMenu_clear {
color: $warning-color;
color: $alert;
background-color: transparent;
border: 1px solid $warning-color;
border: 1px solid $alert;
}
.mx_StatusMessageContextMenu_actionContainer .mx_Spinner {

View File

@ -98,7 +98,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
color: $notice-primary-color;
color: $alert;
}
.mx_AddExistingToSpace_errorCaption {
@ -199,7 +199,7 @@ limitations under the License.
.mx_Dropdown_menu {
.mx_SubspaceSelector_dropdownOptionActive {
color: $accent-color;
color: $accent;
padding-right: 32px;
position: relative;
@ -213,7 +213,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
}
}

View File

@ -61,7 +61,7 @@ limitations under the License.
.mx_AddressPickerDialog_error {
margin-top: 10px;
color: $warning-color;
color: $alert;
}
.mx_AddressPickerDialog_cancel {

View File

@ -39,7 +39,7 @@ limitations under the License.
}
&.mx_CreateCommunityPrototypeDialog_subtext_error {
color: $warning-color;
color: $alert;
}
}

View File

@ -22,7 +22,7 @@ limitations under the License.
list-style: none;
font-weight: 600;
cursor: pointer;
color: $accent-color;
color: $accent;
// list-style doesn't do it for webkit
&::-webkit-details-marker {

View File

@ -106,7 +106,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
color: $notice-primary-color;
color: $alert;
}
.mx_CreateSpaceFromCommunityDialog_errorCaption {
@ -168,7 +168,7 @@ limitations under the License.
.mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark {
position: relative;
border-radius: 50%;
border: 3px solid $accent-color;
border: 3px solid $accent;
width: 68px;
height: 68px;
margin: 12px auto 32px;
@ -178,7 +178,7 @@ limitations under the License.
height: inherit;
content: '';
position: absolute;
background-color: $accent-color;
background-color: $accent;
mask-repeat: no-repeat;
mask-position: center;
mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');

View File

@ -215,7 +215,7 @@ limitations under the License.
th {
// Colour choice: first one autocomplete gave me.
border-bottom: 1px solid $accent-color;
border-bottom: 1px solid $accent;
text-align: left;
}
@ -233,16 +233,16 @@ limitations under the License.
tr:hover {
// Colour choice: first one autocomplete gave me.
background-color: $accent-color-50pct;
background-color: $accent;
}
}
.mx_DevTools_SettingsExplorer_mutable {
background-color: $accent-color;
background-color: $accent;
}
.mx_DevTools_SettingsExplorer_immutable {
background-color: $warning-color;
background-color: $alert;
}
.mx_DevTools_SettingsExplorer_edit {
@ -251,7 +251,7 @@ limitations under the License.
}
.mx_DevTools_SettingsExplorer_warning {
border: 2px solid $warning-color;
border: 2px solid $alert;
border-radius: 4px;
padding: 4px;
margin-bottom: 8px;

View File

@ -42,7 +42,7 @@ limitations under the License.
}
a, .mx_AccessibleButton_kind_link {
color: $accent-color;
color: $accent;
text-decoration: underline;
}
@ -111,7 +111,7 @@ limitations under the License.
.mx_StyledRadioButton_checked {
font-size: 24px;
border-color: $accent-color;
border-color: $accent;
}
&::after {

View File

@ -138,7 +138,7 @@ limitations under the License.
}
&.mx_ForwardList_sending .mx_ForwardList_sendIcon {
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/element-icons/circle-sending.svg');
mask-position: center;
mask-repeat: no-repeat;
@ -148,7 +148,7 @@ limitations under the License.
}
&.mx_ForwardList_sent .mx_ForwardList_sendIcon {
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/element-icons/circle-sent.svg');
mask-position: center;
mask-repeat: no-repeat;

View File

@ -362,7 +362,7 @@ limitations under the License.
}
.mx_InviteDialog_dialPad .mx_InviteDialog_dialPadField:focus-within {
border-color: $accent-color;
border-color: $accent;
}
.mx_InviteDialog_dialPadField .mx_Field_postfix {
@ -447,7 +447,7 @@ limitations under the License.
margin-left: 32px;
font-size: $font-15px;
line-height: $font-24px;
color: $notice-primary-color;
color: $alert;
}
}
}

View File

@ -69,8 +69,8 @@ limitations under the License.
margin-top: 20px;
.mx_Dialog_primary {
background-color: $notice-primary-color !important; // override default colour
border-color: $notice-primary-color;
background-color: $alert !important; // override default colour
border-color: $alert;
}
}
}

View File

@ -29,7 +29,7 @@ limitations under the License.
}
.mx_MessageEditHistoryDialog_error {
color: $warning-color;
color: $alert;
text-align: center;
}

View File

@ -43,7 +43,7 @@ limitations under the License.
}
> a {
color: $accent-color;
color: $accent;
margin-left: 8px;
}
}

View File

@ -29,5 +29,5 @@ limitations under the License.
.mx_SetEmailDialog_email_input:focus {
outline: none;
box-shadow: none;
border: 1px solid $accent-color;
border: 1px solid $accent;
}

View File

@ -21,7 +21,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
color: $notice-primary-color;
color: $alert;
margin-bottom: 28px;
}

View File

@ -35,7 +35,7 @@ limitations under the License.
.mx_TabbedIntegrationManagerDialog_currentManager {
width: 100%;
height: 100%;
border-top: 1px solid $accent-color;
border-top: 1px solid $accent;
iframe {
background-color: #fff;
@ -48,7 +48,7 @@ limitations under the License.
.mx_TabbedIntegrationManagerDialog_tab {
display: inline-block;
border: 1px solid $accent-color;
border: 1px solid $accent;
border-bottom: 0;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
@ -57,6 +57,6 @@ limitations under the License.
}
.mx_TabbedIntegrationManagerDialog_currentTab {
background-color: $accent-color;
background-color: $accent;
color: $accent-fg-color;
}

View File

@ -42,7 +42,7 @@ limitations under the License.
.mx_TermsDialog_link {
display: inline-block;
mask-image: url('$(res)/img/external-link.svg');
background-color: $accent-color;
background-color: $accent;
width: 10px;
height: 10px;
}

View File

@ -32,7 +32,7 @@ limitations under the License.
}
.mx_AccessSecretStorageDialog_reset_link {
color: $warning-color;
color: $alert;
}
}
@ -68,7 +68,7 @@ limitations under the License.
.mx_AccessSecretStorageDialog_passPhraseInput {
width: 300px;
border: 1px solid $accent-color;
border: 1px solid $accent;
border-radius: 5px;
}
@ -100,18 +100,18 @@ limitations under the License.
}
.mx_AccessSecretStorageDialog_recoveryKeyFeedback_valid {
color: $accent-color;
color: $accent;
&::before {
mask-image: url('$(res)/img/feather-customised/check.svg');
background-color: $accent-color;
background-color: $accent;
}
}
.mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid {
color: $warning-color;
color: $alert;
&::before {
mask-image: url('$(res)/img/feather-customised/x.svg');
background-color: $warning-color;
background-color: $alert;
}
}

View File

@ -20,7 +20,7 @@ limitations under the License.
}
.mx_CreateKeyBackupDialog_primaryContainer {
/* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
/* FIXME: plinth colour in new theme(s). background-color: $accent; */
padding: 20px;
}
@ -38,7 +38,7 @@ limitations under the License.
.mx_CreateKeyBackupDialog_passPhraseInput {
flex: none;
width: 250px;
border: 1px solid $accent-color;
border: 1px solid $accent;
border-radius: 5px;
padding: 10px;
margin-bottom: 1em;

View File

@ -72,7 +72,7 @@ limitations under the License.
}
.mx_CreateSecretStorageDialog_primaryContainer {
/* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
/* FIXME: plinth colour in new theme(s). background-color: $accent; */
padding-top: 20px;
}

View File

@ -20,14 +20,14 @@ limitations under the License.
}
.mx_RestoreKeyBackupDialog_primaryContainer {
/* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
/* FIXME: plinth colour in new theme(s). background-color: $accent; */
padding: 20px;
}
.mx_RestoreKeyBackupDialog_passPhraseInput,
.mx_RestoreKeyBackupDialog_recoveryKeyInput {
width: 300px;
border: 1px solid $accent-color;
border: 1px solid $accent;
border-radius: 5px;
padding: 10px;
}

View File

@ -73,7 +73,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/feather-customised/x.svg');
background-color: $notice-primary-color;
background-color: $alert;
}
}
}
@ -108,7 +108,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/feather-customised/check.svg');
background-color: $accent-color;
background-color: $accent;
}
}
}

View File

@ -35,20 +35,20 @@ limitations under the License.
.mx_AccessibleButton_kind_primary {
color: $button-primary-fg-color;
background-color: $accent-color;
border: 1px solid $accent-color; // account for size loss of no border
background-color: $accent;
border: 1px solid $accent; // account for size loss of no border
font-weight: 600;
}
.mx_AccessibleButton_kind_primary_outline {
color: $accent-color;
color: $accent;
background-color: $button-secondary-bg-color;
border: 1px solid $accent-color;
border: 1px solid $accent;
font-weight: 600;
}
.mx_AccessibleButton_kind_secondary {
color: $accent-color;
color: $accent;
font-weight: 600;
}
@ -60,7 +60,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_primary_sm {
padding: 5px 12px;
color: $button-primary-fg-color;
background-color: $accent-color;
background-color: $accent;
}
.mx_AccessibleButton_kind_primary_sm.mx_AccessibleButton_disabled {
@ -69,13 +69,13 @@ limitations under the License.
.mx_AccessibleButton_kind_danger {
color: $button-danger-fg-color;
background-color: $notice-primary-color;
background-color: $alert;
}
.mx_AccessibleButton_kind_danger_outline {
color: $notice-primary-color;
color: $alert;
background-color: transparent;
border: 1px solid $notice-primary-color;
border: 1px solid $alert;
}
.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
@ -91,7 +91,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm {
padding: 5px 12px;
color: $button-danger-fg-color;
background-color: $notice-primary-color;
background-color: $alert;
}
.mx_AccessibleButton_kind_danger_sm.mx_AccessibleButton_disabled {
@ -100,7 +100,7 @@ limitations under the License.
}
.mx_AccessibleButton_kind_link {
color: $accent-color;
color: $accent;
}
.mx_AccessibleButton_kind_link.mx_AccessibleButton_disabled {
@ -109,7 +109,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_link_sm {
padding: 5px 12px;
color: $accent-color;
color: $accent;
}
.mx_AccessibleButton_kind_link_sm.mx_AccessibleButton_disabled {
@ -117,7 +117,7 @@ limitations under the License.
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_confirm_sm {
background-color: $accent-color;
background-color: $accent;
&::before {
mask-image: url('$(res)/img/feather-customised/check.svg');
@ -125,7 +125,7 @@ limitations under the License.
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_cancel_sm {
background-color: $notice-primary-color;
background-color: $alert;
&::before {
mask-image: url('$(res)/img/feather-customised/x.svg');

View File

@ -21,7 +21,7 @@ limitations under the License.
max-height: 116px;
overflow-y: auto;
border-radius: 3px;
border: solid 1px $accent-color;
border: solid 1px $accent;
cursor: pointer;
z-index: 1;
}

View File

@ -28,8 +28,8 @@ limitations under the License.
.mx_AddressTile.mx_AddressTile_error {
background-color: rgba(255, 0, 100, 0.1);
color: $warning-color;
border-color: $warning-color;
color: $alert;
border-color: $alert;
}
.mx_AddressTile_network {

View File

@ -41,7 +41,7 @@ limitations under the License.
&.mx_desktopCapturerSourcePicker_source_thumbnail_selected,
&:hover,
&:focus {
border-color: $accent-color;
border-color: $accent;
}
}

View File

@ -38,7 +38,7 @@ limitations under the License.
}
.mx_DirectorySearchBox_clear {
background-color: $warning-color;
background-color: $alert;
mask: url('$(res)/img/cancel.svg');
mask-repeat: no-repeat;
mask-position: center;

View File

@ -33,7 +33,7 @@ limitations under the License.
height: 14px;
mask-image: url('$(res)/img/feather-customised/cancel.svg');
mask-repeat: no-repeat;
background-color: $warning-color;
background-color: $alert;
mask-size: 100%;
}

View File

@ -36,7 +36,7 @@ limitations under the License.
}
.mx_EventListSummary_toggle {
color: $accent-color;
color: $accent;
cursor: pointer;
float: right;
margin-right: 10px;

View File

@ -152,24 +152,24 @@ limitations under the License.
.mx_Field_valid {
&.mx_Field,
&.mx_Field:focus-within {
border-color: $accent-color;
border-color: $accent;
}
&.mx_Field label,
&.mx_Field:focus-within label {
color: $accent-color;
color: $accent;
}
}
.mx_Field_invalid {
&.mx_Field,
&.mx_Field:focus-within {
border-color: $warning-color;
border-color: $alert;
}
&.mx_Field label,
&.mx_Field:focus-within label {
color: $warning-color;
color: $alert;
}
}

View File

@ -35,7 +35,7 @@ limitations under the License.
font-size: 10pt;
line-height: 1.5em;
border-radius: 5px;
background-color: $accent-color;
background-color: $accent;
color: $accent-fg-color;
text-align: center;
z-index: 1000;

View File

@ -22,7 +22,7 @@ progress.mx_ProgressBar {
border: none;
@mixin ProgressBarBorderRadius 6px;
@mixin ProgressBarColour $accent-color;
@mixin ProgressBarColour $accent;
@mixin ProgressBarBgColour $progressbar-bg-color;
::-webkit-progress-value {
transition: width 1s;

View File

@ -20,7 +20,7 @@ limitations under the License.
margin-right: 0;
margin-bottom: 8px;
padding: 0 10px;
border-left: 2px solid $accent-color;
border-left: 2px solid $accent;
border-radius: 2px;
.mx_ReplyChain_show {

View File

@ -48,7 +48,7 @@ a.mx_Pill {
}
.mx_UserPill_selected {
background-color: $accent-color !important;
background-color: $accent !important;
}
/* More specific to override `.markdown-body a` color */
@ -57,7 +57,7 @@ a.mx_Pill {
.mx_EventTile_content .mx_AtRoomPill,
.mx_MessageComposer_input .mx_AtRoomPill {
color: $accent-fg-color;
background-color: $warning-color;
background-color: $alert;
}
/* More specific to override `.markdown-body a` color */

View File

@ -46,13 +46,13 @@ limitations under the License.
}
.mx_SSOButton_default {
color: $accent-color;
color: $accent;
background-color: $button-secondary-bg-color;
border-color: $accent-color;
border-color: $accent;
}
.mx_SSOButton_default.mx_SSOButton_primary {
color: $button-primary-fg-color;
background-color: $accent-color;
background-color: $accent;
}
.mx_SSOButton_mini {

View File

@ -56,7 +56,7 @@ limitations under the License.
position: absolute;
width: $slider-selection-dot-size;
height: $slider-selection-dot-size;
background-color: $accent-color;
background-color: $accent;
border-radius: 50%;
z-index: 10;
}
@ -72,7 +72,7 @@ limitations under the License.
.mx_Slider_selection > hr {
margin: 0;
border: 0.2em solid $accent-color;
border: 0.2em solid $accent;
}
.mx_Slider_dot {
@ -84,7 +84,7 @@ limitations under the License.
}
.mx_Slider_dotActive {
background-color: $accent-color;
background-color: $accent;
}
.mx_Slider_dotValue {

View File

@ -87,18 +87,18 @@ limitations under the License.
}
&:checked + label > .mx_Checkbox_background {
background: $accent-color;
border-color: $accent-color;
background: $accent;
border-color: $accent;
}
}
.mx_Checkbox.mx_Checkbox_kind_outline input[type=checkbox] {
& + label > .mx_Checkbox_background .mx_Checkbox_checkmark {
background: $accent-color;
background: $accent;
}
&:checked + label > .mx_Checkbox_background {
background: transparent;
border-color: $accent-color;
border-color: $accent;
}
}

View File

@ -21,7 +21,7 @@ limitations under the License.
.mx_StyledRadioButton {
$radio-circle-color: $quaternary-content;
$active-radio-circle-color: $accent-color;
$active-radio-circle-color: $accent;
position: relative;
display: flex;
@ -126,5 +126,5 @@ limitations under the License.
}
.mx_StyledRadioButton_checked {
border-color: $accent-color;
border-color: $accent;
}

View File

@ -32,7 +32,7 @@ limitations under the License.
}
.mx_ToggleSwitch.mx_ToggleSwitch_on {
background-color: $accent-color;
background-color: $accent;
> .mx_ToggleSwitch_ball {
left: calc(100% - $font-20px);

View File

@ -50,20 +50,20 @@ limitations under the License.
}
&.mx_Validation_valid {
color: $accent-color;
color: $accent;
&::before {
mask-image: url('$(res)/img/feather-customised/check.svg');
background-color: $accent-color;
background-color: $accent;
}
}
&.mx_Validation_invalid {
color: $warning-color;
color: $alert;
&::before {
mask-image: url('$(res)/img/feather-customised/x.svg');
background-color: $warning-color;
background-color: $alert;
}
}
}

View File

@ -52,7 +52,7 @@ limitations under the License.
&:not(:disabled):hover {
background-color: $focus-bg-color;
border-bottom: 2px solid $accent-color;
border-bottom: 2px solid $accent;
}
}
@ -82,7 +82,7 @@ limitations under the License.
.mx_EmojiPicker_anchor_symbols::before { mask-image: url('$(res)/img/emojipicker/symbols.svg'); }
.mx_EmojiPicker_anchor_visible {
border-bottom: 2px solid $accent-color;
border-bottom: 2px solid $accent;
}
.mx_EmojiPicker_search {
@ -178,7 +178,7 @@ limitations under the License.
.mx_EmojiPicker_item_selected {
color: rgba(0, 0, 0, .5);
border: 1px solid $accent-color;
border: 1px solid $accent;
padding: 4px;
}

View File

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_MFileBody_download {
color: $accent-color;
color: $accent;
.mx_MFileBody_download_icon {
// 12px instead of 14px to better match surrounding font size
@ -26,13 +26,13 @@ limitations under the License.
mask-position: center;
mask-repeat: no-repeat;
mask-image: url("$(res)/img/download.svg");
background-color: $accent-color;
background-color: $accent;
display: inline-block;
}
}
.mx_MFileBody_download a {
color: $accent-color;
color: $accent;
text-decoration: none;
cursor: pointer;
}

View File

@ -81,12 +81,12 @@ $timelineImageBorderRadius: 4px;
background-color: $header-panel-bg-color;
.mx_HiddenImagePlaceholder_button {
color: $accent-color;
color: $accent;
span.mx_HiddenImagePlaceholder_eye {
margin-right: 8px;
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/feather-customised/eye.svg');
display: inline-block;
width: 18px;

View File

@ -32,7 +32,7 @@ limitations under the License.
&.mx_ReactionsRowButton_selected {
background-color: $reaction-row-button-selected-bg-color;
border-color: $accent-color;
border-color: $accent;
}
&.mx_AccessibleButton_disabled {

View File

@ -19,7 +19,7 @@ limitations under the License.
overflow-y: hidden;
a {
color: $accent-color;
color: $accent;
cursor: pointer;
}
}

View File

@ -34,7 +34,7 @@ limitations under the License.
mask-position: 0 center;
mask-size: auto 12px;
visibility: hidden;
background-color: $accent-color;
background-color: $accent;
mask-image: url('$(res)/img/feather-customised/maximise.svg');
}

View File

@ -31,12 +31,12 @@ limitations under the License.
&.mx_cryptoEvent_icon_verified::after {
mask-image: url("$(res)/img/e2e/verified.svg");
background-color: $accent-color;
background-color: $accent;
}
&.mx_cryptoEvent_icon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $notice-primary-color;
background-color: $alert;
}
.mx_cryptoEvent_state, .mx_cryptoEvent_buttons {

View File

@ -190,7 +190,7 @@ limitations under the License.
}
.mx_RoomSummaryCard_app_pinToggle::before {
background-color: $accent-color;
background-color: $accent;
}
}

View File

@ -188,12 +188,12 @@ limitations under the License.
.mx_UserInfo_field {
cursor: pointer;
color: $accent-color;
color: $accent;
line-height: $font-16px;
margin: 8px 0;
&.mx_UserInfo_destructive {
color: $warning-color;
color: $alert;
}
}
@ -225,12 +225,12 @@ limitations under the License.
&.mx_UserInfo_device_verified {
.mx_UserInfo_device_trusted {
color: $accent-color;
color: $accent;
}
}
&.mx_UserInfo_device_unverified {
.mx_UserInfo_device_trusted {
color: $warning-color;
color: $alert;
}
}

View File

@ -58,6 +58,6 @@ limitations under the License.
}
.mx_WidgetCard_maxPinnedTooltip {
background-color: $notice-primary-color;
background-color: $alert;
color: #ffffff;
}

View File

@ -22,7 +22,7 @@ limitations under the License.
}
.mx_AliasSettings_editable:focus {
border-bottom: 1px solid $accent-color;
border-bottom: 1px solid $accent;
outline: none;
box-shadow: none;
}
@ -30,7 +30,7 @@ limitations under the License.
.mx_AliasSettings {
summary {
cursor: pointer;
color: $accent-color;
color: $accent;
font-weight: 600;
list-style: none;

View File

@ -310,7 +310,7 @@ $MinWidth: 240px;
.mx_AppPermissionWarning_helpIcon::before {
display: inline-block;
background-color: $accent-color;
background-color: $accent;
mask-repeat: no-repeat;
mask-size: 12px;
width: 12px;

View File

@ -65,7 +65,7 @@ limitations under the License.
.mx_E2EIcon_warning::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $notice-primary-color;
background-color: $alert;
}
.mx_E2EIcon_normal::after {
@ -75,5 +75,5 @@ limitations under the License.
.mx_E2EIcon_verified::after {
mask-image: url('$(res)/img/e2e/verified.svg');
background-color: $accent-color;
background-color: $accent;
}

View File

@ -32,7 +32,7 @@ limitations under the License.
padding: 3px 6px;
&:focus {
border-color: $accent-color-50pct;
border-color: rgba($accent, 0.5); // Only ever used here
}
}

View File

@ -43,7 +43,7 @@ limitations under the License.
background-color: $event-highlight-bg-color;
}
color: $warning-color;
color: $alert;
}
/* For replies */

View File

@ -121,14 +121,14 @@ $left-gutter: 64px;
* TODO: ultimately we probably want some transition on here.
*/
&.mx_EventTile_selected > .mx_EventTile_line {
border-left: $accent-color $selected-message-border-width solid;
border-left: $accent $selected-message-border-width solid;
padding-left: calc($left-gutter - $selected-message-border-width);
background-color: $event-selected-color;
}
&.mx_EventTile_highlight,
&.mx_EventTile_highlight .markdown-body {
color: $warning-color;
color: $alert;
.mx_EventTile_line {
background-color: $event-highlight-bg-color;
@ -146,7 +146,7 @@ $left-gutter: 64px;
}
.mx_EventTile_searchHighlight {
background-color: $accent-color;
background-color: $accent;
color: $accent-fg-color;
border-radius: 5px;
padding-left: 2px;
@ -155,7 +155,7 @@ $left-gutter: 64px;
}
.mx_EventTile_searchHighlight a {
background-color: $accent-color;
background-color: $accent;
color: $accent-fg-color;
}
@ -435,7 +435,7 @@ $left-gutter: 64px;
.mx_EventTile_e2eIcon_warning {
&::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $notice-primary-color;
background-color: $alert;
}
opacity: 1;
}
@ -582,7 +582,7 @@ $left-gutter: 64px;
}
.mx_EventTile_content .markdown-body a {
color: $accent-color-alt;
color: $accent-alt;
}
.mx_EventTile_content .markdown-body blockquote {

View File

@ -47,7 +47,7 @@ limitations under the License.
.mx_JumpToBottomButton_highlight .mx_JumpToBottomButton_badge {
color: $secondary-accent-color;
background-color: $warning-color;
background-color: $alert;
}
.mx_JumpToBottomButton_scrollDown {

View File

@ -32,7 +32,7 @@ limitations under the License.
}
> .mx_AccessibleButton {
color: $accent-color;
color: $accent;
text-align: center;
}
}

View File

@ -86,7 +86,7 @@ limitations under the License.
.mx_MemberList_invite {
flex: 0 0 auto;
position: relative;
background-color: $accent-color;
background-color: $accent;
border-radius: 4px;
margin: 5px 9px 9px;
display: flex;

View File

@ -170,18 +170,18 @@ limitations under the License.
/* hack for FF as vertical alignment of custom placeholder text is broken */
.mx_MessageComposer_input textarea::-moz-placeholder {
line-height: 100%;
color: $accent-color;
color: $accent;
opacity: 1.0;
}
.mx_MessageComposer_input textarea::-webkit-input-placeholder {
color: $accent-color;
color: $accent;
}
.mx_MessageComposer_button_highlight {
background: rgba($accent-color, 0.25);
background: rgba($accent, 0.25);
// make the icon the accent color too
&::before {
background-color: $accent-color !important;
background-color: $accent !important;
}
}
@ -234,16 +234,16 @@ limitations under the License.
&:hover,
&.mx_MessageComposer_closeButtonMenu {
&::after {
background: rgba($accent-color, 0.1);
background: rgba($accent, 0.1);
}
&::before {
background-color: $accent-color;
background-color: $accent;
}
}
&.mx_MessageComposer_hangup:not(.mx_AccessibleButton_disabled)::before {
background-color: $warning-color;
background-color: $alert;
}
}
@ -282,7 +282,7 @@ limitations under the License.
width: 32px;
height: 32px;
border-radius: 100%;
background-color: $accent-color;
background-color: $accent;
&::before {
position: absolute;

View File

@ -36,7 +36,7 @@ limitations under the License.
&.mx_NotificationBadge_highlighted {
// TODO: Use a more specific variable
background-color: $warning-color;
background-color: $alert;
}
// These are the 3 background types

View File

@ -63,7 +63,7 @@ limitations under the License.
}
.mx_RoomHeader_textButton_danger {
background-color: $warning-color;
background-color: $alert;
}
.mx_RoomHeader_cancelButton {
@ -145,7 +145,7 @@ limitations under the License.
}
.mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
color: $accent-color;
color: $accent;
}
.mx_RoomHeader_placeholder {
@ -159,7 +159,7 @@ limitations under the License.
}
.mx_RoomHeader_editable:focus {
border-bottom: 1px solid $accent-color !important;
border-bottom: 1px solid $accent !important;
outline: none;
box-shadow: none;
}
@ -228,10 +228,10 @@ limitations under the License.
}
&:hover {
background: rgba($accent-color, 0.1);
background: rgba($accent, 0.1);
&::before {
background-color: $accent-color;
background-color: $accent;
}
}
}
@ -245,7 +245,7 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/apps.svg');
}
.mx_RoomHeader_appsButton_highlight::before {
background-color: $accent-color;
background-color: $accent;
}
.mx_RoomHeader_searchButton::before {

View File

@ -34,16 +34,16 @@ limitations under the License.
}
.mx_RoomUpgradeWarningBar_header {
color: $warning-color;
color: $alert;
font-weight: bold;
}
.mx_RoomUpgradeWarningBar_body {
color: $warning-color;
color: $alert;
}
.mx_RoomUpgradeWarningBar_upgradelink {
color: $warning-color;
color: $alert;
text-decoration: underline;
}

View File

@ -31,7 +31,7 @@ limitations under the License.
cursor: pointer;
width: 37px;
height: 37px;
background-color: $accent-color;
background-color: $accent;
mask: url('$(res)/img/feather-customised/search-input.svg');
mask-repeat: no-repeat;
mask-position: center;
@ -48,7 +48,7 @@ limitations under the License.
font-size: $font-15px;
cursor: pointer;
color: $primary-content;
border-bottom: 2px solid $accent-color;
border-bottom: 2px solid $accent;
font-weight: 600;
}
@ -58,7 +58,7 @@ limitations under the License.
}
.mx_SearchBar_cancel {
background-color: $warning-color;
background-color: $alert;
mask: url('$(res)/img/cancel.svg');
mask-repeat: no-repeat;
mask-position: center;

View File

@ -42,7 +42,7 @@
.mx_Stickers_addLink {
display: inline;
cursor: pointer;
color: $accent-color;
color: $accent;
}
.mx_Stickers_hideStickers {

View File

@ -33,7 +33,7 @@ limitations under the License.
height: 4px;
border-radius: 16px;
background-color: $secondary-accent-color;
border: 6px solid $accent-color;
border: 6px solid $accent;
pointer-events: none;
}

View File

@ -40,5 +40,5 @@ limitations under the License.
}
.mx_IntegrationManager_error h3 {
color: $warning-color;
color: $alert;
}

View File

@ -17,9 +17,9 @@ limitations under the License.
.mx_JoinRuleSettings_upgradeRequired {
margin-left: 16px;
padding: 4px 16px;
border: 1px solid $accent-color;
border: 1px solid $accent;
border-radius: 8px;
color: $accent-color;
color: $accent;
font-size: $font-12px;
line-height: $font-15px;
}

View File

@ -57,7 +57,7 @@ limitations under the License.
}
&.mx_LayoutSwitcher_RadioButton_selected {
border-color: $accent-color;
border-color: $accent;
}
}
@ -70,7 +70,7 @@ limitations under the License.
}
.mx_StyledRadioButton_checked {
background-color: rgba($accent-color, 0.08);
background-color: rgba($accent, 0.08);
}
.mx_EventTile {

View File

@ -15,11 +15,11 @@ limitations under the License.
*/
.mx_SettingsTab {
color: $muted-fg-color;
color: $primary-content;
}
.mx_SettingsTab_warningText {
color: $warning-color;
color: $alert;
}
.mx_SettingsTab_heading {
@ -91,10 +91,10 @@ limitations under the License.
.mx_SettingsTab_linkBtn {
cursor: pointer;
color: $accent-color;
color: $accent;
word-break: break-all;
}
.mx_SettingsTab a {
color: $accent-color-alt;
color: $accent-alt;
}

View File

@ -32,7 +32,7 @@ limitations under the License.
}
.mx_AppearanceUserSettingsTab_AdvancedToggle {
color: $accent-color;
color: $accent;
cursor: pointer;
}

View File

@ -35,7 +35,7 @@ limitations under the License.
}
.mx_SecurityUserSettingsTab_warning {
color: $notice-primary-color;
color: $alert;
position: relative;
padding-left: 40px;
margin-top: 30px;
@ -50,7 +50,7 @@ limitations under the License.
content: "";
top: 0;
left: 0;
background-color: $notice-primary-color;
background-color: $alert;
mask-image: url('$(res)/img/feather-customised/alert-triangle.svg');
}
}

View File

@ -69,7 +69,7 @@ limitations under the License.
}
> .mx_SpaceBasicSettings_avatar_remove {
color: $notice-primary-color;
color: $alert;
}
}

View File

@ -116,7 +116,7 @@ $spacePanelWidth: 68px;
}
.mx_AccessibleButton_kind_link {
color: $accent-color;
color: $accent;
position: relative;
padding: 0;
margin-left: 8px;

View File

@ -19,7 +19,7 @@ limitations under the License.
font-size: $font-14px;
a {
color: $accent-color;
color: $accent;
text-decoration: none;
}
@ -35,7 +35,7 @@ limitations under the License.
.mx_InlineTermsAgreement_link {
display: inline-block;
mask-image: url('$(res)/img/external-link.svg');
background-color: $accent-color;
background-color: $accent;
mask-repeat: no-repeat;
mask-size: contain;
width: 12px;

Some files were not shown because too many files have changed in this diff Show More