From beb4d6c37545242eab3b23b30a044a6325e23178 Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Wed, 16 Mar 2016 20:18:03 -0400 Subject: [PATCH] some bugfixes --- Paper/gtk-3.0/apps.css | 9 +- Paper/gtk-3.0/apps/geary.css | 2 +- .../apps/{terminal.css => gnome-terminal.css} | 106 +----------------- Paper/gtk-3.0/apps/midori.css | 12 +- Paper/gtk-3.0/apps/pantheon-terminal.css | 57 ++++++++++ Paper/gtk-3.0/apps/pantheon.css | 9 -- Paper/gtk-3.0/widgets/dynamic-notebook.css | 3 +- Paper/gtk-3.0/widgets/header-bar.css | 3 +- Paper/gtk-3.0/widgets/links.css | 2 +- Paper/gtk-3.0/widgets/toolbars.css | 4 + 10 files changed, 83 insertions(+), 124 deletions(-) rename Paper/gtk-3.0/apps/{terminal.css => gnome-terminal.css} (57%) create mode 100644 Paper/gtk-3.0/apps/pantheon-terminal.css diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css index e68f80e..59c7828 100644 --- a/Paper/gtk-3.0/apps.css +++ b/Paper/gtk-3.0/apps.css @@ -33,9 +33,8 @@ @import url("apps/fallback.css"); @import url("apps/geary.css"); @import url("apps/gedit.css"); -@import url("apps/gnome.css"); -@import url("apps/gnome-clocks.css"); @import url("apps/gnome-calendar.css"); +@import url("apps/gnome-clocks.css"); @import url("apps/gnome-contacts.css"); @import url("apps/gnome-disks.css"); @import url("apps/gnome-documents.css"); @@ -43,21 +42,23 @@ @import url("apps/gnome-photos.css"); @import url("apps/gnome-software.css"); @import url("apps/gnome-system-monitor.css"); +@import url("apps/gnome-terminal.css"); @import url("apps/gnome-tweak-tool.css"); @import url("apps/gnome-weather.css"); +@import url("apps/gnome.css"); @import url("apps/logs.css"); @import url("apps/midori.css"); @import url("apps/nautilus.css"); @import url("apps/noise.css"); -@import url("apps/pantheon.css"); @import url("apps/pantheon-files.css"); +@import url("apps/pantheon-terminal.css"); +@import url("apps/pantheon.css"); @import url("apps/rhythmbox.css"); @import url("apps/scratch-text-editor.css"); @import url("apps/settings.css"); @import url("apps/shotwell.css"); @import url("apps/snap.css"); @import url("apps/synaptic.css"); -@import url("apps/terminal.css"); @import url("apps/unity.css"); @import url("apps/vocal.css"); @import url("apps/xfce.css"); diff --git a/Paper/gtk-3.0/apps/geary.css b/Paper/gtk-3.0/apps/geary.css index 0310d82..eecfb1d 100644 --- a/Paper/gtk-3.0/apps/geary.css +++ b/Paper/gtk-3.0/apps/geary.css @@ -16,7 +16,7 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ -@define-color geary #fec006; +@define-color geary #F2B035; /********** * Header * diff --git a/Paper/gtk-3.0/apps/terminal.css b/Paper/gtk-3.0/apps/gnome-terminal.css similarity index 57% rename from Paper/gtk-3.0/apps/terminal.css rename to Paper/gtk-3.0/apps/gnome-terminal.css index acc6fe6..2de2640 100644 --- a/Paper/gtk-3.0/apps/terminal.css +++ b/Paper/gtk-3.0/apps/gnome-terminal.css @@ -17,7 +17,7 @@ */ @define-color terminal #dbdee0; -@define-color terminal_background #002B36; +@define-color terminal_background alpha(#002B36, 0.9); @define-color terminal_text #839495; @define-color terminal_window #636E73; @define-color terminal_window_text #dbdee0; @@ -38,110 +38,6 @@ TerminalWindow .header-bar:backdrop{ background-color: shade(@terminal_window,0.9); } -/************ - * Notebook * - ************/ - -TerminalNotebook { - box-shadow: inset 0 1px 0 0 @border; -} - -/* Active */ -TerminalNotebook tab.top:active, -TerminalWindow .notebook tab.top:active, -TerminalWindow .dynamic-notebook tab.top:active { - box-shadow:inset 0 -3px 0 0 @terminal; - text-shadow:none; -} - -/* Normal */ -TerminalWindow .notebook tab.top { - box-shadow:inset 0 -1px 0 0 @terminal_window; - text-shadow:none; -} - -/*----- Tabs -----*/ - -TerminalWindow .notebook tab { - background: @terminal_window; - color: @terminal_window_text; - text-shadow:none; -} - -TerminalWindow .notebook tab:active { - background: @terminal_window; - color: @terminal_window_text; - text-shadow:none; -} - -TerminalWindow .notebook tab:hover { - background-color: shade(@terminal_window, 1.05); - color: alpha(#fff, 0.3); - text-shadow:none; -} - -TerminalWindow .notebook tab:backdrop { - background: @backdrop_header; - color: @backdrop_terminal_window_text; - text-shadow:none; -} - -TerminalWindow .notebook tab:insensitive { - background: @insensitive_header; - color: @insensitive_terminal_window_text; - text-shadow:none; -} - -/* Labels */ -TerminalWindow .notebook GtkLabel, -TerminalWindow .notebook:active GtkLabel, -TerminalWindow .notebook:focus GtkLabel, -TerminalWindow .notebook:hover GtkLabel { - color: @terminal_window_text; -} - -TerminalWindow .notebook:backdrop GtkLabel, -TerminalWindow .notebook:backdrop:hover GtkLabel, -TerminalWindow .notebook:active:backdrop GtkLabel { - color: @backdrop_terminal_window_text; -} - -TerminalWindow .notebook:insensitive GtkLabel { - color: @insensitive_terminal_window_text; -} - -TerminalWindow .notebook:insensitive:backdrop GtkLabel { - color: mix(@backdrop_terminal_window_text, @insensitive_terminal_window_text, 0.5); -} - -TerminalWindow .notebook tab GtkLabel { - color: @backdrop_terminal_window_text; -} - -TerminalWindow .notebook tab:active GtkLabel, -TerminalWindow .notebook .active-page, -TerminalWindow .notebook tab .active-page GtkLabel { - color: @terminal_window_text; -} - -TerminalWindow .notebook tab:backdrop GtkLabel, -TerminalWindow .notebook tab GtkLabel:backdrop { - color: @backdrop_terminal_window_text; -} - -TerminalWindow .notebook tab .button GtkImage { - color: @terminal_window_text; -} - -TerminalWindow .notebook tab .button:hover GtkImage, -TerminalWindow .notebook tab .button:active GtkImage { - color: @selection_foreground; -} - -TerminalWindow .notebook tab .button:backdrop GtkImage { - color: @backdrop_terminal_window_text; -} - /********** * Screen * **********/ diff --git a/Paper/gtk-3.0/apps/midori.css b/Paper/gtk-3.0/apps/midori.css index a43625c..4b2738d 100644 --- a/Paper/gtk-3.0/apps/midori.css +++ b/Paper/gtk-3.0/apps/midori.css @@ -16,12 +16,22 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ -@define-color midori #16b435; +@define-color midori #7FC843; /********** * Header * **********/ +MidoriBrowser .titlebar, +MidoriBrowser .header-bar { + background-color: @midori; +} + +MidoriBrowser .titlebar:backdrop, +MidoriBrowser .header-bar:backdrop { + background-color: shade(@midori,0.9); +} + MidoriBrowser .toolbar.primary-toolbar { background-color: @midori; } diff --git a/Paper/gtk-3.0/apps/pantheon-terminal.css b/Paper/gtk-3.0/apps/pantheon-terminal.css new file mode 100644 index 0000000..7024c71 --- /dev/null +++ b/Paper/gtk-3.0/apps/pantheon-terminal.css @@ -0,0 +1,57 @@ +/* Copyright 2016 Sam Hewitt. +* +* This file is part of the Paper GTK theme. +* +* The Paper GTK theme is free software: you can redistribute it +* and/or modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* The Paper GTK theme is distributed in the hope that it will be +* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +* Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. +*/ + + +@define-color pantheonTerminal #3B4245; +@define-color terminal_background alpha(#002B36, 0.9); +@define-color terminal_text #839495; +@define-color terminal_window #636E73; +@define-color terminal_window_text #dbdee0; +@define-color backdrop_terminal_window_text shade(@terminal_window_text, 0.8); +@define-color insensitive_terminal_window_text shade(@terminal_window_text, 0.95); + +/* CSD */ +PantheonTerminalPantheonTerminalWindow .csd { + background-color: @pantheonTerminal; +} + +PantheonTerminalPantheonTerminalWindow .csd:backdrop { + background-color: shade(@pantheonTerminal,0.9); +} + + +/* Notebook */ +PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook.header { + background-color: @pantheonTerminal; +} + + +PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook.header:backdrop { + background-color: shade(@pantheonTerminal,0.9); +} + + + +/* Notebook */ +PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook tab { + background-color: @pantheonTerminal; +} + + +PantheonTerminalPantheonTerminalWindow .dynamic-notebook .notebook tab:backdrop { + background-color: shade(@pantheonTerminal,0.9); diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css index 71b7827..563f633 100644 --- a/Paper/gtk-3.0/apps/pantheon.css +++ b/Paper/gtk-3.0/apps/pantheon.css @@ -175,15 +175,6 @@ } -/************ - * Terminal * - ***********/ - -PantheonTerminalPantheonTerminalWindow.background { - background: none; -} - - /********* * Panel * ********/ diff --git a/Paper/gtk-3.0/widgets/dynamic-notebook.css b/Paper/gtk-3.0/widgets/dynamic-notebook.css index 946967a..9ffb862 100644 --- a/Paper/gtk-3.0/widgets/dynamic-notebook.css +++ b/Paper/gtk-3.0/widgets/dynamic-notebook.css @@ -270,10 +270,9 @@ .dynamic-notebook .notebook tab > .button:hover:active, .notebook tab .button:hover, .notebook tab .button:hover:active { + border: none; background-image: none; background-color: alpha(#000, 0.02); - - border-color: @border; } .dynamic-notebook .notebook tab > .button:hover:active, diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css index fe17a97..bd7c991 100644 --- a/Paper/gtk-3.0/widgets/header-bar.css +++ b/Paper/gtk-3.0/widgets/header-bar.css @@ -62,7 +62,8 @@ color: @header_text; } -.header-bar > GtkImage { +.header-bar > GtkImage, +.header-bar > GtkArrow { color: @header_text; } diff --git a/Paper/gtk-3.0/widgets/links.css b/Paper/gtk-3.0/widgets/links.css index 7f346eb..2fa9165 100644 --- a/Paper/gtk-3.0/widgets/links.css +++ b/Paper/gtk-3.0/widgets/links.css @@ -17,7 +17,7 @@ */ -@define-color link #009587; +@define-color link #02f; @define-color backdrop_link shade(@link, 1.1); @define-color visited_link shade(@link, 0.9); diff --git a/Paper/gtk-3.0/widgets/toolbars.css b/Paper/gtk-3.0/widgets/toolbars.css index e1b4985..6f96229 100644 --- a/Paper/gtk-3.0/widgets/toolbars.css +++ b/Paper/gtk-3.0/widgets/toolbars.css @@ -283,6 +283,10 @@ padding: 13px; } +.primary-toolbar .button.image-button:checked { + background-color: alpha(#fff, 0.1); +} + .primary-toolbar.toolbar .button:active, .primary-toolbar.toolbar GtkToggleButton:active, .primary-toolbar.toolbar .text-button:active,