diff --git a/data/theme/_common.scss b/data/theme/_common.scss index 217390036..4c00f013a 100644 --- a/data/theme/_common.scss +++ b/data/theme/_common.scss @@ -4,6 +4,8 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; /* #{$cakeisalie} */ +$panel-corner-radius: 6px; + /* Copyright 2009, Red Hat, Inc. * * Portions adapted from Mx's data/style/default.css @@ -343,6 +345,24 @@ StScrollBar { padding: 12px; } +/* Tiled window previews */ +.tile-preview { + background-color: transparentize($selected_bg_color,0.5); + border: 1px solid $selected_bg_color; +} + + .tile-preview-left.on-primary { + border-radius: $panel-corner-radius $panel-corner-radius 0 0 0; + } + + .tile-preview-right.on-primary { + border-radius: 0 $panel-corner-radius 0 0; + } + + .tile-preview-left.tile-preview-right.on-primary { + border-radius: $panel-corner-radius $panel-corner-radius 0 0; + } + /* TOP BAR */ #panel { @@ -361,7 +381,7 @@ StScrollBar { } .panel-corner { - -panel-corner-radius: 6px; + -panel-corner-radius: $panel-corner-radius; -panel-corner-background-color: black; -panel-corner-border-width: 2px; -panel-corner-border-color: transparent; diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss index 164584a0a..0fb18cb59 100644 --- a/data/theme/_gnome-shell-old.scss +++ b/data/theme/_gnome-shell-old.scss @@ -22,28 +22,6 @@ -/* Tile previews */ -.tile-preview { - background-color: rgba(74, 144, 217, 0.35); - border: 1px solid #4a90d9; /* Adwaita selected bg color */ -} - -.tile-preview-left.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 6px 0 0 0; -} - -.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 0 6px 0 0; -} - -.tile-preview-left.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 6px 6px 0 0; -} - -/* Modal Dialogs */ /* End Session Dialog */ diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 1822d83b3..b8b599808 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -16,25 +16,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ -/* Tile previews */ -.tile-preview { - background-color: rgba(74, 144, 217, 0.35); - border: 1px solid #4a90d9; - /* Adwaita selected bg color */ } - -.tile-preview-left.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 6px 0 0 0; } - -.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 0 6px 0 0; } - -.tile-preview-left.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 6px 6px 0 0; } - -/* Modal Dialogs */ /* End Session Dialog */ .end-session-dialog { spacing: 42px; } @@ -942,6 +923,20 @@ StScrollBar { border-radius: 12px; padding: 12px; } +/* Tiled window previews */ +.tile-preview { + background-color: rgba(33, 93, 156, 0.5); + border: 1px solid #215d9c; } + +.tile-preview-left.on-primary { + border-radius: 6px 6px 0 0 0; } + +.tile-preview-right.on-primary { + border-radius: 0 6px 0 0; } + +.tile-preview-left.tile-preview-right.on-primary { + border-radius: 6px 6px 0 0; } + /* TOP BAR */ #panel { background-color: black;