sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Color cleanup 8 (#7108)

Browse Source 
* $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>
This commit is contained in:
Šimon Brandner
2021-11-11 13:37:29 +00:00
committed by GitHub
parent 5ad3261cb2
commit 9abb2f5ff4
111 changed files with 271 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
+3 -3
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');
}
}
res/css/views/dialogs/_AddressPickerDialog.scss
+1 -1
View File
@@ -61,7 +61,7 @@ limitations under the License.
.mx_AddressPickerDialog_error {
margin-top: 10px;
color: $warning-color;
color: $alert;
}
.mx_AddressPickerDialog_cancel {
res/css/views/dialogs/_CreateCommunityPrototypeDialog.scss
+1 -1
View File
@@ -39,7 +39,7 @@ limitations under the License.
}
&.mx_CreateCommunityPrototypeDialog_subtext_error {
color: $warning-color;
color: $alert;
}
}
res/css/views/dialogs/_CreateRoomDialog.scss
+1 -1
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 {
res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
+3 -3
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');
res/css/views/dialogs/_DevtoolsDialog.scss
+5 -5
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;
res/css/views/dialogs/_FeedbackDialog.scss
+2 -2
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 {
res/css/views/dialogs/_ForwardDialog.scss
+2 -2
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;
res/css/views/dialogs/_InviteDialog.scss
+2 -2
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;
}
}
}
res/css/views/dialogs/_LeaveSpaceDialog.scss
+2 -2
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;
}
}
}
res/css/views/dialogs/_MessageEditHistoryDialog.scss
+1 -1
View File
@@ -29,7 +29,7 @@ limitations under the License.
}
.mx_MessageEditHistoryDialog_error {
color: $warning-color;
color: $alert;
text-align: center;
}
res/css/views/dialogs/_ServerPickerDialog.scss
+1 -1
View File
@@ -43,7 +43,7 @@ limitations under the License.
}
> a {
color: $accent-color;
color: $accent;
margin-left: 8px;
}
}
res/css/views/dialogs/_SetEmailDialog.scss
+1 -1
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;
}
res/css/views/dialogs/_SpaceSettingsDialog.scss
+1 -1
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;
}
res/css/views/dialogs/_TabbedIntegrationManagerDialog.scss
+3 -3
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;
}
res/css/views/dialogs/_TermsDialog.scss
+1 -1
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;
}
res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
+6 -6
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;
}
}
res/css/views/dialogs/security/_CreateKeyBackupDialog.scss
+2 -2
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;
res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
+1 -1
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;
}
res/css/views/dialogs/security/_RestoreKeyBackupDialog.scss
+2 -2
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;
}