From 5af0399fef55dfec0265cc4ac989bd82ecf9dcf7 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 3 Jan 2016 22:35:53 +0100 Subject: [PATCH] try to fix padding --- common/gtk-3.0/3.14/gtk-dark.css | 92 +++++++++++----------- common/gtk-3.0/3.14/gtk-darker.css | 92 +++++++++++----------- common/gtk-3.0/3.14/gtk-solid-dark.css | 92 +++++++++++----------- common/gtk-3.0/3.14/gtk-solid-darker.css | 92 +++++++++++----------- common/gtk-3.0/3.14/gtk-solid.css | 92 +++++++++++----------- common/gtk-3.0/3.14/gtk.css | 92 +++++++++++----------- common/gtk-3.0/3.14/sass/_common.scss | 85 +++++++++----------- common/gtk-3.0/3.16/gtk-dark.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/gtk-darker.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/gtk-solid-dark.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/gtk-solid-darker.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/gtk-solid.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/gtk.css | 95 ++++++++++++----------- common/gtk-3.0/3.16/sass/_common.scss | 82 +++++++++----------- common/gtk-3.0/3.18/gtk-dark.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/gtk-darker.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/gtk-solid-dark.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/gtk-solid-darker.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/gtk-solid.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/gtk.css | 99 ++++++++++++------------ common/gtk-3.0/3.18/sass/_common.scss | 80 +++++++++---------- 21 files changed, 968 insertions(+), 995 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index e89322b..e5c5c47 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -259,8 +258,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -312,7 +309,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -457,23 +454,18 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -482,17 +474,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -754,7 +742,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -809,7 +797,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -822,10 +810,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -882,8 +872,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1193,18 +1183,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2211,7 +2207,7 @@ GtkColorChooserWidget #add-color-button { background-color: #2b2e39; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2333,12 +2329,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: 0; + border-width: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 972334d..fa342a6 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +453,18 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,17 +473,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -753,7 +741,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +800,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +813,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -885,8 +875,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1186,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2214,7 +2210,7 @@ GtkColorChooserWidget #add-color-button { background-color: #dcdfe3; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2336,12 +2332,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: 0; + border-width: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index ae83d76..4548b5c 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -259,8 +258,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -312,7 +309,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -457,23 +454,18 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -482,17 +474,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -754,7 +742,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -809,7 +797,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -822,10 +810,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -882,8 +872,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1193,18 +1183,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2211,7 +2207,7 @@ GtkColorChooserWidget #add-color-button { background-color: #2b2e39; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2333,12 +2329,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: 0; + border-width: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index c32f9cb..c6cb49f 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +453,18 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,17 +473,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -753,7 +741,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +800,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +813,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -885,8 +875,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1186,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2214,7 +2210,7 @@ GtkColorChooserWidget #add-color-button { background-color: #dcdfe3; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2336,12 +2332,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: 0; + border-width: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 6e6ad51..c5c4667 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +453,18 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,17 +473,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -753,7 +741,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +800,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +813,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -885,8 +875,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1186,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2214,7 +2210,7 @@ GtkColorChooserWidget #add-color-button { background-color: #dcdfe3; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2336,12 +2332,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(231, 232, 235, 0); - border-width: 0; + border-width: rgba(231, 232, 235, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 1e2578b..ac6aaab 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -125,18 +125,17 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,7 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +453,18 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, .titlebar .button.titlebutton, + .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,17 +473,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } - .stack-switcher > .button.needs-attention:active > GtkLabel, + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } + .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { @@ -753,7 +741,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .button { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +800,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +813,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -885,8 +875,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1186,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2214,7 +2210,7 @@ GtkColorChooserWidget #add-color-button { background-color: #dcdfe3; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2336,12 +2332,12 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton, .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton { - padding: 7px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; background-color: rgba(231, 232, 235, 0); - border-width: 0; + border-width: rgba(231, 232, 235, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 3356d3e..e142c35 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -188,24 +188,22 @@ GtkFlowBox .grid-child { } } +$vert_padding: 5px; // // Text Entries // .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: $vert_padding 8px; border-radius: 3px; transition: all 200ms $ease-out-quad; @include entry(normal); - .header-bar & { padding: 6px; } - - //&.image { // icons inside the entry - // &.left { padding-left: 0; } - // &.right { padding-right: 0; } - //} - &.image { padding-left: 3px; padding-right: 3px; } + &.image { // icons inside the entry + &.left { padding-left: 0; } + &.right { padding-right: 0; } + } &.flat, &.flat:focus { padding: 2px; @@ -359,9 +357,7 @@ $_dot_color: $selected_bg_color; transition: $_button_transition; border: 1px solid; border-radius: 3px; - padding: 5px 8px; - - .header-bar & { padding: 6px 11px; } + padding: $vert_padding 8px; @include button(normal); @@ -506,29 +502,23 @@ $_dot_color: $selected_bg_color; } } - &.image-button { padding: 8px; } - - .header-bar &.image-button { padding: 6px 9px; } + &.image-button { padding: 2px + $vert_padding 10px; } &.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar &.text-button { padding: 6px 16px; } - &.text-button.image-button { // those buttons needs uneven horizontal padding, we want the icon side // to have the image-button padding, while the text side the text-button // one, so we're adding the missing padding to the label depending on // its position inside the button - padding: 4px 8px 5px; // same as .button + padding: $vert_padding 8px; // same as .button GtkLabel:first-child { padding-left: 8px; } GtkLabel:last-child { padding-right: 8px; } } - .header-bar &.text-button.image-button { padding: 6px 16px; } - .stack-switcher > & { // to position the needs attention dot, padding is added to the button // child, a label needs just lateral padding while an icon needs vertical @@ -543,21 +533,17 @@ $_dot_color: $selected_bg_color; > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; + padding-top: $vert_padding - 2px; + padding-bottom: $vert_padding - 2px; } - .header-bar > GtkLabel { padding: 6px 10px; } + &.text-button { padding: $vert_padding 10px; } // needed or it will get overridden - &.text-button { padding: 5px 10px; } - - .header-bar &.text-button { padding: 6px 10px; } - - &.image-button { padding: 1px 3px; } + &.image-button { padding: $vert_padding - 3px 4px; } &.needs-attention > GtkLabel, &.needs-attention > GtkImage { @extend %needs_attention; } - &.needs-attention:active > GtkLabel, + &.needs-attention:active > .label, &.needs-attention:active > GtkImage, &.needs-attention:checked > GtkLabel, &.needs-attention:checked > GtkImage { @@ -850,8 +836,6 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } &.entry { - // we should remove the bottom edge hilight here, but seems - // like buttons are on top of it so it doesn't show up border-radius: 0; padding-left: 5px; padding-right: 5px; @@ -883,9 +867,9 @@ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; - > .button { // Otherwise combos - padding-top: 3px; // are bigger than - padding-bottom: 4px; // buttons + > .button { // Otherwise combos + padding-top: $vert_padding - 2px; // are bigger than + padding-bottom: $vert_padding - 2px; // buttons } &:insensitive { @@ -1009,7 +993,7 @@ GtkComboBox { // Headerbars // .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; @@ -1027,12 +1011,14 @@ GtkComboBox { &:backdrop { color: transparentize($header_fg, 0.3); } .title { - padding: 0px 12px; + padding-left: 12px; + padding-right: 12px; } .subtitle { font-size: smaller; - padding: 0 12px; + padding-left: 12px; + padding-right: 12px; @extend .dim-label; } @@ -1113,8 +1099,8 @@ GtkComboBox { .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows &.default-decoration:backdrop, .csd &.default-decoration:backdrop { - padding-top: 5px; // less padding for ssd - padding-bottom: 5px; // + padding-top: 4px; // less padding for ssd + padding-bottom: 4px; // background-color: opacify($header_bg, 1); border-bottom-width: 0; @@ -1395,18 +1381,20 @@ GtkComboBox { // Pathbars // .path-bar .button { - padding-left: 6px; - padding-right: 6px; + padding: 5px 10px; + &:first-child { padding-left: 10px; } + &:last-child { padding-right: 10px; } &:only-child { - padding-left: 12px; - padding-right: 12px; + padding-left: 14px; + padding-right: 14px; } // the following is for spacing the icon and the label inside the home button - GtkLabel:last-child { padding-left: 2px; } - GtkLabel:first-child { padding-right: 2px; } - GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } + GtkLabel:last-child { padding-left: 4px; } + GtkLabel:first-child { padding-right: 4px; } + GtkLabel:only-child, GtkLabel { padding-right: 0; padding-left: 0; } + GtkImage { padding-top: 2px; padding-bottom: 1px; } } // @@ -2602,7 +2590,7 @@ GtkColorChooserWidget #add-color-button { } GtkColorButton.button { - padding: 4px; // Uniform padding on the GtkColorButton + padding: 5px; // Uniform padding on the GtkColorButton GtkColorSwatch { border-radius: 0; } } @@ -2702,11 +2690,12 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + @extend .image-button; + padding: 8px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; + border-width: transparentize($header_bg, 1); color: transparent; background-position: center; diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 2ec0fed..fa5edb6 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -259,8 +258,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -312,7 +309,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -457,23 +455,21 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -482,16 +478,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -752,9 +745,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -809,7 +802,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -822,10 +815,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -882,8 +877,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1193,18 +1188,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2278,7 +2279,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2410,7 +2411,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 4406219..468e8d0 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +454,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,16 +477,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -751,9 +744,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +805,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +818,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -885,8 +880,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1191,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2281,7 +2282,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2413,7 +2414,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index f3bdbb3..998942c 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -259,8 +258,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -312,7 +309,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -457,23 +455,21 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -482,16 +478,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -752,9 +745,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -809,7 +802,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -822,10 +815,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -882,8 +877,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1193,18 +1188,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2278,7 +2279,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2410,7 +2411,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index ad9bf79..989f748 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +454,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,16 +477,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -751,9 +744,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +805,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +818,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -885,8 +880,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1191,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2281,7 +2282,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2413,7 +2414,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index 62db911..b3c2541 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +454,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,16 +477,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -751,9 +744,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +805,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +818,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -885,8 +880,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1191,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2281,7 +2282,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2413,7 +2414,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 4c2d945..c368c67 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -125,18 +125,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -258,8 +257,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; @@ -311,7 +308,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -456,23 +454,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -481,16 +477,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -751,9 +744,9 @@ GtkSearchEntry.entry { GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } - GtkComboBox > .button { + GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { @@ -812,7 +805,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -825,10 +818,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -885,8 +880,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1196,18 +1191,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2281,7 +2282,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2413,7 +2414,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index fa89856..9aac2f9 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -188,24 +188,22 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } +$vert_padding: 5px; // // Text Entries // .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: $vert_padding 8px; border-radius: 3px; transition: all 200ms $ease-out-quad; @include entry(normal); - .header-bar & { padding: 6px; } - - //&.image { // icons inside the entry - // &.left { padding-left: 0; } - // &.right { padding-right: 0; } - //} - &.image { padding-left: 3px; padding-right: 3px; } + &.image { // icons inside the entry + &.left { padding-left: 0; } + &.right { padding-right: 0; } + } &.flat, &.flat:focus { padding: 2px; @@ -359,9 +357,7 @@ $_dot_color: $selected_bg_color; transition: $_button_transition; border: 1px solid; border-radius: 3px; - padding: 5px 8px; - - .header-bar & { padding: 6px 11px; } + padding: $vert_padding 8px; @include button(normal); @@ -506,29 +502,23 @@ $_dot_color: $selected_bg_color; } } - &.image-button { padding: 8px; } - - .header-bar &.image-button { padding: 6px 9px; } + &.image-button { padding: 2px + $vert_padding 10px; } &.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar &.text-button { padding: 6px 16px; } - &.text-button.image-button { // those buttons needs uneven horizontal padding, we want the icon side // to have the image-button padding, while the text side the text-button // one, so we're adding the missing padding to the label depending on // its position inside the button - padding: 4px 8px 5px; // same as .button + padding: $vert_padding 8px; // same as .button GtkLabel:first-child { padding-left: 8px; } GtkLabel:last-child { padding-right: 8px; } } - .header-bar &.text-button.image-button { padding: 6px 16px; } - .stack-switcher > & { // to position the needs attention dot, padding is added to the button // child, a label needs just lateral padding while an icon needs vertical @@ -543,17 +533,13 @@ $_dot_color: $selected_bg_color; > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; + padding-top: $vert_padding - 2px; + padding-bottom: $vert_padding - 2px; } - .header-bar > GtkLabel { padding: 6px 10px; } + &.text-button { padding: $vert_padding 10px; } // needed or it will get overridden - &.text-button { padding: 5px 10px; } - - .header-bar &.text-button { padding: 6px 10px; } - - &.image-button { padding: 1px 3px; } + &.image-button { padding: $vert_padding - 3px 4px; } &.needs-attention > .label, &.needs-attention > GtkImage { @extend %needs_attention; } @@ -881,9 +867,9 @@ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; - > .button { // Otherwise combos - padding-top: 3px; // are bigger than - padding-bottom: 4px; // buttons + > .the-button-in-the-combobox { // Otherwise combos + padding-top: $vert_padding - 2px; // are bigger than + padding-bottom: $vert_padding - 2px; // buttons } &:insensitive { @@ -1007,7 +993,7 @@ GtkComboBox { // Headerbars // .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; @@ -1025,12 +1011,14 @@ GtkComboBox { &:backdrop { color: transparentize($header_fg, 0.3); } .title { - padding: 0px 12px; + padding-left: 12px; + padding-right: 12px; } .subtitle { font-size: smaller; - padding: 0 12px; + padding-left: 12px; + padding-right: 12px; @extend .dim-label; } @@ -1111,8 +1099,8 @@ GtkComboBox { .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows &.default-decoration:backdrop, .csd &.default-decoration:backdrop { - padding-top: 5px; // less padding for ssd - padding-bottom: 5px; // + padding-top: 4px; // less padding for ssd + padding-bottom: 4px; // background-color: opacify($header_bg, 1); border-bottom-width: 0; @@ -1393,18 +1381,20 @@ GtkComboBox { // Pathbars // .path-bar .button { - padding-left: 6px; - padding-right: 6px; + padding: 5px 10px; + &:first-child { padding-left: 10px; } + &:last-child { padding-right: 10px; } &:only-child { - padding-left: 12px; - padding-right: 12px; + padding-left: 14px; + padding-right: 14px; } // the following is for spacing the icon and the label inside the home button - GtkLabel:last-child { padding-left: 2px; } - GtkLabel:first-child { padding-right: 2px; } - GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } + GtkLabel:last-child { padding-left: 4px; } + GtkLabel:first-child { padding-right: 4px; } + GtkLabel:only-child, GtkLabel { padding-right: 0; padding-left: 0; } + GtkImage { padding-top: 2px; padding-bottom: 1px; } } // @@ -2700,13 +2690,13 @@ GtkColorSwatch { } GtkColorButton.button { - padding: 4px; // Uniform padding on the GtkColorButton + padding: 5px; // Uniform padding on the GtkColorButton GtkColorSwatch { border-radius: 0; } } // -// Misc * +// Misc // .scale-popup .button { // +/- buttons on GtkVolumeButton popup padding: 6px; @@ -2812,7 +2802,9 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 6px 4px; + @extend .image-button; + + padding: 8px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 6d57ece..588e53b 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -225,8 +224,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -278,7 +275,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -419,23 +417,21 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -444,16 +440,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -839,7 +832,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -896,7 +889,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -909,10 +902,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -969,8 +964,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1297,18 +1292,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2261,7 +2262,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2424,7 +2426,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2561,7 +2563,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2748,7 +2750,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 3bd254a..269ab8c 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -224,8 +223,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -277,7 +274,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -418,23 +416,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -443,16 +439,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -838,7 +831,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -899,7 +892,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -912,10 +905,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -972,8 +967,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1300,18 +1295,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.67); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2264,7 +2265,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2427,7 +2429,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2564,7 +2566,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2751,7 +2753,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 58ab25e..6699103 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; @@ -225,8 +224,6 @@ GtkSearchEntry.entry { outline-color: rgba(211, 218, 227, 0.3); border-color: #2b2e39; background-color: #444a58; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -278,7 +275,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -419,23 +417,21 @@ GtkSearchEntry.entry { background-color: rgba(68, 74, 88, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -444,16 +440,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -839,7 +832,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -896,7 +889,7 @@ GtkComboBox { background-color: #313541; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -909,10 +902,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -969,8 +964,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1297,18 +1292,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2261,7 +2262,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2424,7 +2426,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2561,7 +2563,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2748,7 +2750,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 42afe55..70e8f66 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -224,8 +223,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -277,7 +274,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -418,23 +416,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -443,16 +439,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -838,7 +831,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -899,7 +892,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -912,10 +905,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -972,8 +967,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #2f343f; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1300,18 +1295,24 @@ GtkComboBox { border-color: rgba(21, 23, 28, 0.7); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2264,7 +2265,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2427,7 +2429,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2564,7 +2566,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2751,7 +2753,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 773ff78..9bac4a2 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -224,8 +223,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -277,7 +274,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: #353945; border-color: #23262e; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -418,23 +416,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -443,16 +439,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -838,7 +831,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -899,7 +892,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -912,10 +905,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: #5294E2; @@ -972,8 +967,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1304,18 +1299,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2268,7 +2269,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2431,7 +2433,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2568,7 +2570,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2755,7 +2757,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 752380c..d6ab237 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -124,18 +124,17 @@ GtkTextView { .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: 5px 8px; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } - .header-bar .entry { - padding: 6px; } - .entry.image { - padding-left: 3px; - padding-right: 3px; } + .entry.image.left { + padding-left: 0; } + .entry.image.right { + padding-right: 0; } .entry.flat, .entry.flat:focus { padding: 2px; color: #5c616c; @@ -224,8 +223,6 @@ GtkSearchEntry.entry { outline-color: rgba(92, 97, 108, 0.3); border-color: #cfd6e6; background-color: #fbfbfc; } - .header-bar .button { - padding: 6px 11px; } .button.flat, .sidebar-button.button { border-color: transparent; background-color: transparent; @@ -277,7 +274,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); background-color: rgba(53, 57, 69, 0.95); border-color: rgba(35, 38, 46, 0.95); } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton { padding: 10px; } .button.osd:hover { color: #5294E2; } @@ -418,23 +416,21 @@ GtkSearchEntry.entry { background-color: rgba(251, 251, 252, 0.55); } .button.destructive-action:insensitive > GtkLabel { color: inherit; } - .button.image-button { - padding: 8px; } - .header-bar .button.image-button { - padding: 6px 9px; } + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton { + padding: 7px 10px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar .button.text-button { - padding: 6px 16px; } - .button.text-button.image-button { - padding: 4px 8px 5px; } - .button.text-button.image-button GtkLabel:first-child { + .button.text-button.image-button, .header-bar .button.text-button.titlebutton, + .titlebar .button.text-button.titlebutton { + padding: 5px 8px; } + .button.text-button.image-button GtkLabel:first-child, .header-bar .button.text-button.titlebutton GtkLabel:first-child, + .titlebar .button.text-button.titlebutton GtkLabel:first-child { padding-left: 8px; } - .button.text-button.image-button GtkLabel:last-child { + .button.text-button.image-button GtkLabel:last-child, .header-bar .button.text-button.titlebutton GtkLabel:last-child, + .titlebar .button.text-button.titlebutton GtkLabel:last-child { padding-right: 8px; } - .header-bar .button.text-button.image-button { - padding: 6px 16px; } .stack-switcher > .button { outline-offset: -3px; } .stack-switcher > .button > GtkLabel { @@ -443,16 +439,13 @@ GtkSearchEntry.entry { .stack-switcher > .button > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; } - .stack-switcher > .button .header-bar > GtkLabel { - padding: 6px 10px; } + padding-top: 3px; + padding-bottom: 3px; } .stack-switcher > .button.text-button { padding: 5px 10px; } - .header-bar .stack-switcher > .button.text-button { - padding: 6px 10px; } - .stack-switcher > .button.image-button { - padding: 1px 3px; } + .stack-switcher > .button.image-button, .header-bar .stack-switcher > .button.titlebutton, + .titlebar .stack-switcher > .button.titlebutton { + padding: 2px 4px; } .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, @@ -838,7 +831,7 @@ GtkComboBox { -GtkComboBox-shadow-type: none; } GtkComboBox > .the-button-in-the-combobox { padding-top: 3px; - padding-bottom: 4px; } + padding-bottom: 3px; } GtkComboBox:insensitive { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator { @@ -899,7 +892,7 @@ GtkComboBox { background-color: #edeef0; } .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; border-radius: 0; @@ -912,10 +905,12 @@ GtkComboBox { .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); } .header-bar .title { - padding: 0px 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar .subtitle { font-size: smaller; - padding: 0 12px; } + padding-left: 12px; + padding-right: 12px; } .header-bar.selection-mode, .header-bar.titlebar.selection-mode { color: #ffffff; background-color: rgba(82, 148, 226, 0.95); @@ -972,8 +967,8 @@ GtkComboBox { .header-bar.default-decoration, .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop, .csd .header-bar.default-decoration:backdrop { - padding-top: 5px; - padding-bottom: 5px; + padding-top: 4px; + padding-bottom: 4px; background-color: #e7e8eb; border-bottom-width: 0; } .maximized .header-bar.default-decoration, .maximized @@ -1304,18 +1299,24 @@ GtkComboBox { border-color: rgba(82, 93, 118, 0.3); } .path-bar .button { - padding-left: 6px; - padding-right: 6px; } + padding: 5px 10px; } + .path-bar .button:first-child { + padding-left: 10px; } + .path-bar .button:last-child { + padding-right: 10px; } .path-bar .button:only-child { - padding-left: 12px; - padding-right: 12px; } + padding-left: 14px; + padding-right: 14px; } .path-bar .button GtkLabel:last-child { - padding-left: 2px; } - .path-bar .button GtkLabel:first-child { - padding-right: 2px; } - .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { - padding-right: 4px; padding-left: 4px; } + .path-bar .button GtkLabel:first-child { + padding-right: 4px; } + .path-bar .button GtkLabel:only-child, .path-bar .button GtkLabel { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage { + padding-top: 2px; + padding-bottom: 1px; } GtkTreeView.view { -GtkTreeView-grid-line-width: 1; @@ -2268,7 +2269,8 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-button.button { outline-radius: 50%; border-radius: 50%; } - .sidebar-button.button.image-button { + .sidebar-button.button.image-button, .header-bar .sidebar-button.button.titlebutton, + .titlebar .sidebar-button.button.titlebutton { padding: 3px; } .sidebar-button.button:not(:hover):not(:active) > GtkImage { opacity: 0.5; } @@ -2431,7 +2433,7 @@ GtkColorSwatch#add-color-button { background-image: none; } GtkColorButton.button { - padding: 4px; } + padding: 5px; } GtkColorButton.button GtkColorSwatch { border-radius: 0; } @@ -2568,7 +2570,7 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 6px 4px; + padding: 8px 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -2755,7 +2757,8 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } -.nautilus-circular-button.image-button.button { +.nautilus-circular-button.image-button.button, .header-bar .nautilus-circular-button.button.titlebutton, +.titlebar .nautilus-circular-button.button.titlebutton { border-radius: 50%; outline-radius: 50%; padding: 8px; } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 27ef901..af27500 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -187,24 +187,22 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } +$vert_padding: 5px; // // Text Entries // .entry { border: 1px solid; - padding: 5px 8px 6px; + padding: $vert_padding 8px; border-radius: 3px; transition: all 200ms $ease-out-quad; @include entry(normal); - .header-bar & { padding: 6px; } - - //&.image { // icons inside the entry - // &.left { padding-left: 0; } - // &.right { padding-right: 0; } - //} - &.image { padding-left: 3px; padding-right: 3px; } + &.image { // icons inside the entry + &.left { padding-left: 0; } + &.right { padding-right: 0; } + } &.flat, &.flat:focus { padding: 2px; @@ -298,9 +296,7 @@ $_dot_color: $selected_bg_color; transition: $_button_transition; border: 1px solid; border-radius: 3px; - padding: 5px 8px; - - .header-bar & { padding: 6px 11px; } + padding: $vert_padding 8px; @include button(normal); @@ -443,29 +439,23 @@ $_dot_color: $selected_bg_color; } } - &.image-button { padding: 8px; } - - .header-bar &.image-button { padding: 6px 9px; } + &.image-button { padding: 2px + $vert_padding 10px; } &.text-button { padding-left: 16px; padding-right: 16px; } - .header-bar &.text-button { padding: 6px 16px; } - &.text-button.image-button { // those buttons needs uneven horizontal padding, we want the icon side // to have the image-button padding, while the text side the text-button // one, so we're adding the missing padding to the label depending on // its position inside the button - padding: 4px 8px 5px; // same as .button + padding: $vert_padding 8px; // same as .button GtkLabel:first-child { padding-left: 8px; } GtkLabel:last-child { padding-right: 8px; } } - .header-bar &.text-button.image-button { padding: 6px 16px; } - .stack-switcher > & { // to position the needs attention dot, padding is added to the button // child, a label needs just lateral padding while an icon needs vertical @@ -480,17 +470,13 @@ $_dot_color: $selected_bg_color; > GtkImage { padding-left: 6px; padding-right: 6px; - padding-top: 5px; - padding-bottom: 5px; + padding-top: $vert_padding - 2px; + padding-bottom: $vert_padding - 2px; } - .header-bar > GtkLabel { padding: 6px 10px; } + &.text-button { padding: $vert_padding 10px; } // needed or it will get overridden - &.text-button { padding: 5px 10px; } - - .header-bar &.text-button { padding: 6px 10px; } - - &.image-button { padding: 1px 3px; } + &.image-button { padding: $vert_padding - 3px 4px; } &.needs-attention > .label, &.needs-attention > GtkImage { @extend %needs_attention; } @@ -923,9 +909,9 @@ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; - > .the-button-in-the-combobox { // Otherwise combos - padding-top: 3px; // are bigger than - padding-bottom: 4px; // buttons + > .the-button-in-the-combobox { // Otherwise combos + padding-top: $vert_padding - 2px; // are bigger than + padding-bottom: $vert_padding - 2px; // buttons } &:insensitive { @@ -1047,7 +1033,7 @@ GtkComboBox { // Headerbars // .header-bar { - padding: 7px 7px 6px 7px; + padding: 5px 5px 4px 5px; border-width: 0 0 1px; border-style: solid; @@ -1065,12 +1051,14 @@ GtkComboBox { &:backdrop { color: transparentize($header_fg, 0.3); } .title { - padding: 0px 12px; + padding-left: 12px; + padding-right: 12px; } .subtitle { font-size: smaller; - padding: 0 12px; + padding-left: 12px; + padding-right: 12px; @extend .dim-label; } @@ -1151,8 +1139,8 @@ GtkComboBox { .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows &.default-decoration:backdrop, .csd &.default-decoration:backdrop { - padding-top: 5px; // less padding for ssd - padding-bottom: 5px; // + padding-top: 4px; // less padding for ssd + padding-bottom: 4px; // background-color: opacify($header_bg, 1); border-bottom-width: 0; @@ -1486,18 +1474,20 @@ GtkComboBox { // Pathbars // .path-bar .button { - padding-left: 6px; - padding-right: 6px; + padding: 5px 10px; + &:first-child { padding-left: 10px; } + &:last-child { padding-right: 10px; } &:only-child { - padding-left: 12px; - padding-right: 12px; + padding-left: 14px; + padding-right: 14px; } // the following is for spacing the icon and the label inside the home button - GtkLabel:last-child { padding-left: 2px; } - GtkLabel:first-child { padding-right: 2px; } - GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } + GtkLabel:last-child { padding-left: 4px; } + GtkLabel:first-child { padding-right: 4px; } + GtkLabel:only-child, GtkLabel { padding-right: 0; padding-left: 0; } + GtkImage { padding-top: 2px; padding-bottom: 1px; } } // @@ -2852,7 +2842,7 @@ GtkColorSwatch { } GtkColorButton.button { - padding: 4px; // Uniform padding on the GtkColorButton + padding: 5px; // Uniform padding on the GtkColorButton GtkColorSwatch { border-radius: 0; } } @@ -2971,7 +2961,9 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 6px 4px; + @extend .image-button; + + padding: 8px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1);