other/Adwaita-Dark-Green: gtk-3.20/

comparison gtk-3.20/_common.scss @ 43:d8eaee5178b7

Update to GTK 3.22 at revision ecf9c06

author	IBBoard <dev@ibboard.co.uk>
date	Sat, 01 Apr 2017 11:21:01 +0100
parents	1b8713fff1e1
children	b85e4f7ff7c8

comparison

equal deleted inserted replaced

-:464e0bd93ed9
+:d8eaee5178b7
 // We use the outline properties to signal the focus properties
 // to the adwaita engine: using real CSS properties is faster,
 // and we don't use any outlines for now.
-outline-color: transparentize($fg_color, 0.7);
+outline-color: gtkalpha(currentColor, 0.3);
 outline-style: dashed;
 outline-offset: -3px;
 outline-width: 1px;
 -gtk-outline-radius: 2px;
 background-color: $base_color;
 &:backdrop {
 color: $backdrop_text_color;
 background-color: $backdrop_base_color;
+&:disabled { color: $backdrop_insensitive_color; }
+}
+&:disabled {
+color: $insensitive_fg_color;
+background-color: $insensitive_bg_color;
 }
 &:selected {
 &:focus, & {
 @extend %selected_items;
 flowbox {
 rubberband { @extend rubberband; }
 flowboxchild {
 padding: 3px;
-border-radius: 3px;
 &:selected {
 @extend %selected_items;
 outline-offset: -2px;
 }
 }
+}
+.content-view .tile {
+margin: 2px;
+background-color: if($variant=='light', transparent, black);
+border-radius: 0;
+padding: 0;
+&:backdrop { background-color: if($variant=='light', transparent, darken($backdrop_base_color,5%)); }
+&:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
+&:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
 }
 label {
 caret-color: currentColor; // this shouldn't be needed.
 .sidebar label { padding: 6px 12px; }
 .sidebar label.highlight { background-color: mix($bg_color, $fg_color, 80%); }
 }
-%osd, .osd {
+%osd,
+.osd {
 color: $osd_fg_color;
 border: none;
 background-color: $osd_bg_color;
 background-clip: padding-box;
-outline-color: transparentize($osd_fg_color, 0.7);
 text-shadow: 0 1px black;
 -gtk-icon-shadow: 0 1px black;
 &:backdrop {
 text-shadow: none;
 transition: all 200ms $ease-out-quad;
 @include entry(normal);
 image { // icons inside the entry
-&.left { padding-left: 0; padding-right: 6px; }
+&.left { margin-right: 6px; }
-&.right { padding-left: 6px; padding-right: 0; }
+&.right { margin-left: 6px; }
 }
 undershoot {
 &.left { @include undershoot(left); }
 &.right { @include undershoot(right); }
 &.flat {
 &:focus, & {
 min-height: 0;
 padding: 2px;
-background-image: none;
+background-color: transparent;
 border-color: transparent;
 border-radius: 0;
 }
 }
 selection { background-color: $e_color; }
 }
 }
-& image { // entry icons colors
+image { // entry icons colors
 color: mix($fg_color, $base_color, 80%);
 &:hover { color: $fg_color; }
 &:active { color: $selected_bg_color; }
 // brighter border between linked entries
 &:not(:disabled) + entry:not(:disabled),
 &:not(:disabled) + %entry:not(:disabled) {
 border-top-color: mix($borders_color, $base_color, 30%);
-background-image: linear-gradient(to bottom, $base_color);
+&:backdrop { border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); }
-&:backdrop {
-border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-background-image: linear-gradient(to bottom, $backdrop_base_color);
-}
 }
 // brighter border between linked insensitive entries
 &:disabled + %entry:disabled,
 &:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); }
-// color back the top border of a linked focused entry following another entry and add back the focus shadow.
+// color back the top border of a linked focused entry following another entry.
 // :not(:only-child) is a specificity bump hack.
 + %entry:focus:not(:only-child),
 + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
 + %entry:drop(active):not(:only-child),
 &.image-button { min-width: 32px; }
 color: $osd_fg_color;
 border-radius: 5px;
-outline-color: transparentize($osd_fg_color, 0.7);  //FIXME: define a color var?
 @include button(osd);
 border: none;
 box-shadow: none;
 }
 }
 }
 }
-//inline-toolbar buttons
+// hide separators
+&.font,
+&.file { separator { background-color: transparent; }}
+&.font { > box > box > label { font-weight: bold; }}
+// inline-toolbar buttons
 .inline-toolbar &, .inline-toolbar &:backdrop {
 border-radius: 2px;
 border-width: 1px;
 @extend %linked;
 }
 .linked.vertical > &,
 .linked.vertical > &:hover,
 .linked.vertical > &:active,
 .linked.vertical > &:checked,
 .linked.vertical > &:backdrop { @extend %linked_vertical; }
+&.circular { // The Bloody Circul Button
+border-radius: 9999px;
+-gtk-outline-radius: 9999px;
+label { padding: 0; }
+// the followind code is needed since we use a darker bottom border on buttons, which looks pretty
+// bad with a 100% border radius (see https://bugzilla.gnome.org/show_bug.cgi?id=771205 for details),
+// so on relevant states we an additional background-image with a gradient clipped on the border-box,
+// so setting a transparent border would reveal it.
+// FIXME: take care of colored circular button.
+$_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
+&:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) {
+@include button(normal);
+background-image: $button_fill, $_border_bg;
+border-color: transparent;
+}
+&:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
+@include button(hover);
+background-image: $button_fill, $_border_bg;
+border-color: transparent;
+}
+background-origin: padding-box, border-box;
+background-clip: padding-box, border-box;
+}
 }
 %needs_attention {
 animation: needs_attention 150ms ease-in;
 $_dot_shadow: _text_shadow_color();
 %undecorated_button {
 background-color: transparent;
 background-image: none;
 border-color: transparent;
-box-shadow: inset 0 1px transparentize(white,1),
+box-shadow: inset 0 1px transparentize(white, 1),
 0 1px transparentize(white, 1);
 text-shadow: none;
 -gtk-icon-shadow: none;
 }
 &:selected { @extend %selected_items; }
 &:backdrop,
 &:backdrop:hover { @extend %undecorated_button; }
-// FIXME: remove the following when the checks/radios rewrite lands
-check:last-child,
-radio:last-child { margin-left: 8px; }
-check:first-child,
-radio:first-child { margin-right: 8px; }
 }
 modelbutton.flat arrow {
 background: none;
 &, overlay { border-radius: 0; }
 @if $variant == 'light' {
 box-shadow: 0 1px _text_shadow_color();
+.osd & { box-shadow: none; }
+}
+}
+@if $variant == 'light' {
+.osd &, & {
 &:disabled,
-&:backdrop { box-shadow: none; }
+&:backdrop,
+&:active,
+&:checked { colorswatch:only-child { box-shadow: none; }}
 }
 }
 }
 /*********
 * Links *
 *********/
+%link,
 *:link {
 color: $link_color;
 &:visited {
 color: $link_visited_color;
 @extend %undecorated_button;
 text-shadow: none;
 }
-> label { text-decoration-line: underline; }
+> label {
+@extend %link;
+text-decoration-line: underline;
+}
 }
 /*****************
 * GtkSpinButton *
 background: none;
 background-color: transparent;
 border: none;
 border-radius: 0;
 box-shadow: none;
+&:backdrop:disabled { background-color: transparent; }
 }
 button {
 min-height: 16px;
 margin: 0;
 &:hover {
 color: $fg_color;
 background-color: $base_hover_color;
 }
-&:disabled { color: transparentize($insensitive_fg_color, 0.7); }
+&:disabled {
+color: transparentize($insensitive_fg_color, 0.7);
+background-color: transparent;
+}
 &:active {
 background-color: transparentize(black, 0.9);
 box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
 }
 transition: $backdrop_transition;
 }
 &:backdrop:disabled {
 color: transparentize($backdrop_insensitive_color,0.7);
-background-image: none;
+background-color: transparent;
 border-style: none none none solid; // It is needed or it gets overridden
 &:dir(rtl) { border-style: none solid none none; }
 }
+&:dir(ltr):last-child { border-radius: 0 3px 3px 0; }
+&:dir(rtl):first-child { border-radius: 3px 0 0 3px; }
 }
 }
 // OSD horizontal
 .osd &:not(.vertical) {
 border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
 -gtk-icon-shadow: none;
 box-shadow: none;
 }
-&:last-child { border-radius: 0 3px 3px 0; }
+&:dir(ltr):last-child { border-radius: 0 3px 3px 0; }
 &:dir(rtl):first-child { border-radius: 3px 0 0 3px; }
 }
 }
 // so that it's linked
 // FIXME: this should not be set at all, but otherwise it gets the wrong
 // color
 &:disabled { color: $insensitive_fg_color; }
 &:backdrop:disabled { color: $backdrop_insensitive_color; }
 &:drop(active) {
 border-color: transparent;
 box-shadow: none;
 headerbar {
 padding: 0 6px;
 min-height: 46px;
 border-width: 0 0 1px;
 border-style: solid;
-border-color: $borders_color;
+border-color: $alt_borders_color;
 border-radius: 0;
 @include headerbar_fill;
 &:backdrop {
 transition: $backdrop_transition;
 }
 .title {
-font-weight: bold;
 padding-left: 12px;
 padding-right: 12px;
+font-weight: bold;
 }
 .subtitle {
 font-size: smaller;
 padding-left: 12px;
 &.selection-mode {
 $_hc: mix($top_hilight,$selected_bg_color, 50%); // hilight color
 color: $selected_fg_color;
+border-color: $selected_borders_color;
 text-shadow: 0 -1px transparentize(black, 0.5);
-border-color: $selected_borders_color;
 @include headerbar_fill($selected_bg_color, $_hc);
 &:backdrop {
 background-color: $selected_bg_color;
 }
 .selection-menu {
 &:backdrop, & {
 border-color: transparentize($selected_bg_color, 1);
-background-image: linear-gradient(to bottom, transparentize($selected_bg_color, 1));
+background-color: transparentize($selected_bg_color, 1);
+background-image: none;
 box-shadow: none;
 padding-left: 10px;
 padding-right: 10px;
 GtkArrow { -GtkArrow-arrow-scaling: 1; }
 .tiled &,
 .maximized & { &:backdrop, & { border-radius: 0; }} // squared corners when the window is maximized or tiled
 &.default-decoration {
+min-height: 28px;
 padding: 4px;
-min-height: 28px;
 button.titlebutton {
 min-height: 26px;
 min-width: 26px;
 margin: 0;
 padding: 0;
+}
+}
+.solid-csd & {
+&:backdrop, & {
+&:dir(rtl), &:dir(ltr) { // specificity bump
+margin-left: -1px;
+margin-right: -1px;
+margin-top: -1px;
+border-radius: 0;
+box-shadow: none;
+}
 }
 }
 }
 headerbar {
 margin-top: 9px;
 margin-bottom: 9px;
 }
 }
-.background:not(.tiled):not(.maximized) .titlebar {
+.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar {
 &:backdrop, & {
 border-top-left-radius: 7px;
 border-top-right-radius: 7px;
 }
 }
-headerbar {
+headerbar { // headerbar border rounding
-window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case
+window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned container case
-window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }}
+window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }}
+window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }}
-window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }}
+window:not(.tiled):not(.maximized):not(.solid-csd) stack & { // tackles the stacked headerbars case
+&:first-child, &:last-child {
+&:backdrop, & {
+border-top-left-radius: 7px;
+border-top-right-radius: 7px;
+}
+}
+}
 }
 .titlebar:not(headerbar) {
 window.csd > & {
 // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases
 border-style: none;
 border-color: transparent;
 box-shadow: none;
 }
-> separator { background-color: $borders_color; }
+> separator { background-color: $borders_color; }  // FIXME: use darker border?
 @extend %titlebar;
 }
 -GtkTreeView-grid-line-width: 1;
 -GtkTreeView-grid-line-pattern: '';
 -GtkTreeView-tree-line-width: 1;
 -GtkTreeView-tree-line-pattern: '';
 -GtkTreeView-expander-size: 16;
 }
 border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
 border-top-color: $bg_color;                         // while this is the grid lines color, better then nothing
 rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
 &.expander {
 -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
 &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
-color: mix($fg_color, $base_color, 70%);
+color: mix($text_color, $base_color, 70%);
-&:hover { color: $fg_color; }
+&:hover { color: $text_color; }
 &:selected {
 color: mix($selected_fg_color, $selected_bg_color, 70%);
 &:hover { color: $selected_fg_color; }
 border: 1px solid $selected_borders_color;
 border-radius: 4px;
 background-color: $selected_bg_color;
 background-image: linear-gradient(to bottom,
 $selected_bg_color,
-darken($selected_bg_color,10%));
+darken($selected_bg_color, 10%));
-box-shadow: inset 0 1px if($variant=='light', transparentize(white,0.7),
+box-shadow: inset 0 1px if($variant=='light', transparentize(white, 0.7), transparentize(white, 0.85)),
-transparentize(white,0.85)),
+0 1px if($variant=='light', transparentize(black, 0.8), transparentize(black, 0.9));
-0 1px if($variant=='light', transparentize(black, 0.8),
-transparentize(black,0.9));
 &:selected {
 &:focus, & {
 border-radius: 4px;
 box-shadow: none;
 }
 @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
-background-image: linear-gradient(to bottom,
+background-image: linear-gradient(to bottom, $base_color, darken($base_color,10%));
-$base_color,
-darken($base_color,10%));
 &:backdrop {
 @if $variant == 'light' {
 color: $selected_bg_color;
 border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?)
 button.dnd,
 header.button.dnd { // for treeview-like derive widgets
 &:active, &:selected, &:hover, & {
 padding: 0 6px;
-transition: none;
+color: $base_color;
 background-image: none;
 background-color: $selected_bg_color;
-color: $base_color;
+border-style: none;
 border-radius: 0;
-border-style: none;
 box-shadow: inset 0 0 0 1px $base_color;
 text-shadow: none;
+transition: none;
 }
 }
 acceleditor > label { background-color: $selected_bg_color; } // see tests/testaccel to test
 }
 %column_header_button {
 padding: 0 6px;
-border-radius: 0;
 background-image: none;
-text-shadow: none;
 border-style: none solid solid none;
 border-color: $bg_color;
+border-radius: 0;
+text-shadow: none;
 &:disabled {
 border-color: $bg_color;
 background-image: none;
 }
 &:backdrop {
+color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
 border-color: $backdrop_bg_color;
 border-style: none solid solid none;
-color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
 background-image: none;
 background-color: $backdrop_base_color;
 &:disabled {
 border-color: $backdrop_bg_color;
 }
 separator { margin: 3px; }
 list separator { margin: 0px; }
-checkbutton,
-radiobutton { @extend modelbutton.flat; }
 }
 /*************
 * Notebooks *
 *************/
 }
 }
 &.horizontal {
 button {
-&.down { -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); }
+&.down { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
-&.up { -gtk-icon-source: -gtk-icontheme('pan-left-symbolic'); }
+&.up { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); }
 }
 }
 }
 treeview ~ scrollbar.vertical {
 **********/
 switch {
 font-weight: bold;
 font-size: smaller;
 outline-offset: -4px;
-box-shadow: inset 0 1px transparentize(black, 0.9), // needs to be set here
-_widget_edge(transparent);              // otherwise it gets
-// clipped
 // similar to the .scale
 border: 1px solid $borders_color;
 border-radius: 3px;
 color: $fg_color;
-background-image: linear-gradient(to bottom, mix($bg_color, $borders_color, 60%));
+background-color: $dark_fill;
 text-shadow: 0 1px transparentize(black, 0.9);
 &:checked {
-color: white;
+color: $selected_fg_color;
 border-color: $selected_borders_color;
 background-color: $selected_bg_color;
-background-image: none;
-box-shadow: _widget_edge(transparent);
 text-shadow: 0 1px transparentize($selected_borders_color, 0.5),
 0 0 2px transparentize(white, 0.4);
 }
 &:disabled {
 color: $insensitive_fg_color;
 border-color: $borders_color;
-background-image: none;
 background-color: $insensitive_bg_color;
-box-shadow: _widget_edge(transparent);
 text-shadow: none;
 }
 &:backdrop {
 color: $backdrop_fg_color;
 border-color: $backdrop_borders_color;
-background-image: linear-gradient(to bottom, $backdrop_dark_fill);
+background-color: $backdrop_dark_fill;
-box-shadow: none;
 text-shadow: none;
 transition: $backdrop_transition;
 &:checked {
 @if $variant == 'light' { color: $backdrop_bg_color; }
 border-color: if($variant == 'light', $selected_bg_color,
 $selected_borders_color);
-background-image: linear-gradient(to bottom, $selected_bg_color);
+background-color: $selected_bg_color;
-box-shadow: none;
+}
-}
-}
+&:disabled {
+color: $backdrop_insensitive_color;
-&:disabled {
+border-color: $backdrop_borders_color;
-color: $backdrop_insensitive_color;
+background-color: $insensitive_bg_color;
-border-color: $backdrop_borders_color;
+}
-background-image: none;
-background-color: $insensitive_bg_color;
 }
 slider {
 margin: -1px;
 min-width: 44px;
 (':backdrop', '-backdrop-selectionmode'),
 (':checked', '-checked-selectionmode'),
 (':checked:hover', '-checked-hover-selectionmode'),
 (':checked:active', '-checked-active-selectionmode'),
 (':backdrop:checked', '-checked-backdrop-selectionmode') {
-.view.content-view.check#{$s}:not(list) {
+.view.content-view.check#{$s}:not(list),
+.content-view .tile check#{$s}:not(list) {
 -gtk-icon-shadow: none;
--gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
+-gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"), url("assets/checkbox#{$as}@2.png"));
-url("assets/checkbox#{$as}@2.png"));
 background-color: transparent;
+min-width: 40px;
+min-height: 40px;
+background-image: none;
+transition: none;
+box-shadow: none;
+border-width: 0;
 }
 }
 checkbutton.text-button, radiobutton.text-button {
 // this is for a nice focus on check and radios text
 background-color: transparent;
 box-shadow: none;
 -gtk-icon-shadow: none;
 color: inherit;
 border-color: currentColor;
-animation: none;
 }
 }
 }
 %check,
 &:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
 -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
 }
-// let's animate things
+// ANIMATION:
-@keyframes check_check {
+// this is made with those pretty convoluted transitions, since checks and radios have to animate only on state changes,
-from { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); }
+// the transformation is set on the active state and it get reset on the checked state.
-to { -gtk-icon-transform: unset; }
+radio:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: scale(0); }
-}
+check:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); }
-@keyframes check_radio {
-from { -gtk-icon-transform: scale(0); }
+radio,
-to { -gtk-icon-transform: unset; }
+check {
-}
+&:active { -gtk-icon-transform: scale(0, 1); } // should tackle the indeterminate state, untested
-@keyframes check_indeterminate {
+&:checked:not(:backdrop), &:indeterminate:not(:backdrop) {
-from { -gtk-icon-transform: scale(0, 1); }
+-gtk-icon-transform: unset;
-to { -gtk-icon-transform: unset; }
+transition: 400ms;
 }
+}
-check:not(:indeterminate):checked { animation: check_check 400ms; }
-radio:not(:indeterminate):checked { animation: check_radio 400ms; }
-check:indeterminate:checked, radio:indeterminate:checked { animation: check_indeterminate 400ms; }
-// no animations in menus
 menu menuitem {
-check:not(:indeterminate):checked,
+radio,
-radio:not(:indeterminate):checked,
+check {
-check:indeterminate:checked:active,
+&:checked:not(:backdrop), &:indeterminate:not(:backdrop) { transition: none; }
-radio:indeterminate:checked { animation: none; }
+}
 }
 treeview.view check,
 treeview.view radio {
 &:selected {
 ************/
 %scale_trough {
 border: 1px solid $borders_color;
 border-radius: 3px;
 background-color: $dark_fill;
-box-shadow: inset 1px 1px transparentize(black, 0.9);
+&:disabled { background-color: $insensitive_bg_color; }
-&:disabled {
-background-color: $insensitive_bg_color;
-box-shadow: none;
-}
 &:backdrop {
 background-color: $backdrop_dark_fill;
 border-color: $backdrop_borders_color;
-box-shadow: none;
 transition: $backdrop_transition;
 &:disabled { background-color: $insensitive_bg_color; }
 }
 // ...on selected list rows
-row:selected & {
+row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
-box-shadow: none;
-&, &:disabled { border-color: $selected_borders_color; }
-}
 // OSD
 .osd & {
 border-color: $osd_borders_color;
 background-color: transparentize($osd_borders_color, 0.2);
-box-shadow: none;
-outline-color: transparentize($osd_fg_color, 0.8);
 &:disabled { background-color: $osd_insensitive_bg_color; }
 }
 }
 border-color: transparent;
 }
 }
 // ...on selected list rows
-row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
+row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
 // OSD
 .osd & {
 border-color: $osd_borders_color;
 // this is another differently styled part of the backing bit, the most relevant use case is for example
 // in media player to indicate how much video stream as been cached
 fill {
 @extend %scale_trough;
-&, &:backdrop {
+&:backdrop, & { background-color: $borders_color; }
-background-color: $borders_color;
-box-shadow: none;
-}
 &:disabled {
-&, &:backdrop {
+&:backdrop, & {
 border-color: transparent;
 background-color: transparent;
 }
 }
 // OSD
 .osd & {
 background-color: mix($osd_fg_color, $osd_borders_color, 25%);
 &:disabled {
-&, &:backdrop {
+&:backdrop, & {
 border-color: transparent;
 background-color: transparent;
 }
 }
 }
 }
 slider {
 @include button(normal-alt, $edge: $shadow_color);
-border: 1px solid darken($borders_color, 3%);
+border: 1px solid darken($alt_borders_color, 3%);
 border-radius: 100%;
 transition: $button_transition;
 transition-property: background, border, box-shadow;
 &:hover { @include button(hover-alt, $edge: $shadow_color); }
 &:active { border-color: $selected_borders_color; }
-&:disabled { @include button (insensitive); }
+&:disabled { @include button(insensitive); }
 &:backdrop {
 transition: $backdrop_transition;
 @include button(backdrop);
 &:disabled { @include button(backdrop-insensitive); }
 }
 // ...on selected list rows
-row:selected & { &, &:disabled { border-color: $selected_borders_color; } }
+row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
 // OSD
 .osd & {
 @include button(osd);
 border-color: darken($osd_borders_color, 3%);
 background-color: opacify($osd_bg_color, 1); // solid background needed here
-&:hover { @include button(osd-hover); }
+&:hover {
+@include button(osd-hover);
-&:active { @include button(osd-active); }
+background-color: opacify($osd_bg_color, 1); // solid background needed here
+}
-&:disabled { @include button(osd-insensitive); }
+&:active {
+@include button(osd-active);
+background-color: opacify($osd_bg_color, 1); // solid background needed here
+}
+&:disabled {
+@include button(osd-insensitive);
+background-color: opacify($osd_bg_color, 1); // solid background needed here
+}
 &:backdrop {
 @include button(osd-backdrop);
+background-color: opacify($osd_bg_color, 1); // solid background needed here
-&:disabled { @include button(osd-backdrop-insensitive); }
-}
+&:disabled {
-}
+@include button(osd-backdrop-insensitive);
-}
+background-color: opacify($osd_bg_color, 1); // solid background needed here
+}
-value { color: gtkalpha(currentColor, 0.4); }
+}
+}
+}
+value { color: gtkalpha(currentColor, 0.55); }
 marks {
-color: gtkalpha(currentColor, 0.4);
+color: gtkalpha(currentColor, 0.55);
 @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
 (bottom, bottom, top),
 (top, left, right),
 (bottom, right, left) {
 margin-#{$marks_margin}: $_marks_distance;
 margin-#{$marks_pos}: -($_marks_distance + $_marks_lenght - 3px);
 }
 }
 }
 &.horizontal {
 indicator {
 min-height: $_marks_lenght;
 min-width: 1px;
 }
 &.fine-tune indicator { min-height: ($_marks_lenght - 3px); }
 }
 &.vertical {
 indicator {
 min-height: 1px;
 min-width: $_marks_lenght;
 }
 &.fine-tune indicator { min-width: ($_marks_lenght - 3px); }
 }
 // *WARNING* scale with marks madness following
 // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those...
 $suffix: if($variant == 'light', '', '-dark');
 margin: -10px;
 $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}';
 border-style: none;
 border-radius: 0;
+background-color: transparent;
 background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png'));
 $_scale_slider_bg_pos: bottom;
 @if $dir_class == 'horizontal' {
 &.color {
 min-height: 0;
 min-width: 0;
 trough {
-background-image: linear-gradient(to top, $borders_color);
+background-image: image($borders_color);
 background-repeat: no-repeat;
 }
 &.horizontal {
 padding: 0 0 15px 0;
 progress {
 border-style: none;
 border-radius: 0;
 }
 }
+trough.empty progress { all: unset; } // makes the progress indicator disappear, when the fraction is 0
 }
 /*************
 * Level Bar *
 &.vertical.discrete block { margin: 1px 0; }
 block {
 border: 1px solid;
 border-radius: 1px;
-box-shadow: 0 1px transparentize(black, 0.8);
-&:backdrop { box-shadow: none; }
 &.low {
 border-color: if($variant == 'light', darken($warning_color, 20%), $warning_color);
 background-color: $warning_color;
 }
 &.empty {
 background-color: transparent;
 border-color: if($variant == 'light', transparentize($fg_color,0.8), transparentize($fg_color,0.9));
-box-shadow: none;
 &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
 }
 }
 }
 colorswatch {
 // This widget is made of two boxes one on top of the other, the lower box is colorswatch {} the other one
 // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is
 // applied to the overlay box.
-&, &:drop(active) { border-style: none; } // FIXME: implement a proper drop(active) state
+&:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state
 $_colorswatch_radius: 5px;
-$_colorswatch_overlay_shadow: if($variant == 'light', inset 0 2px 2px -3px transparentize(black, 0.3),
-inset 0 3px 2px -2px transparentize(black, 0.5));
 // base color corners rounding
 // to avoid the artifacts caused by rounded corner anti-aliasing the base color
 // sports a bigger radius.
 // nth-child is needed by the custom color strip.
 inset 0 0 0 1px $drop_target_color;
 }
 }
 overlay {
-box-shadow: $_colorswatch_overlay_shadow;
 border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color);
-&:hover { box-shadow: inset 0 1px transparentize(white, 0.7); }
+&:hover {
+box-shadow: inset 0 1px transparentize(white, 0.6),
+inset 0 -1px transparentize(black, 0.8);
+}
 &:backdrop, &:backdrop:hover {
 border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color);
 box-shadow: none;
 }
 &:hover { -gtk-icon-effect: highlight; }
 &:backdrop { background-color: darken($bg_color,7%); }
-rubberband { @extend rubberband; }
+rubberband, .rubberband { @extend rubberband; }
 }
 .scale-popup {
 .osd & { @extend %osd; }
 .ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
 .csd.popup & {
 border-radius: 0;
 box-shadow: 0 1px 2px transparentize(black, 0.8),
-0 0 0 1px transparentize($_wm_border,0.1);
+0 0 0 1px transparentize($_wm_border, 0.1);
 }
 tooltip.csd & {
 border-radius: 5px;
 box-shadow: none;
 }
 messagedialog.csd & {
 border-radius: 7px;
 box-shadow: 0 1px 2px transparentize(black, 0.8),
-0 0 0 1px transparentize($_wm_border,0.1);
+0 0 0 1px transparentize($_wm_border, 0.1);
 }
 .solid-csd & {
+margin: 0;
+padding: 4px;
+background-color: $borders_color;
+border: solid 1px $borders_color;
 border-radius: 0;
-margin: 4px;
+box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
-background-color: $backdrop_bg_color;
-border: solid 1px $backdrop_borders_color;
+&:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
-box-shadow: none;
 }
 }
 // Window Close button
 button.titlebutton {
 background-color: $selected_bg_color;
 @at-root %nobg_selected_items, & {
 color: $selected_fg_color;
-@if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
 &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
 &:backdrop {
 color: $backdrop_selected_fg_color;
 &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
 }
 }
 }
-.monospace { font: Monospace; }
+.monospace { font-family: monospace; }
 /**********************
 * Touch Copy & Paste *
 *********************/
 }
 }
 .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
-button.circular { // FIXME: aggregate to buttons
-border-radius: 9999px;
--gtk-outline-radius: 9999px;
-label { padding: 0; }
-}
 // shortcut window keys
 .keycap {
 min-width: 20px;
 min-height: 25px;
 margin-top: 2px;
 :not(decoration):not(window):drop(active):focus,
 :not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die
 border-color: $drop_target_color;
 box-shadow: inset 0 0 0 1px $drop_target_color;
+caret-color: $drop_target_color;
 }
 stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons
 stackswitcher button.circular,

Mercurial > repos > other > Adwaita-Dark-Green

comparison gtk-3.20/_common.scss @ 43:d8eaee5178b7