[gtk/wip/jimmac/adwaita-3-32] Adwaita: don't do undershoot
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/adwaita-3-32] Adwaita: don't do undershoot
- Date: Tue, 15 Jan 2019 16:30:42 +0000 (UTC)
commit fce2f886d2caa9b589c6bcb52b164577aa740db6
Author: Jakub Steiner <jimmac gmail com>
Date: Tue Jan 15 17:29:34 2019 +0100
Adwaita: don't do undershoot
- No need to indicate overflown content. No other OS does this.
fixes #1591
gtk/theme/Adwaita/_common.scss | 14 --------
gtk/theme/Adwaita/_drawing.scss | 56 --------------------------------
gtk/theme/Adwaita/gtk-contained-dark.css | 12 -------
gtk/theme/Adwaita/gtk-contained.css | 12 -------
4 files changed, 94 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 19871b3960..569927d0cf 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -277,10 +277,6 @@ entry {
&.right { margin-left: 6px; }
}
- undershoot {
- &.left { @include undershoot(left); }
- &.right { @include undershoot(right); }
- }
&.flat {
&:focus, &:backdrop, &:disabled, &:backdrop:disabled, & {
@@ -3677,16 +3673,6 @@ scrolledwindow {
}
}
- // Overflow indication, works similarly to the overshoot, the size if fixed tho.
- undershoot {
- &.top { @include undershoot(top); }
-
- &.bottom { @include undershoot(bottom); }
-
- &.left { @include undershoot(left); }
-
- &.right { @include undershoot(right); }
- }
junction { // the small square between two scrollbars
border-color: transparent;
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index e398e65d49..b65ad8b970 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -581,60 +581,4 @@
box-shadow: none; //
}
-@mixin undershoot($p) {
-//
-// undershoot
-//
-// $p: position
-//
-// possible $p values:
-// top, bottom, right, left
-//
-
-
- $_gradient_dir: left;
- $_dash_bg_size: 10px 1px;
- $_gradient_repeat: repeat-x;
- $_bg_pos: center $p;
-
- background-color: transparent; // shouldn't be needed, but better to be sure;
-
- @if ($p == left) or ($p == right) {
- $_gradient_dir: top;
- $_dash_bg_size: 1px 10px;
- $_gradient_repeat: repeat-y;
- $_bg_pos: $p center;
- }
-
-
- padding-#{$p}: 1px;
- background-size: $_dash_bg_size;
- background-repeat: $_gradient_repeat;
- background-origin: content-box;
- background-position: $_bg_pos;
- border: none;
- box-shadow: none;
-
- // Replace dashed line with light shadow
- $_undershoot_shadow_color: if($variant=='light', darken(white, 20%), lighten(black, 8%));
- $_undershoot_shadow_alpha: 0.8;
-
- @if ($p == "left") {
- box-shadow: inset 2px 0 0 transparentize($_undershoot_shadow_color, $_undershoot_shadow_alpha),
- inset 1px 0 0 transparentize(darken($_undershoot_shadow_color, 20%),
$_undershoot_shadow_alpha);
- }
- @else if ($p == "right") {
- box-shadow: inset -2px 0 0 transparentize($_undershoot_shadow_color,$_undershoot_shadow_alpha),
- inset -1px 0 0 transparentize( darken($_undershoot_shadow_color, 20%),
$_undershoot_shadow_alpha);
- }
- @else if ($p == "top") {
- box-shadow: inset 0 2px 0 0 transparentize($_undershoot_shadow_color,$_undershoot_shadow_alpha),
- inset 0 1px 0 0 transparentize(darken($_undershoot_shadow_color, 20%),
$_undershoot_shadow_alpha);
- }
- @else if ($p == "bottom") {
- box-shadow: inset 0 -2px 0 0 transparentize($_undershoot_shadow_color,$_undershoot_shadow_alpha),
- inset 0 -1px 0 0 transparentize(darken($_undershoot_shadow_color, 20%),
$_undershoot_shadow_alpha);
- }
-
-}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 8c8e6d46a9..64b60c5940 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -90,10 +90,6 @@ spinbutton:not(.vertical) image.left, entry image.left { margin-right: 6px; }
spinbutton:not(.vertical) image.right, entry image.right { margin-left: 6px; }
-spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent;
padding-left: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box;
background-position: left center; border: none; box-shadow: none; box-shadow: inset 2px 0 0 rgba(20, 20, 20,
0.2), inset 1px 0 0 rgba(0, 0, 0, 0.2); }
-
-spinbutton:not(.vertical) undershoot.right, entry undershoot.right { background-color: transparent;
padding-right: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box;
background-position: right center; border: none; box-shadow: none; box-shadow: inset -2px 0 0 rgba(20, 20,
20, 0.2), inset -1px 0 0 rgba(0, 0, 0, 0.2); }
-
spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical),
spinbutton.flat:disabled:not(.vertical), spinbutton.flat:backdrop:disabled:not(.vertical),
spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat:backdrop, entry.flat:disabled,
entry.flat:backdrop:disabled, entry.flat { min-height: 0; padding: 2px; background-color: transparent;
border-color: transparent; border-radius: 0; }
spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #15539e; border-color: #030c17; }
@@ -1549,14 +1545,6 @@ scrolledwindow overshoot.right { background-image: -gtk-gradient(radial, right c
scrolledwindow overshoot.right:backdrop { background-image: -gtk-gradient(radial, right center, 0, right
center, 0.5, to(#2a2a2b), to(rgba(42, 42, 43, 0))); background-size: 5% 100%; background-repeat: no-repeat;
background-position: right center; background-color: transparent; border: none; box-shadow: none; }
-scrolledwindow undershoot.top { background-color: transparent; padding-top: 1px; background-size: 10px 1px;
background-repeat: repeat-x; background-origin: content-box; background-position: center top; border: none;
box-shadow: none; box-shadow: inset 0 2px 0 0 rgba(20, 20, 20, 0.2), inset 0 1px 0 0 rgba(0, 0, 0, 0.2); }
-
-scrolledwindow undershoot.bottom { background-color: transparent; padding-bottom: 1px; background-size: 10px
1px; background-repeat: repeat-x; background-origin: content-box; background-position: center bottom; border:
none; box-shadow: none; box-shadow: inset 0 -2px 0 0 rgba(20, 20, 20, 0.2), inset 0 -1px 0 0 rgba(0, 0, 0,
0.2); }
-
-scrolledwindow undershoot.left { background-color: transparent; padding-left: 1px; background-size: 1px
10px; background-repeat: repeat-y; background-origin: content-box; background-position: left center; border:
none; box-shadow: none; box-shadow: inset 2px 0 0 rgba(20, 20, 20, 0.2), inset 1px 0 0 rgba(0, 0, 0, 0.2); }
-
-scrolledwindow undershoot.right { background-color: transparent; padding-right: 1px; background-size: 1px
10px; background-repeat: repeat-y; background-origin: content-box; background-position: right center; border:
none; box-shadow: none; box-shadow: inset -2px 0 0 rgba(20, 20, 20, 0.2), inset -1px 0 0 rgba(0, 0, 0, 0.2); }
-
scrolledwindow junction { border-color: transparent; border-image: linear-gradient(to bottom, #252526 1px,
transparent 1px) 0 0 0 1/0 1px stretch; background-color: #363537; }
scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 019e7ef16b..5ac5ba5555 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -90,10 +90,6 @@ spinbutton:not(.vertical) image.left, entry image.left { margin-right: 6px; }
spinbutton:not(.vertical) image.right, entry image.right { margin-left: 6px; }
-spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent;
padding-left: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box;
background-position: left center; border: none; box-shadow: none; box-shadow: inset 2px 0 0 rgba(204, 204,
204, 0.2), inset 1px 0 0 rgba(153, 153, 153, 0.2); }
-
-spinbutton:not(.vertical) undershoot.right, entry undershoot.right { background-color: transparent;
padding-right: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box;
background-position: right center; border: none; box-shadow: none; box-shadow: inset -2px 0 0 rgba(204, 204,
204, 0.2), inset -1px 0 0 rgba(153, 153, 153, 0.2); }
-
spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical),
spinbutton.flat:disabled:not(.vertical), spinbutton.flat:backdrop:disabled:not(.vertical),
spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat:backdrop, entry.flat:disabled,
entry.flat:backdrop:disabled, entry.flat { min-height: 0; padding: 2px; background-color: transparent;
border-color: transparent; border-radius: 0; }
spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #3584e4; border-color: #3584e4; }
@@ -1569,14 +1565,6 @@ scrolledwindow overshoot.right { background-image: -gtk-gradient(radial, right c
scrolledwindow overshoot.right:backdrop { background-image: -gtk-gradient(radial, right center, 0, right
center, 0.5, to(#d5d0cc), to(rgba(213, 208, 204, 0))); background-size: 5% 100%; background-repeat:
no-repeat; background-position: right center; background-color: transparent; border: none; box-shadow: none; }
-scrolledwindow undershoot.top { background-color: transparent; padding-top: 1px; background-size: 10px 1px;
background-repeat: repeat-x; background-origin: content-box; background-position: center top; border: none;
box-shadow: none; box-shadow: inset 0 2px 0 0 rgba(204, 204, 204, 0.2), inset 0 1px 0 0 rgba(153, 153, 153,
0.2); }
-
-scrolledwindow undershoot.bottom { background-color: transparent; padding-bottom: 1px; background-size: 10px
1px; background-repeat: repeat-x; background-origin: content-box; background-position: center bottom; border:
none; box-shadow: none; box-shadow: inset 0 -2px 0 0 rgba(204, 204, 204, 0.2), inset 0 -1px 0 0 rgba(153,
153, 153, 0.2); }
-
-scrolledwindow undershoot.left { background-color: transparent; padding-left: 1px; background-size: 1px
10px; background-repeat: repeat-y; background-origin: content-box; background-position: left center; border:
none; box-shadow: none; box-shadow: inset 2px 0 0 rgba(204, 204, 204, 0.2), inset 1px 0 0 rgba(153, 153, 153,
0.2); }
-
-scrolledwindow undershoot.right { background-color: transparent; padding-right: 1px; background-size: 1px
10px; background-repeat: repeat-y; background-origin: content-box; background-position: right center; border:
none; box-shadow: none; box-shadow: inset -2px 0 0 rgba(204, 204, 204, 0.2), inset -1px 0 0 rgba(153, 153,
153, 0.2); }
-
scrolledwindow junction { border-color: transparent; border-image: linear-gradient(to bottom, #cdc7c2 1px,
transparent 1px) 0 0 0 1/0 1px stretch; background-color: #cecece; }
scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]