diff options
Diffstat (limited to 'common/gnome-shell/3.18/sass')
| -rw-r--r-- | common/gnome-shell/3.18/sass/_colors.scss | 63 | ||||
| -rw-r--r-- | common/gnome-shell/3.18/sass/_common.scss | 76 |
2 files changed, 95 insertions, 44 deletions
diff --git a/common/gnome-shell/3.18/sass/_colors.scss b/common/gnome-shell/3.18/sass/_colors.scss index 3659c08..8d3a5f2 100644 --- a/common/gnome-shell/3.18/sass/_colors.scss +++ b/common/gnome-shell/3.18/sass/_colors.scss @@ -2,13 +2,13 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #fdf6e3, #073642); -$text_color: if($variant == 'light', #5c616c, #657b83); -$bg_color: if($variant =='light', #F5F6F7, #002b36); -$fg_color: if($variant =='light', #5c616c, #657b83); +$base_color: if($variant =='light', #ffffff, #404552); +$text_color: if($variant == 'light', #5c616c, #D3DAE3); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); +$fg_color: if($variant =='light', #5c616c, #D3DAE3); -$selected_fg_color: #fdf6e3; -$selected_bg_color: #268bd2; +$selected_fg_color: #ffffff; +$selected_bg_color: #5294e2; $selected_borders_color: darken($selected_bg_color, 20%); $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); @@ -18,31 +18,38 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%)); $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); -$warning_color: #cb4b16; -$error_color: #dc322f; -$success_color: #859900; -$destructive_color: #dc322f; -$suggested_color: #2aa198; +$selection_mode_fg: $selected_fg_color; +$warning_color: #F27835; +$error_color: #FC4138; +$warning_fg_color: white; +$error_fg_color: white; +$success_color: #73d216; +$destructive_color: #F04A50; +$suggested_color: #4DADD4; +$destructive_fg_color: white; +$suggested_fg_color: white; + +$drop_target_color: #F08437; //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); $header_bg: red; -@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#eee8d5, 0.05); } -@if $transparency=='false' and $variant=='light' { $header_bg: #eee8d5; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#002b36, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #002b36; } +@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } +@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); $header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); -$header_fg: if($darker == 'true', saturate(transparentize(#657b83, 0.2), 10%), $header_fg); +$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#073642, 0.05), #073642); -$dark_sidebar_fg: #657b83; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); +$dark_sidebar_fg: #BAC3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; @@ -62,7 +69,7 @@ $panel_bg: darken($dark_sidebar_bg, 4.7%); $panel_fg: $dark_sidebar_fg; $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #657b83, darken($borders_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); $header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); $header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); @@ -76,19 +83,19 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #dc322f); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #cb4b16); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #dc322f); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #002b36); +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #657b83); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #002b36); +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #93a1a1); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #657b83); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #93a1a1); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 4a65924..057ed37 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -30,6 +30,7 @@ $font-family: Futura Bk bt, Cantarell, Sans-Serif; $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; $_bubble_borders_color: transparentize($osd_fg_color,0.8); +$_shell_fg_color: white; stage { font-family: $font-family; @@ -143,7 +144,7 @@ StScrollBar { -slider-active-background-color: $selected_bg_color; //active trough fill -slider-active-border-color: transparentize(black, 1); //active trough border -slider-border-width: 0; - -slider-handle-radius: 4px; + -slider-handle-radius: 0px; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -353,15 +354,15 @@ StScrollBar { } .modal-dialog-linked-button:last-child { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: $destructive_color; &:hover { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: lighten($destructive_color, 9%); } &:active { - color: $selected_fg_color; + color: $destructive_fg_color; background-color: darken($destructive_color, 5%); } } @@ -546,7 +547,37 @@ StScrollBar { } &-device-icon { icon-size: 64px; } - +} + +// +// Access Dialog +// +.access-dialog { + spacing: 30px; + + &-main-layout { + padding: 12px 20px 0; + spacing: 12px; + } + + &-content { + max-width: 28em; + spacing: 20px; + } + + &-icon { + min-width: 48px; + icon-size: 48px; + } + + &-title { + font-weight: bold; + } + + &-subtitle { + color: $fg_color; + font-weight: bold; + } } // @@ -685,7 +716,7 @@ StScrollBar { min-width: 64px; min-height: 64px; - color: $selected_fg_color; + color: $_shell_fg_color; background: none; border: none; border-radius: 5px; @@ -700,6 +731,10 @@ StScrollBar { border-radius: 2px; color: $selected_bg_color; } + .level-bar { + background-color: $selected_bg_color; + border-radius: 2px; + } } .resize-popup { @@ -731,6 +766,7 @@ StScrollBar { .item-box { padding: 8px; border-radius: 2px; + border: 1px solid transparent; &:outlined { padding: 8px; @@ -765,7 +801,7 @@ StScrollBar { color: $osd_fg_color; &:highlighted { - color: $selected_fg_color; + color: $_shell_fg_color; } } @@ -776,6 +812,11 @@ StScrollBar { } // +//Window Cycler +// +.cycler-highlight { border: 5px solid $selected_bg_color; } + +// // Workspace Switcher // .workspace-switcher { @@ -843,6 +884,8 @@ StScrollBar { // Top Bar // #panel { + $_panel_fg_color: $_shell_fg_color; + font-weight: bold; height: 2.1em; min-height: 27px; @@ -888,7 +931,7 @@ StScrollBar { -natural-hpadding: 10px; -minimum-hpadding: 6px; font-weight: bold; - color: $selected_fg_color; + color: $_panel_fg_color; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; @@ -901,7 +944,7 @@ StScrollBar { } &:hover { - color: $selected_fg_color; + color: $_panel_fg_color; background-color: transparentize(black, 0.83); border-bottom-width: 1px; border-color: transparent; @@ -1149,7 +1192,7 @@ StScrollBar { &:hover, &:focus { background-color: transparentize(black, 0.9); } - &:active { + &:active, &:selected { color: $fg_color; background-color: transparentize(black, 0.85); border-width: 0; //avoid jumparound due to today @@ -1521,9 +1564,9 @@ StScrollBar { .list-search-result-content { spacing: 12px; padding: 12px; } -.list-search-result-title { font-size: 1.5em; color: $selected_fg_color; } +.list-search-result-title { font-size: 1.5em; color: $_shell_fg_color; } -.list-search-result-description { color: darken($selected_fg_color, 20%); } +.list-search-result-description { color: darken($_shell_fg_color, 20%); } .search-provider-icon { padding: 15px; } .search-provider-icon-more { @@ -1579,7 +1622,7 @@ StScrollBar { .dash-label { border-radius: 3px; padding: 4px 12px; - color: $selected_fg_color; + color: $_shell_fg_color; background-color: transparentize(black, 0.3); text-align: center; -x-offset: 3px; @@ -1743,7 +1786,7 @@ StScrollBar { } %icon_tile { - color: $selected_fg_color; + color: $_shell_fg_color; border-radius: 2px; padding: 6px; border: 1px solid transparent; @@ -1766,6 +1809,7 @@ StScrollBar { } &:active > .overview-icon, &:checked > .overview-icon { + color: $selected_fg_color; background-color: $selected_bg_color; box-shadow: none; } @@ -2321,7 +2365,7 @@ $legacy_icon_size: 24px; padding-right: .3em; &:hover { - color: $selected_fg_color; + color: $_shell_fg_color; text-shadow: black 0px 2px 2px; } &:selected { @@ -2368,7 +2412,7 @@ $legacy_icon_size: 24px; border: 1px solid gray; padding: 4px; border-radius: 4px; - &:hover { border: 1px solid #fdf6e3; } + &:hover { border: 1px solid #ffffff; } } #lookingGlassExtensions { padding: 4px; } |