From 981985ee5060574af7edaba3ce83daae028599e4 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 17 Mar 2016 11:36:37 +0100 Subject: [PATCH] High Contrast: remove an adwaita leftover ... a missing mixin which makes no sense in HC actually. --- gtk/theme/HighContrast/_common.scss | 23 ++++--------------- .../HighContrast/gtk-contained-inverse.css | 10 ++++---- gtk/theme/HighContrast/gtk-contained.css | 20 ++++++++-------- 3 files changed, 18 insertions(+), 35 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 8ebf813f50..1b5d59aa40 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -685,32 +685,19 @@ button { %needs_attention { animation: needs_attention 150ms ease-in; - $_dot_shadow: _text_shadow_color(); - $_dot_shadow_r: if($variant=='light',0.5,0.45); background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($_dot_color), - to(transparent)), - -gtk-gradient(radial, - center center, 0, - center center, $_dot_shadow_r, - to($_dot_shadow), to(transparent)); - background-size: 6px 6px, 6px 6px; + background-size: 6px 6px; background-repeat: no-repeat; - @if $variant == 'light' { background-position: right 3px, right 4px; } + background-position: right 3px; - @else { background-position: right 3px, right 2px; } + &:backdrop { background-size: 6px 6px;} - &:backdrop { background-size: 6px 6px, 0 0;} - - &:dir(rtl) { - @if $variant == 'light' { background-position: left 3px, left 4px; } - - @else { background-position: left 3px, left 2px; } - } + &:dir(rtl) { background-position: left 3px; } } @@ -862,8 +849,6 @@ button.color { &, overlay { border-radius: 0; } @if $variant == 'light' { - box-shadow: 0 1px _text_shadow_color(); - &:disabled, &:backdrop { box-shadow: none; } } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 88008d9153..65a7a8b999 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -832,16 +832,16 @@ button.destructive-action { .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#aaa), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(_text_shadow_color()), to(transparent)); - background-size: 6px 6px, 6px 6px; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#aaa), to(transparent)); + background-size: 6px 6px; background-repeat: no-repeat; - background-position: right 3px, right 2px; } + background-position: right 3px; } .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, stacksidebar row.needs-attention > label:backdrop { - background-size: 6px 6px, 0 0; } + background-size: 6px 6px; } .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) { - background-position: left 3px, left 2px; } + background-position: left 3px; } .inline-toolbar toolbutton > button { border-width: 2px; diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index f5b3f012be..bf534614dd 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -834,16 +834,16 @@ button.destructive-action { .stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#000), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(_text_shadow_color()), to(transparent)); - background-size: 6px 6px, 6px 6px; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#000), to(transparent)); + background-size: 6px 6px; background-repeat: no-repeat; - background-position: right 3px, right 4px; } + background-position: right 3px; } .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, stacksidebar row.needs-attention > label:backdrop { - background-size: 6px 6px, 0 0; } + background-size: 6px 6px; } .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) { - background-position: left 3px, left 4px; } + background-position: left 3px; } .inline-toolbar toolbutton > button { border-width: 2px; @@ -1034,12 +1034,10 @@ popover.background radiobutton arrow { button.color { padding: 4px; } - button.color colorswatch:only-child { - box-shadow: 0 1px _text_shadow_color(); } - button.color colorswatch:only-child, button.color colorswatch:only-child overlay { - border-radius: 0; } - button.color colorswatch:only-child:disabled, button.color colorswatch:only-child:backdrop { - box-shadow: none; } + button.color colorswatch:only-child, button.color colorswatch:only-child overlay { + border-radius: 0; } + button.color colorswatch:only-child:disabled, button.color colorswatch:only-child:backdrop { + box-shadow: none; } /********* * Links *