diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css index 9d352e0..a491a8a 100644 --- a/Paper/gtk-3.0/apps.css +++ b/Paper/gtk-3.0/apps.css @@ -20,6 +20,7 @@ * Apps * ********/ +@import url("apps/appcenter.css"); @import url("apps/archive-manager.css"); @import url("apps/baobab.css"); @import url("apps/bijiben.css"); @@ -37,7 +38,7 @@ @import url("apps/gnome-contacts.css"); @import url("apps/gnome-disks.css"); @import url("apps/gnome-documents.css"); -/*@import url("apps/gnome-music.css");*/ +@import url("apps/gnome-music.css"); @import url("apps/gnome-photos.css"); /*@import url("apps/gnome-software.css");*/ @import url("apps/gnome-system-monitor.css"); diff --git a/Paper/gtk-3.0/apps/appcenter.css b/Paper/gtk-3.0/apps/appcenter.css new file mode 100644 index 0000000..7689525 --- /dev/null +++ b/Paper/gtk-3.0/apps/appcenter.css @@ -0,0 +1,33 @@ +/* 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 appcenter #378BE6; + +/********** + * Header * + **********/ + +AppCenterMainWindow .titlebar, +AppCenterMainWindow .header-bar { + background-color: @appcenter; +} + +AppCenterMainWindow .titlebar:backdrop, +AppCenterMainWindow .header-bar:backdrop { + background-color: shade(@appcenter,0.9); +} \ No newline at end of file diff --git a/Paper/gtk-3.0/apps/noise.css b/Paper/gtk-3.0/apps/noise.css index 7e88122..6818c12 100644 --- a/Paper/gtk-3.0/apps/noise.css +++ b/Paper/gtk-3.0/apps/noise.css @@ -16,7 +16,7 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ -@define-color noise #FF7D2A; +@define-color noise #EE6020; /********** * Header * diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css index 7692bfe..cb70307 100644 --- a/Paper/gtk-3.0/granite-widgets.css +++ b/Paper/gtk-3.0/granite-widgets.css @@ -88,4 +88,8 @@ GraniteWidgetsWelcome GtkLabel { GraniteWidgetsWelcome .h1, GraniteWidgetsWelcome .h3 { color: alpha(@foreground, 0.8); +} + +GraniteWidgetsModeButtonItem { + border-radius: 0; } \ No newline at end of file diff --git a/Paper/gtk-3.0/gtk-widgets-assets-dark.css b/Paper/gtk-3.0/gtk-widgets-assets-dark.css index ba74880..995f2cb 100644 --- a/Paper/gtk-3.0/gtk-widgets-assets-dark.css +++ b/Paper/gtk-3.0/gtk-widgets-assets-dark.css @@ -320,34 +320,6 @@ GtkSwitch.slider:insensitive { background-position: 0 center; } -/******************* - * Pane separators * - *******************/ -.pane-separator, -.pane-separator:backdrop { - background: url("assets/scalable/pane-separator-grip.svg"); - background-repeat: no-repeat; - background-position: center; -} - -.pane-separator:hover { - background: url("assets/scalable/pane-separator-grip-prelight.svg"); - background-repeat: no-repeat; - background-position: center; -} - -.pane-separator.vertical { - background: url("assets/scalable/pane-separator-grip-vertical.svg"); - background-repeat: no-repeat; - background-position: center; -} - -.pane-separator.vertical:hover { - background: url("assets/scalable/pane-separator-grip-vertical-prelight.svg"); - background-repeat: no-repeat; - background-position: center; -} - /********************* * GtkScale's slider * *********************/ diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css index bd1d4bc..8580f3a 100644 --- a/Paper/gtk-3.0/gtk-widgets-assets.css +++ b/Paper/gtk-3.0/gtk-widgets-assets.css @@ -321,37 +321,6 @@ GtkSwitch.slider:insensitive { } -/******************* - * Pane separators * - *******************/ -.pane-separator { - background: url("assets/scalable/pane-separator-grip.svg"); - background-repeat: no-repeat; - background-position: center; - background-size: 2px 22px; -} - -.pane-separator:hover { - background: url("assets/scalable/pane-separator-grip-prelight.svg"); - background-repeat: no-repeat; - background-position: center; - background-size: 2px 22px; -} - -.pane-separator.vertical { - background: url("assets/scalable/pane-separator-grip-vertical.svg"); - background-repeat: no-repeat; - background-position: center; - background-size: 2px 22px; -} - -.pane-separator.vertical:hover { - background: url("assets/scalable/pane-separator-grip-vertical-prelight.svg"); - background-repeat: no-repeat; - background-position: center; - background-size: 2px 22px; -} - /********************* * GtkScale's slider * *********************/ diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css index 2cea4a8..b38c0b5 100644 --- a/Paper/gtk-3.0/gtk-widgets.css +++ b/Paper/gtk-3.0/gtk-widgets.css @@ -79,7 +79,7 @@ @import url("widgets/miscellaneous.css"); @import url("widgets/notebook.css"); @import url("widgets/osd.css"); -@import url("widgets/overflow.css"); +/*@import url("widgets/overflow.css");*/ @import url("widgets/popovers.css"); @import url("widgets/progressbars.css"); @import url("widgets/scales.css"); diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css index 516b591..fcd8dc5 100644 --- a/Paper/gtk-3.0/widgets/header-bar.css +++ b/Paper/gtk-3.0/widgets/header-bar.css @@ -38,7 +38,6 @@ .maximized .header-bar { border-radius: 0px; - box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1); box-shadow: none; } @@ -67,7 +66,7 @@ color: @header_text; } -.header-bar .button.button.linked .title, +.header-bar .button.linked .title, .header-bar .button.flat .title { padding: 0; } @@ -122,7 +121,7 @@ .header-bar .button, .header-bar .flat, .header-bar .button.image-button, -.header-bar .button.linked, +.header-bar .linked, .header-bar .suggested-action .button, .header-bar .button.text-button, .header-bar .titlebutton { @@ -132,15 +131,20 @@ border: none; box-shadow: none; text-shadow: none; - padding: 10px 12px; + padding: 10px; color: @header_text; } + +.header-bar .button.image-linked { + padding: 13px; +} + /* Buttons (Hover) */ .header-bar .button:hover, .header-bar .flat:hover, .header-bar .button.image-button:hover, -.header-bar .button.linked:hover, +.header-bar .linked:hover, .header-bar .suggested-action .button:hover, .header-bar .button.text-button:hover, .header-bar .titlebutton:hover { @@ -157,7 +161,7 @@ .header-bar .button:backdrop, .header-bar .flat:backdrop, .header-bar .button.image-button:backdrop, -.header-bar .button.linked:backdrop, +.header-bar .linked:backdrop, .header-bar .suggested-action .button:backdrop, .header-bar .button.text-button:backdrop, .header-bar .titlebutton:backdrop { @@ -174,7 +178,7 @@ .header-bar .button:insensitive, .header-bar .flat:insensitive, .header-bar .button.image-button:insensitive, -.header-bar .button.linked:insensitive, +.header-bar .linked:insensitive, .header-bar .suggested-action .button:insensitive, .header-bar .button.text-button:insensitive, .header-bar .titlebutton:insensitive { @@ -191,7 +195,7 @@ .header-bar .button:checked, .header-bar .flat:checked, .header-bar .button.image-button:checked, -.header-bar .button.linked:checked, +.header-bar .linked:checked, .header-bar .suggested-action .button:checked, .header-bar .button.text-button:checked, .header-bar .titlebutton:checked { @@ -201,7 +205,6 @@ border-radius: 0px; box-shadow: none; text-shadow: none; - background-color: alpha(#000,0.1); color: @header_text; box-shadow:inset 0 -2px 0 0 @header_text; } @@ -210,14 +213,14 @@ .header-bar .button:focus, .header-bar .flat:focus, .header-bar .button.image-button:focus, -.header-bar .button.linked:focus, +.header-bar .linked:focus, .header-bar .suggested-action .button:focus, .header-bar .button.text-button:focus, .header-bar .titlebutton:focus, .header-bar .button:active, .header-bar .flat:active, .header-bar .button.image-button:active, -.header-bar .button.linked:active, +.header-bar .linked:active, .header-bar .suggested-action .button:active, .header-bar .button.text-button:active, .header-bar .titlebutton:active { @@ -252,39 +255,49 @@ /* Entries */ .header-bar .entry { - background: none; + background-color: alpha(#000, 0.2); color: @header_text; - border-radius: 0px; - border: 1px solid transparent; + border-radius: 2px; + padding: 6px 4px; + border: none; box-shadow: none; } +.header-bar .entry.image { + color: @header_text; +} + .header-bar .entry:active, .header-bar .entry:focus { - background: none; - color: @header_text; + background-color: @base; + color: @text; + box-shadow: none; border: none; } +.header-bar .entry:active.image, +.header-bar .entry:focus.image { + padding-right: 6px; + color: @text; +} + .header-bar .entry:backdrop { - background: none; - color: @backdrop_header_text; + box-shadow: none; + color: alpha(@header_text, 0.5); border: none; } -.header-bar .entry:selected, -.header-bar .entry:selected:focus { - color: @header; - background-color: @header_text; -} - .header-bar .entry.image { - color: @insensitive_base; + color: alpha(@header_text, 0.5); } -.header-bar .entry.image.left { - padding-right: 6px; - color: @header_text; + +.header-bar .entry:active:backdrop, +.header-bar .entry:focus:backdrop { + background-color: alpha(@base, 0.5); + color: @text; + box-shadow: none; + border: none; } diff --git a/Paper/gtk-3.0/widgets/list-rows.css b/Paper/gtk-3.0/widgets/list-rows.css index a3fae6b..da0b299 100644 --- a/Paper/gtk-3.0/widgets/list-rows.css +++ b/Paper/gtk-3.0/widgets/list-rows.css @@ -31,3 +31,8 @@ background-color: @selection; color: @selection_foreground; } + +.list-row:hover { + background-color: shade(@selection, 1.1); + color: @selection_foreground; +} diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css index 4f5b075..4345065 100644 --- a/Paper/gtk-3.0/widgets/separators.css +++ b/Paper/gtk-3.0/widgets/separators.css @@ -36,49 +36,20 @@ GtkSeparator:backdrop, } .pane-separator { - -GtkPaned-handle-size: 2px; - padding: 4px; - background-color: @background; border: 1px solid @separator; border-width: 0px; - color: @base; } .pane-separator.vertical { - -GtkPaned-handle-size: 2px; - padding: 4px; - background-color: @background; border: 1px solid @separator; border-left-width: 0px; border-right-width: 0px; - color: @base; } -.pane-separator:hover, -.pane-separator:selected { - color: @selection; -} - -.pane-separator:backdrop, -.pane-separator:hover:backdrop { - background-color: @backdrop_background; -} - -.notebook .pane-separator, -.notebook .pane-separator:hover { - background-color: @background; -} - -.notebook .pane-separator:backdrop, -.notebook .pane-separator:hover:backdrop { - background-color: @base; -} .sidebar-pane-separator, .sidebar-pane-separator:hover, .sidebar-pane-separator:selected { - -GtkPaned-handle-size: 2px; - background-image: none; background-color: @separator; border: 1px solid @border; }