From 989c3be9f5f128beae21bfed2c06ea9adff9dec0 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 7 Dec 2020 16:16:08 +0800 Subject: [PATCH] update --- src/main/gnome-shell/gnome-shell-dark-alt.css | 46 ++++++++-------- .../gnome-shell-dark-solid-alt.css | 46 ++++++++-------- .../gnome-shell/gnome-shell-dark-solid.css | 46 ++++++++-------- src/main/gnome-shell/gnome-shell-dark.css | 46 ++++++++-------- .../gnome-shell/gnome-shell-light-alt.css | 46 ++++++++-------- .../gnome-shell-light-solid-alt.css | 46 ++++++++-------- .../gnome-shell/gnome-shell-light-solid.css | 46 ++++++++-------- src/main/gnome-shell/gnome-shell-light.css | 46 ++++++++-------- src/sass/gnome-shell/_common.scss | 53 +++++++++---------- 9 files changed, 208 insertions(+), 213 deletions(-) diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index 4aeffa8..01acdc3 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index 21a90e3..3a0e3fe 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index 21a90e3..3a0e3fe 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 4aeffa8..01acdc3 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index b42ee35..890f306 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index d94c917..e85c362 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index d94c917..e85c362 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 4cbaa68..a72e28d 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -361,6 +361,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #F27835; } +.headline { + font-size: 15pt; + font-weight: 500; +} + .lightbox { background-color: black; } @@ -370,9 +375,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } /* Modal Dialogs */ -.headline { - font-size: 15pt; - font-weight: 500; +.modal-dialog-linked-button:last-child { + color: white; + background-color: #0860f2; +} + +.modal-dialog-linked-button:hover:last-child { + color: white; + background-color: #307bf8; +} + +.modal-dialog-linked-button:active:last-child { + color: white; + background-color: #0756d9; +} + +.modal-dialog-linked-button:insensitive:last-child { + background-color: rgba(8, 96, 242, 0.05); + color: rgba(8, 96, 242, 0.35); } .modal-dialog { @@ -547,26 +567,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: 500; } -.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child { - color: white; - background-color: #0860f2; -} - -.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child { - color: white; - background-color: #307bf8; -} - -.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child { - color: white; - background-color: #0756d9; -} - -.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child { - background-color: rgba(8, 96, 242, 0.05); - color: rgba(8, 96, 242, 0.35); -} - /* End Session Dialog */ .end-session-dialog { width: 30em; diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index b9e4ba8..8015507 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -301,12 +301,31 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent); color: $warning_color; } +.headline { @include font(title); } .lightbox { background-color: black; } .flashspot { background-color: white; } /* Modal Dialogs */ -.headline { @include font(title); } +%last_dialog_button { + color: white; + background-color: $primary_color; + + &:hover { + color: white; + background-color: lighten($primary_color, 9%); + } + + &:active { + color: white; + background-color: darken($primary_color, 5%); + } + + &:insensitive { + background-color: rgba($primary_color, 0.05); + color: rgba($primary_color, 0.35); + } +} .modal-dialog { color: $fg_color; @@ -327,6 +346,10 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent); &:focus { @include button(flat-focus); } } + &-linked-button:last-child { + @extend %last_dialog_button; + } + .modal-dialog-content-box { margin: 32px 40px; spacing: 32px; @@ -425,35 +448,11 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent); } } -%last_dialog_button { - color: white; - background-color: $primary_color; - - &:hover { - color: white; - background-color: lighten($primary_color, 9%); - } - - &:active { - color: white; - background-color: darken($primary_color, 5%); - } - - &:insensitive { - background-color: rgba($primary_color, 0.05); - color: rgba($primary_color, 0.35); - } -} - /* End Session Dialog */ .end-session-dialog { width: 30em; border: none; - .modal-dialog-linked-button:last-child { - @extend %last_dialog_button; - } - .end-session-dialog-battery-warning, .dialog-list-title { color: $warning_color; @@ -595,10 +594,6 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent); width: 28em; border: none; - .modal-dialog-linked-button:last-child { - @extend %last_dialog_button; - } - .modal-dialog-content-box { margin-bottom: 24px; }