From b738f53867f49903953fce458d8e992db02388a1 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 19 May 2015 22:42:47 +0200 Subject: some fixes --- gtk-3.0/README | 33 +++------------------------------ gtk-3.0/_applications.scss | 6 +++--- gtk-3.0/_common.scss | 5 +++-- gtk-3.0/gtk-contained.css | 10 +++++++--- 4 files changed, 16 insertions(+), 38 deletions(-) diff --git a/gtk-3.0/README b/gtk-3.0/README index 413cff1..befb776 100644 --- a/gtk-3.0/README +++ b/gtk-3.0/README @@ -1,36 +1,9 @@ -Summary -------- - * Do not edit the CSS directly, edit the source SCSS files and process them with SASS (run `/.parse-sass.sh` when you have the required sofwtare installed, as described below) -* To be able to use the lates/adequate version of sass, install ruby, gem, sass & bundle. - On Fedora F20, this is done with `sudo dnf install rubygems && gem install bundle && bundle install` - from the same directory this README resides in. - -How to tweak the theme ----------------------- - -Adwaita is a complex themes, so to keep it maintainable it's written and processed in SASS, the -generated CSS is then transformed into a gresource file during gtk build and used at runtime in a -non-legible or editable form. - -It is very likely your change will happen in the _common.scss file. That's where most of the widget -selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the -right place for a drive by stylesheet fix: - -_colors.scss - global color definitions. We keep the number of defined colors to a necessary minimum, - most colors are derived form a handful of basics. It covers both the light variant and - the dark variant. - -_colors-public.scss - SCSS colors exported through gtk to allow for 3rd party apps color mixing. -_drawing.scss - drawing helper mixings/functions to allow easier definition of widget drawing under - specific context. This is why Adwaita isn't 15000 LOC. +* To be able to use the lates/adequate version of sass, install ruby and get the sass gem via bundle. + This is done with `gem install bundle && bundle install` from the same directory this README resides in. -_common.scss - actual definitions of style for each widget. This is where you are likely to add/remove - your changes. - -You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the -_common.scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you +You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to any .scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you edit. This is done by running `bundle exec sass --watch --sourcemap=none .` If sass is out of date, or is missing, you can install it with `bundle install`. diff --git a/gtk-3.0/_applications.scss b/gtk-3.0/_applications.scss index 701a936..734c9c3 100644 --- a/gtk-3.0/_applications.scss +++ b/gtk-3.0/_applications.scss @@ -635,9 +635,9 @@ MarlinViewWindow *:selected:focus { icon-shadow: none; } -.panel .menubar .menuitem:hover { - background-color: transparent; -} +.panel .menubar > .menuitem { padding: 3px 6px; } + +.panel .menubar > .menuitem:hover { background-color: transparent; } .panel .window-frame.menu.csd, .panel .window-frame.popup.csd { diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss index 67ceddc..b659cbf 100644 --- a/gtk-3.0/_common.scss +++ b/gtk-3.0/_common.scss @@ -1501,7 +1501,7 @@ column-header.button.dnd { // for treeview-like derive widgets color: $insensitive_fg_color; } - &.separator { color: $base_color; } + &.separator { color: transparentize($base_color, 1); } //submenu indicators &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } @@ -1537,7 +1537,7 @@ column-header.button.dnd { // for treeview-like derive widgets box-shadow: 0 2px 6px 1px transparentize(black, 0.93); - & .separator { color: transparentize(black, 1); } + & .separator { color: transparentize($base_color, 1); } .label.separator { @extend .label.separator; } // Noice > .list, @@ -2682,6 +2682,7 @@ GtkVolumeButton.button { padding: 8px; } padding: 7px 4px; @include button(undecorated); + background-color: transparentize($header_bg, 1); border-width: 0; &:hover { diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css index 8aa2ea7..353021d 100644 --- a/gtk-3.0/gtk-contained.css +++ b/gtk-3.0/gtk-contained.css @@ -1175,7 +1175,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: #ffffff; } + color: rgba(255, 255, 255, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1208,7 +1208,7 @@ column-header .button, column-header .button:hover, column-header .button:active background-color: #ffffff; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.07); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: transparent; } + color: rgba(255, 255, 255, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -2107,6 +2107,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; + background-color: rgba(231, 232, 235, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { @@ -2701,7 +2702,10 @@ MarlinViewWindow *:selected:focus { text-shadow: none; icon-shadow: none; } -.panel .menubar .menuitem:hover { +.panel .menubar > .menuitem { + padding: 3px 6px; } + +.panel .menubar > .menuitem:hover { background-color: transparent; } .panel .window-frame.menu.csd, -- cgit v1.2.3