From aed7ca1b3d05c4da6988f93d4f6ea557d6b6e55f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 15 Feb 2016 13:28:46 +0100 Subject: [PATCH] Revert "Adwaita: no rounded corners for backdrop tiled windows" This reverts commit aa4b385398e99fed6dd71791eb5a9e2e5ea4db9d. Erroneusly pushed unfinished stuff... --- gtk/theme/Adwaita/_common.scss | 17 +++++----- gtk/theme/Adwaita/_drawing.scss | 9 ----- gtk/theme/Adwaita/gtk-contained-dark.css | 43 +++++++++++++++--------- gtk/theme/Adwaita/gtk-contained.css | 43 +++++++++++++++--------- 4 files changed, 62 insertions(+), 50 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 0903a4ebb0..0bab3ca6c0 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1361,7 +1361,7 @@ headerbar { } .tiled &, - .maximized & { &:backdrop, & { border-radius: 0; }} + .maximized & { border-radius: 0; } // squared corners when the window is max'd or tile &.default-decoration { padding: 0 4px; @@ -2187,19 +2187,19 @@ switch { min-height: 27px; border: 1px solid; border-radius: 3px; - @include slider; -/* @include button(normal); box-shadow: inset 0 1px if($variant=='light', white, transparentize(white, 0.85)), - inset 0 -2px white, + inset 0 -2px transparentize($bg_color, 0.4), inset 0 -1px mix($bg_color, $borders_color, 50%); -*/ } &:hover slider { - @include slider; - // FIXME hover state todo + @include button(hover); + box-shadow: inset 0 1px if($variant=='light', white, + transparentize(white, 0.85)), + inset 0 -2px transparentize($bg_color, 0.4), + inset 0 -1px mix($bg_color, $borders_color, 50%); } &:active slider { border: 1px solid $selected_borders_color; } @@ -2329,8 +2329,7 @@ radio { min-width: 14px; border: 1px solid; -gtk-icon-source: none; - // @include button(normal); - @include slider; + @include button(normal); &:hover { @include button(hover); } &:active { @include button(active); } &:disabled { @include button(insensitive); } diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss index b2f35e7bc5..1434dac861 100644 --- a/gtk/theme/Adwaita/_drawing.scss +++ b/gtk/theme/Adwaita/_drawing.scss @@ -591,12 +591,3 @@ border: none; box-shadow: none; } - -@mixin slider { - background-image: linear-gradient(to top, darken($headerbar_color, 6%), $headerbar_color 30%); - border-color: $borders_color; - box-shadow: inset 0 1px if($variant=='light', white, _button_hilight_color($headerbar_color)), - inset 0 -2px if($variant=='light', transparentize(white, 0.4), white), - inset 0 -1px darken($headerbar_color, 13%), - 0 1px transparentize(black, 0.9); -} diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 17e2785180..b40fcf8084 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1827,10 +1827,8 @@ headerbar { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); -gtk-icon-shadow: none; } - .tiled .titlebar:backdrop:not(headerbar), .tiled .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .tiled - headerbar:backdrop, .tiled + .tiled .titlebar:not(headerbar), .maximized .titlebar:not(headerbar), .tiled headerbar, .maximized - headerbar:backdrop, .maximized headerbar { border-radius: 0; } .default-decoration.titlebar:not(headerbar), @@ -2416,20 +2414,29 @@ switch { min-height: 27px; border: 1px solid; border-radius: 3px; - background-image: linear-gradient(to top, #232727, #323737 30%); + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px white, inset 0 -1px #121414, 0 1px rgba(0, 0, 0, 0.1); - /* - @include button(normal); - box-shadow: inset 0 1px if($variant=='light', white, - transparentize(white, 0.85)), - inset 0 -2px white, - inset 0 -1px mix($bg_color, $borders_color, 50%); - */ } + background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); + text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; } switch:hover slider { - background-image: linear-gradient(to top, #232727, #323737 30%); + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px white, inset 0 -1px #121414, 0 1px rgba(0, 0, 0, 0.1); } + /* + background-image: linear-gradient(to bottom, + lighten($c, 16%), + lighten($c, 6%) 40%, + lighten($c, 2%)); + */ + background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434); + text-shadow: 0 -1px rgba(0, 0, 0, 0.76376); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; } switch:active slider { border: 1px solid #0f2b48; } switch:disabled slider { @@ -2812,9 +2819,13 @@ radio { min-width: 14px; border: 1px solid; -gtk-icon-source: none; - background-image: linear-gradient(to top, #232727, #323737 30%); + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px white, inset 0 -1px #121414, 0 1px rgba(0, 0, 0, 0.1); } + background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f); + text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); } check:only-child, radio:only-child { margin: 0; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b545116cf8..4e9a725445 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1831,10 +1831,8 @@ headerbar { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); -gtk-icon-shadow: none; } - .tiled .titlebar:backdrop:not(headerbar), .tiled .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .tiled - headerbar:backdrop, .tiled + .tiled .titlebar:not(headerbar), .maximized .titlebar:not(headerbar), .tiled headerbar, .maximized - headerbar:backdrop, .maximized headerbar { border-radius: 0; } .default-decoration.titlebar:not(headerbar), @@ -2427,20 +2425,29 @@ switch { min-height: 27px; border: 1px solid; border-radius: 3px; - background-image: linear-gradient(to top, #e6e6e4, #f4f4f4 30%); + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); border-color: #9d9d99; - box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #d4d4d2, 0 1px rgba(0, 0, 0, 0.1); - /* - @include button(normal); - box-shadow: inset 0 1px if($variant=='light', white, - transparentize(white, 0.85)), - inset 0 -2px white, - inset 0 -1px mix($bg_color, $borders_color, 50%); - */ } + background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; } switch:hover slider { - background-image: linear-gradient(to top, #e6e6e4, #f4f4f4 30%); + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); border-color: #9d9d99; - box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #d4d4d2, 0 1px rgba(0, 0, 0, 0.1); } + /* + background-image: linear-gradient(to bottom, + lighten($c, 16%), + lighten($c, 6%) 40%, + lighten($c, 2%)); + */ + background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; } switch:active slider { border: 1px solid #184472; } switch:disabled slider { @@ -2942,9 +2949,13 @@ radio { min-width: 14px; border: 1px solid; -gtk-icon-source: none; - background-image: linear-gradient(to top, #e6e6e4, #f4f4f4 30%); + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); border-color: #9d9d99; - box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #d4d4d2, 0 1px rgba(0, 0, 0, 0.1); } + background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0); } check:only-child, radio:only-child { margin: 0; }