From 965fc01fb437a22bf6abc036086f5a6ab7fb1b12 Mon Sep 17 00:00:00 2001 From: Megax Date: Sun, 8 May 2016 11:54:48 +0200 Subject: [PATCH 1/2] * Calendar rewirte. --- gtk-3.20/scss/widgets/_button.scss | 7 ++++ gtk-3.20/scss/widgets/_calendar.scss | 59 ++++++++++++++++++++++++---- gtk-3.20/scss/widgets/_menu.scss | 7 ---- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss index ccc28d7..7ddbddb 100755 --- a/gtk-3.20/scss/widgets/_button.scss +++ b/gtk-3.20/scss/widgets/_button.scss @@ -53,6 +53,13 @@ outline-color: transparent; } + %undecorated_button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: none; + } + %linked_middle { border-radius: 0; border-left-style: none; diff --git a/gtk-3.20/scss/widgets/_calendar.scss b/gtk-3.20/scss/widgets/_calendar.scss index 5e5f990..d515a93 100644 --- a/gtk-3.20/scss/widgets/_calendar.scss +++ b/gtk-3.20/scss/widgets/_calendar.scss @@ -7,17 +7,62 @@ padding: $spacing; outline-offset: -1px; - &:indeterminate { color: mix($fg_color, $bg_color, .5); } + color: $text_color; - &.view, &.highlight, &.header, &.button { - &, &:focus, &:hover, &:disabled { - border: 0; - background-color: transparent; - background-image: none; + &.view { + &, &:backdrop { @extend %undecorated_button; } + } + + &:selected { + @extend %selected_items; + + padding: 5px; + border-radius: $roundness; + } + + &.header { + border-bottom: 1px solid transparentize($black, .9); + border-radius: 0; + + &:backdrop { border-color: transparentize($black, .9); } + } + + &.button { + @extend %undecorated_button; + + color: alpha($fg_color, .55); + + &:hover { + @extend %undecorated_button; + + color: $fg_color; + } + + &:backdrop { + @extend %undecorated_button; + + color: alpha($backdrop_fg_color, .55); + } + + &:disabled { + @extend %undecorated_button; + + color: alpha($insensitive_fg_color, .55); } } - &.highlight { color: $selected_bg_color; } + &:indeterminate, + &:indeterminate:backdrop { color: mix($fg_color, $bg_color, .5); } + + &.highlight, + &.highlight:backdrop { + font-size: smaller; + color: $selected_bg_color; + } + + &:backdrop { + color: $backdrop_text_color; + } } /* gnome-calendar */ diff --git a/gtk-3.20/scss/widgets/_menu.scss b/gtk-3.20/scss/widgets/_menu.scss index be904c3..35938fc 100755 --- a/gtk-3.20/scss/widgets/_menu.scss +++ b/gtk-3.20/scss/widgets/_menu.scss @@ -185,13 +185,6 @@ } } -%undecorated_button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: none; -} - /********* ! Popover From 1ffe16205c2baf5307766a3c980fbccf04fba9f1 Mon Sep 17 00:00:00 2001 From: Megax Date: Sun, 8 May 2016 13:32:05 +0200 Subject: [PATCH 2/2] * Padding fix. --- gtk-3.20/scss/widgets/_calendar.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk-3.20/scss/widgets/_calendar.scss b/gtk-3.20/scss/widgets/_calendar.scss index d515a93..5f68de3 100644 --- a/gtk-3.20/scss/widgets/_calendar.scss +++ b/gtk-3.20/scss/widgets/_calendar.scss @@ -4,7 +4,7 @@ @include exports("calendar") { calendar { - padding: $spacing; + padding: 1px 3px; outline-offset: -1px; color: $text_color; @@ -16,7 +16,6 @@ &:selected { @extend %selected_items; - padding: 5px; border-radius: $roundness; }