From 03f0ed663df6e97c0845e4d35ed0c85d852f114e Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Mon, 18 Apr 2016 11:29:56 -0400 Subject: [PATCH] made a few fixes;added geary css --- Paper/gtk-3.0/_apps.scss | 4 +- Paper/gtk-3.0/apps/_geary.scss | 45 +++++++++++++ Paper/gtk-3.0/apps/_gnome.scss | 4 ++ Paper/gtk-3.0/gtk-dark.css | 85 +++++++++++++------------ Paper/gtk-3.0/gtk.css | 85 +++++++++++++------------ Paper/gtk-3.0/widgets/_source-list.scss | 5 +- 6 files changed, 142 insertions(+), 86 deletions(-) create mode 100644 Paper/gtk-3.0/apps/_geary.scss diff --git a/Paper/gtk-3.0/_apps.scss b/Paper/gtk-3.0/_apps.scss index 02c7490..bd71c8d 100644 --- a/Paper/gtk-3.0/_apps.scss +++ b/Paper/gtk-3.0/_apps.scss @@ -1,12 +1,10 @@ - - - /*********************** * App-Specific Styles * ***********************/ @import 'apps/archive-manager'; @import 'apps/birdie'; +@import 'apps/geary'; @import 'apps/gnome'; @import 'apps/pantheon'; @import 'apps/midori'; diff --git a/Paper/gtk-3.0/apps/_geary.scss b/Paper/gtk-3.0/apps/_geary.scss new file mode 100644 index 0000000..73e2b15 --- /dev/null +++ b/Paper/gtk-3.0/apps/_geary.scss @@ -0,0 +1,45 @@ +/********* + * Geary * + *********/ + +$geary: #F2B035; + +.geary-titlebar-left, +.geary-titlebar-right { + background-color: $geary; + + &:backdrop { + background-color: darken($geary,10%); + } + + .separator { + opacity: 0; + } +} + +ConversationListView { + -GtkWidget-focus-line-width: 1px; + -GtkTreeView-grid-line-width: 0; + + .view { + &:active, + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + + &:backdrop { + background-color: $backdrop_selected_bg_color; + color: $backdrop_selected_fg_color; + } + } + + .cell { + border: solid transparentize(black, 0.8); + border-width: 0 0 1px 0; + &:selected { + color: $selected_fg_color; + border: 0px solid darken($selected_bg_color, 10% ); + } + } + } +} \ No newline at end of file diff --git a/Paper/gtk-3.0/apps/_gnome.scss b/Paper/gtk-3.0/apps/_gnome.scss index df53a47..80c029b 100644 --- a/Paper/gtk-3.0/apps/_gnome.scss +++ b/Paper/gtk-3.0/apps/_gnome.scss @@ -514,6 +514,10 @@ CcWindow { } } +CcShellNavBar { + padding:0px; +} + /************ * Software * ************/ diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css index c7c856b..76a6d4d 100644 --- a/Paper/gtk-3.0/gtk-dark.css +++ b/Paper/gtk-3.0/gtk-dark.css @@ -7666,25 +7666,16 @@ stacksidebar row { /************** * Source List * ***************/ -.source-list, -.source-list.view, -GtkIconView.source-list, -iconview.source-list { +.source-list { -GtkTreeView-horizontal-separator: 1px; -GtkTreeView-vertical-separator: 6px; background-color: #4F585C; - color: #A1A8AB; border: solid #33393b; + color: #A1A8AB; border-right-width: 1px; } - .source-list .category-expander, - .source-list.view .category-expander, - GtkIconView.source-list .category-expander, - iconview.source-list .category-expander { + .source-list .category-expander { color: transparent; } - .source-list .badge, - .source-list.view .badge, - GtkIconView.source-list .badge, - iconview.source-list .badge { + .source-list .badge { background-image: none; background-color: rgba(0, 0, 0, 0.4); color: #4F585C; @@ -7692,41 +7683,17 @@ iconview.source-list { padding: 0 6px; margin: 0 3px; border-width: 0; } - .source-list .badge:selected:backdrop, .source-list .badge:selected:hover:backdrop, - .source-list.view .badge:selected:backdrop, - GtkIconView.source-list .badge:selected:backdrop, - iconview.source-list .badge:selected:backdrop, - .source-list.view .badge:selected:hover:backdrop, - GtkIconView.source-list .badge:selected:hover:backdrop, - iconview.source-list .badge:selected:hover:backdrop { + .source-list .badge:selected:backdrop, .source-list .badge:selected:hover:backdrop { background-color: rgba(0, 0, 0, 0.2); color: shade #4F585C, 0.95; } .source-list row, - .source-list .list-row, - .source-list.view row, - GtkIconView.source-list row, - iconview.source-list row, - .source-list.view .list-row, - GtkIconView.source-list .list-row, - iconview.source-list .list-row { + .source-list .list-row { border: none; padding: 0; } .source-list row > GtkLabel, .source-list row > label, .source-list .list-row > GtkLabel, - .source-list .list-row > label, - .source-list.view row > GtkLabel, - GtkIconView.source-list row > GtkLabel, - iconview.source-list row > GtkLabel, - .source-list.view row > label, - GtkIconView.source-list row > label, - iconview.source-list row > label, - .source-list.view .list-row > GtkLabel, - GtkIconView.source-list .list-row > GtkLabel, - iconview.source-list .list-row > GtkLabel, - .source-list.view .list-row > label, - GtkIconView.source-list .list-row > label, - iconview.source-list .list-row > label { + .source-list .list-row > label { padding-left: 6px; padding-right: 6px; } @@ -9179,6 +9146,41 @@ BirdieWidgetsNotebook .header { BirdieWidgetsNotebook tab:active { box-shadow: inset 0 -3px 0 0 #3998E7; } +/********* + * Geary * + *********/ +.geary-titlebar-left, +.geary-titlebar-right { + background-color: #F2B035; } + .geary-titlebar-left:backdrop, + .geary-titlebar-right:backdrop { + background-color: #e59a0f; } + .geary-titlebar-left .separator, + .geary-titlebar-right .separator { + opacity: 0; } + +ConversationListView { + -GtkWidget-focus-line-width: 1px; + -GtkTreeView-grid-line-width: 0; } + ConversationListView .view:active, ConversationListView GtkIconView:active, + ConversationListView iconview:active, ConversationListView .view:selected, ConversationListView GtkIconView:selected, + ConversationListView iconview:selected { + background-color: #667f8c; + color: #ffffff; } + ConversationListView .view:active:backdrop, ConversationListView GtkIconView:active:backdrop, + ConversationListView iconview:active:backdrop, ConversationListView .view:selected:backdrop, ConversationListView GtkIconView:selected:backdrop, + ConversationListView iconview:selected:backdrop { + background-color: #738c99; + color: rgba(255, 255, 255, 0.5); } + ConversationListView .view .cell, ConversationListView GtkIconView .cell, + ConversationListView iconview .cell { + border: solid rgba(0, 0, 0, 0.2); + border-width: 0 0 1px 0; } + ConversationListView .view .cell:selected, ConversationListView GtkIconView .cell:selected, + ConversationListView iconview .cell:selected { + color: #ffffff; + border: 0px solid #51646e; } + /*************** * font-viewer * ***************/ @@ -9526,6 +9528,9 @@ CcWindow .header-bar { CcWindow .header-bar:backdrop { background-color: #4a616c; } +CcShellNavBar { + padding: 0px; } + /************ * Software * ************/ diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css index 8e0842c..e62b877 100644 --- a/Paper/gtk-3.0/gtk.css +++ b/Paper/gtk-3.0/gtk.css @@ -7675,25 +7675,16 @@ stacksidebar row { /************** * Source List * ***************/ -.source-list, -.source-list.view, -GtkIconView.source-list, -iconview.source-list { +.source-list { -GtkTreeView-horizontal-separator: 1px; -GtkTreeView-vertical-separator: 6px; background-color: #f7f7f7; - color: #666666; border: solid #c4c4c4; + color: #666666; border-right-width: 1px; } - .source-list .category-expander, - .source-list.view .category-expander, - GtkIconView.source-list .category-expander, - iconview.source-list .category-expander { + .source-list .category-expander { color: transparent; } - .source-list .badge, - .source-list.view .badge, - GtkIconView.source-list .badge, - iconview.source-list .badge { + .source-list .badge { background-image: none; background-color: rgba(0, 0, 0, 0.4); color: #f7f7f7; @@ -7701,41 +7692,17 @@ iconview.source-list { padding: 0 6px; margin: 0 3px; border-width: 0; } - .source-list .badge:selected:backdrop, .source-list .badge:selected:hover:backdrop, - .source-list.view .badge:selected:backdrop, - GtkIconView.source-list .badge:selected:backdrop, - iconview.source-list .badge:selected:backdrop, - .source-list.view .badge:selected:hover:backdrop, - GtkIconView.source-list .badge:selected:hover:backdrop, - iconview.source-list .badge:selected:hover:backdrop { + .source-list .badge:selected:backdrop, .source-list .badge:selected:hover:backdrop { background-color: rgba(0, 0, 0, 0.2); color: shade #f7f7f7, 0.95; } .source-list row, - .source-list .list-row, - .source-list.view row, - GtkIconView.source-list row, - iconview.source-list row, - .source-list.view .list-row, - GtkIconView.source-list .list-row, - iconview.source-list .list-row { + .source-list .list-row { border: none; padding: 0; } .source-list row > GtkLabel, .source-list row > label, .source-list .list-row > GtkLabel, - .source-list .list-row > label, - .source-list.view row > GtkLabel, - GtkIconView.source-list row > GtkLabel, - iconview.source-list row > GtkLabel, - .source-list.view row > label, - GtkIconView.source-list row > label, - iconview.source-list row > label, - .source-list.view .list-row > GtkLabel, - GtkIconView.source-list .list-row > GtkLabel, - iconview.source-list .list-row > GtkLabel, - .source-list.view .list-row > label, - GtkIconView.source-list .list-row > label, - iconview.source-list .list-row > label { + .source-list .list-row > label { padding-left: 6px; padding-right: 6px; } @@ -9212,6 +9179,41 @@ BirdieWidgetsNotebook .header { BirdieWidgetsNotebook tab:active { box-shadow: inset 0 -3px 0 0 #3998E7; } +/********* + * Geary * + *********/ +.geary-titlebar-left, +.geary-titlebar-right { + background-color: #F2B035; } + .geary-titlebar-left:backdrop, + .geary-titlebar-right:backdrop { + background-color: #e59a0f; } + .geary-titlebar-left .separator, + .geary-titlebar-right .separator { + opacity: 0; } + +ConversationListView { + -GtkWidget-focus-line-width: 1px; + -GtkTreeView-grid-line-width: 0; } + ConversationListView .view:active, ConversationListView GtkIconView:active, + ConversationListView iconview:active, ConversationListView .view:selected, ConversationListView GtkIconView:selected, + ConversationListView iconview:selected { + background-color: #449ac2; + color: #ffffff; } + ConversationListView .view:active:backdrop, ConversationListView GtkIconView:active:backdrop, + ConversationListView iconview:active:backdrop, ConversationListView .view:selected:backdrop, ConversationListView GtkIconView:selected:backdrop, + ConversationListView iconview:selected:backdrop { + background-color: #57a4c8; + color: rgba(255, 255, 255, 0.5); } + ConversationListView .view .cell, ConversationListView GtkIconView .cell, + ConversationListView iconview .cell { + border: solid rgba(0, 0, 0, 0.2); + border-width: 0 0 1px 0; } + ConversationListView .view .cell:selected, ConversationListView GtkIconView .cell:selected, + ConversationListView iconview .cell:selected { + color: #ffffff; + border: 0px solid #347d9f; } + /*************** * font-viewer * ***************/ @@ -9559,6 +9561,9 @@ CcWindow .header-bar { CcWindow .header-bar:backdrop { background-color: #4a616c; } +CcShellNavBar { + padding: 0px; } + /************ * Software * ************/ diff --git a/Paper/gtk-3.0/widgets/_source-list.scss b/Paper/gtk-3.0/widgets/_source-list.scss index 93251f0..ae0f90c 100644 --- a/Paper/gtk-3.0/widgets/_source-list.scss +++ b/Paper/gtk-3.0/widgets/_source-list.scss @@ -2,14 +2,13 @@ * Source List * ***************/ -.source-list, -.source-list.view { +.source-list { -GtkTreeView-horizontal-separator: 1px; -GtkTreeView-vertical-separator: 6px; background-color: $bg_color; - color: $fg_color; border: solid $borders_color; + color: $fg_color; border-right-width: 1px; &:backdrop {}