From 6de4d8afa5eaa519b5d02497bf634d0c09da7789 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 16 Nov 2018 23:30:43 +0100 Subject: [PATCH] css: renamed --color-button-active-color to --color-link-active-color. This will get used for more things than just buttons, so the name is quite misleading. --- css/m-components.css | 14 ++++++++------ css/m-theme-dark.css | 12 ++++++------ css/m-theme-light.css | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/css/m-components.css b/css/m-components.css index f73043a4..0b0ef844 100644 --- a/css/m-components.css +++ b/css/m-components.css @@ -978,24 +978,26 @@ div.m-button.m-danger a, .m-label:not(.m-flat).m-danger { background-color: var( div.m-button.m-info a, .m-label:not(.m-flat).m-info { background-color: var(--info-color); } div.m-button.m-dim a, .m-label:not(.m-flat).m-dim { background-color: var(--dim-color); } div.m-button.m-default a:hover, div.m-button.m-default a:focus, div.m-button.m-default a:active { - background-color: var(--default-button-active-color); + background-color: var(--default-link-active-color); } div.m-button.m-primary a:hover, div.m-button.m-primary a:focus, div.m-button.m-primary a:active { - background-color: var(--primary-button-active-color); + background-color: var(--primary-link-active-color); } div.m-button.m-success a:hover, div.m-button.m-success a:focus, div.m-button.m-success a:active { - background-color: var(--success-button-active-color); + background-color: var(--success-link-active-color); } div.m-button.m-warning a:hover, div.m-button.m-warning a:focus, div.m-button.m-warning a:active { - background-color: var(--warning-button-active-color); + background-color: var(--warning-link-active-color); } div.m-button.m-danger a:hover, div.m-button.m-danger a:focus, div.m-button.m-danger a:active { - background-color: var(--danger-button-active-color); + background-color: var(--danger-link-active-color); } div.m-button.m-info a:hover, div.m-button.m-info a:focus, div.m-button.m-info a:active { - background-color: var(--info-button-active-color); + background-color: var(--info-link-active-color); } div.m-button.m-dim a:hover, div.m-button.m-dim a:focus, div.m-button.m-dim a:active { + /* Using a dedicated color here because we want the button dim by default, + not highlighted as other links */ background-color: var(--dim-button-active-color); } diff --git a/css/m-theme-dark.css b/css/m-theme-dark.css index 8b6aded1..ddd67a6d 100644 --- a/css/m-theme-dark.css +++ b/css/m-theme-dark.css @@ -98,46 +98,46 @@ /* Colored components */ --default-color: #dcdcdc; + --default-link-active-color: #a5c9ea; --default-filled-color: #dcdcdc; --default-filled-background-color: #34424d; --default-filled-link-color: #5b9dd9; --default-filled-link-active-color: #a5c9ea; - --default-button-active-color: #a5c9ea; --primary-color: #a5c9ea; + --primary-link-active-color: #dcdcdc; --primary-filled-color: #2f363f; --primary-filled-background-color: #a5c2db; --primary-filled-link-color: #2a75b6; --primary-filled-link-active-color: #2f363f; - --primary-button-active-color: #dcdcdc; --success-color: #3bd267; + --success-link-active-color: #acecbe; --success-filled-color: #acecbe; --success-filled-background-color: #2a703f; --success-filled-link-color: #3bd267; --success-filled-link-active-color: #acecbe; - --success-button-active-color: #acecbe; --warning-color: #c7cf2f; + --warning-link-active-color: #e9ecae; --warning-filled-color: #e9ecae; --warning-filled-background-color: #6d702a; --warning-filled-link-color: #b8bf2b; --warning-filled-link-active-color: #e9ecae; - --warning-button-active-color: #e9ecae; --danger-color: #cd3431; + --danger-link-active-color: #ff9391; --danger-filled-color: #ff9391; --danger-filled-background-color: #702b2a; --danger-filled-link-color: #d85c59; --danger-filled-link-active-color: #ff9391; - --danger-button-active-color: #ff9391; --info-color: #2f83cc; + --info-link-active-color: #5297d7; --info-filled-color: #a5caeb; --info-filled-background-color: #2a4f70; --info-filled-link-color: #5297d7; --info-filled-link-active-color: #a5caeb; - --info-button-active-color: #5297d7; --dim-color: #747474; --dim-link-color: #acacac; diff --git a/css/m-theme-light.css b/css/m-theme-light.css index c84b7df9..88bc043a 100644 --- a/css/m-theme-light.css +++ b/css/m-theme-light.css @@ -96,46 +96,46 @@ /* Colored components */ --default-color: #000000; + --default-link-active-color: #cb4b16; --default-filled-color: #000000; --default-filled-background-color: #fbf0ec; --default-filled-link-color: #ea7944; --default-filled-link-active-color: #cb4b16; - --default-button-active-color: #cb4b16; --primary-color: #cb4b16; + --primary-link-active-color: #000000; --primary-filled-color: #fbe4d9; --primary-filled-background-color: #ef9069; --primary-filled-link-color: #782f0d; --primary-filled-link-active-color: #2f1205; - --primary-button-active-color: #000000; --success-color: #31c25d; + --success-link-active-color: #dcf6e3; --success-filled-color: #f4fcf6; --success-filled-background-color: #4dd376; --success-filled-link-color: #c5f2d1; --success-filled-link-active-color: #dcf6e3; - --success-button-active-color: #dcf6e3; --warning-color: #c7cf2f; + --warning-link-active-color: #f6f6dc; --warning-filled-color: #fcfcf4; --warning-filled-background-color: #d1d34d; --warning-filled-link-color: #f0f1c7; --warning-filled-link-active-color: #f6f6dc; - --warning-button-active-color: #f6f6dc; --danger-color: #f60000; + --danger-link-active-color: #f6dddc; --danger-filled-color: #fdf3f3; --danger-filled-background-color: #e23e3e; --danger-filled-link-color: #f2c7c6; --danger-filled-link-active-color: #f6dddc; - --danger-button-active-color: #f6dddc; --info-color: #2e7dc5; + --info-link-active-color: #c6ddf2; --info-filled-color: #f4f8fc; --info-filled-background-color: #4c93d3; --info-filled-link-color: #c6ddf2; --info-filled-link-active-color: #dbeaf7; - --info-button-active-color: #c6ddf2; --dim-color: #bdbdbd; --dim-link-color: #c0c0c0; -- 2.30.2