by roundabout, Sunday, 13 May 2018, 13:58:57 (1526219937), pushed by roundabout, Sunday, 11 May 2025, 13:22:23 (1746969743)
Author identity: nana-4 <hnmaigo@gmail.com>
4e8c4dc2933608310c6f35ca54508a3afaaceaf1
TODO.md
@@ -34,13 +34,11 @@
- Make compact variant more compact ([#79](../../issues/79))
- Use lighter background color for popups such as menu in dark variant
- Change gtk2 spinbutton to flat button style
- Make card/dialog button style closer to the Material Design guidelines
- Make card/dialog button style closer to the Material Design guidelines (WIP)
- Rework the focus state styles
- Rework the focus state styles (WIP)
## Others
src/_sass/_colors.scss
@@ -44,9 +44,9 @@ $inverse_divider_color: rgba(white, 0.12);
$bg_color: if($variant == 'light', #F2F2F2, #282828);
$base_color: if($variant == 'light', #FFFFFF, #303030);
$alt_base_color: if($variant == 'light', #FAFAFA, #2C2C2C);
$popup_bg_color: if($variant == 'light', #FAFAFA, #424242);
$popup_bg_color: if($variant == 'light', #FFFFFF, #424242);
$alt_lighter_bg_color: if($variant == 'light', #EEEEEE, #303030); // for gnome-shell sub menu
$darker_bg_color: if($variant == 'light', #EEEEEE, #212121);
$button_bg_color: if($variant == 'light', #FAFAFA, #424242);
$titlebar_bg_color: if($titlebar == 'dark', #383838, #E0E0E0);
src/_sass/gnome-shell/_common-3.28.scss
@@ -1873,9 +1873,9 @@ StScrollBar {
}
&.default-key {
border-color: transparent;
background-color: $popup_bg_color;
background-color: $button_bg_color;
background-size: 24px;
&:active { background-color: mix($fg_color, $popup_bg_color, percentage(0.24)); }
&:active { background-color: mix($fg_color, $button_bg_color, percentage(0.24)); }
}
&.enter-key {
border-color: transparent;
src/_sass/gnome-shell/_drawing.scss
@@ -117,7 +117,7 @@
}
@mixin button($t, $c: $popup_bg_color, $tc: $fg_color) {
@mixin button($t, $c: $button_bg_color, $tc: $fg_color) {
//
// button
//
@@ -163,7 +163,7 @@
@if $t == insensitive {
color: if($tc == $fg_color, $disabled_secondary_fg_color, $tc);
background-color: if($c == $popup_bg_color, $divider_color, $c);
background-color: if($c == $button_bg_color, $divider_color, $c);
border-color: transparent;
box-shadow: $shadow_0;
text-shadow: none;
src/_sass/gtk/_common-3.18.scss
@@ -661,7 +661,7 @@ GtkComboBox {
10 / 10px stretch;
border-radius: 2px;
// box-shadow: $shadow_2, inset 0 1px $highlight_color;
background-color: $base_color;
background-color: $popup_bg_color;
&:backdrop {
border-image: -gtk-scaled(url("assets/box-shadow-backdrop#{$asset_suffix}.png"),
url("assets/box-shadow-backdrop#{$asset_suffix}@2.png"))
@@ -962,7 +962,7 @@ column-header.button.dnd { // for treeview-like derive widgets
margin: 4px 0;
padding: 4px 0;
box-shadow: inset 0 1px $highlight_color;
background-color: $base_color;
background-color: $popup_bg_color;
border: 1px solid $border_color; // adds borders in a non composited env
.csd & {
border: none; // axes borders in a composited env
@@ -1900,7 +1900,7 @@ GtkFileChooserDialog {
.sidebar {
border: none;
background-color: $popup_bg_color;
background-color: $alt_base_color;
&:selected {
@extend %selected_items;
@@ -2321,7 +2321,7 @@ GtkVolumeButton.button {
.touch-selection {
font: initial;
color: $fg_color;
background-color: $base_color;
background-color: $popup_bg_color;
box-shadow: $shadow_2;
&:backdrop { box-shadow: $shadow_1; }
.button {
src/_sass/gtk/_common-3.20.scss
@@ -971,7 +971,7 @@ toolbar {
padding: $container_padding;
border-radius: 2px;
box-shadow: $shadow_2, inset 0 1px $highlight_color;
background-color: $base_color;
background-color: $popup_bg_color;
&:backdrop { box-shadow: $shadow_1, inset 0 1px $highlight_color; }
@@ -1490,7 +1490,7 @@ menu,
margin: 4px 0; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258
padding: 4px 0;
box-shadow: inset 0 1px $highlight_color;
background-color: $base_color;
background-color: $popup_bg_color;
border: 1px solid $border_color; // adds borders in a non composited env
.csd & {
@@ -1539,7 +1539,7 @@ menu,
min-height: 16px;
min-width: 16px;
padding: 4px;
background-color: $base_color;
background-color: $popup_bg_color;
color: $secondary_fg_color;
&.top {
@@ -3286,7 +3286,7 @@ colorchooser .popover.osd {
transition: $shadow_transition;
border-radius: 2px;
box-shadow: $shadow_2, inset 0 1px $highlight_color;
background-color: $base_color;
background-color: $popup_bg_color;
&:backdrop { box-shadow: $shadow_1, inset 0 1px $highlight_color; }
@@ -3447,7 +3447,7 @@ cursor-handle {
border: solid 1px $border_color;
border-radius: 2px + 1px;
box-shadow: inset 0 -2px $border_color;
background-color: $base_color;
background-color: $popup_bg_color;
color: $fg_color;
font-size: smaller;
}
src/_sass/gtk/_drawing-3.18.scss
@@ -118,7 +118,7 @@
}
@mixin button($t, $c: $popup_bg_color) {
@mixin button($t, $c: $button_bg_color) {
//
// button
//
@@ -160,7 +160,7 @@
@if $t == insensitive {
box-shadow: none;
background-color: $fill_color;
color: if($c == $popup_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
color: if($c == $button_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
> .label { color: inherit; }
}
@@ -210,7 +210,7 @@
@if $t == flat-insensitive {
box-shadow: none;
background-color: transparent;
color: if($c == $popup_bg_color,
color: if($c == $button_bg_color,
gtkalpha(currentColor, 0.3),
gtkalpha(currentColor, 0.5));
src/_sass/gtk/_drawing-3.20.scss
@@ -80,7 +80,7 @@
}
@mixin button($t, $c: $popup_bg_color) {
@mixin button($t, $c: $button_bg_color) {
//
// button
//
@@ -125,7 +125,7 @@
@if $t == disabled {
box-shadow: none;
background-color: $divider_color;
color: if($c == $popup_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
color: if($c == $button_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
}
@if $t == checked {
@@ -174,7 +174,7 @@
@if $t == flat-disabled {
box-shadow: none;
background-color: transparent;
color: if($c == $popup_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
color: if($c == $button_bg_color, $disabled_secondary_fg_color, $disabled_fg_color);
}
@if $t == flat-checked {