From 998f43106e201f54abab59cd398ee0397c92502c Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Sun, 15 Mar 2015 11:03:04 -0400 Subject: [PATCH] New switch assets & style. --- Paper/gtk-3.0/apps/nautilus.css | 32 --- Paper/gtk-3.0/assets/switch-off-dark.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-off-dark@2.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-off-disabled.svg | 149 ++++++++++++++ .../gtk-3.0/assets/switch-off-disabled@2.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-off.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-off@2.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-on-dark.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-on-dark@2.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-on-disabled.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-on-disabled@2.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-on.svg | 149 ++++++++++++++ Paper/gtk-3.0/assets/switch-slider-dark.svg | 183 ++++++++++++++++++ Paper/gtk-3.0/assets/switch-slider-dark@2.svg | 183 ++++++++++++++++++ Paper/gtk-3.0/assets/switch-slider-focus.svg | 183 ++++++++++++++++++ .../gtk-3.0/assets/switch-slider-focus@2.svg | 183 ++++++++++++++++++ .../assets/switch-slider-insensitive-dark.svg | 152 +++++++++++++++ .../switch-slider-insensitive-dark@2.svg | 152 +++++++++++++++ .../assets/switch-slider-insensitive.svg | 183 ++++++++++++++++++ .../assets/switch-slider-insensitive@2.svg | 183 ++++++++++++++++++ Paper/gtk-3.0/assets/switch-slider.svg | 183 ++++++++++++++++++ Paper/gtk-3.0/assets/switch-slider@2.svg | 183 ++++++++++++++++++ Paper/gtk-3.0/gtk-widgets-assets-dark.css | 48 +++++ Paper/gtk-3.0/gtk-widgets-assets.css | 47 +++++ Paper/gtk-3.0/gtk-widgets.css | 1 + Paper/gtk-3.0/widgets/app-notifications.css | 3 +- Paper/gtk-3.0/widgets/buttons.css | 10 + Paper/gtk-3.0/widgets/floating-bar.css | 29 +++ Paper/gtk-3.0/widgets/switches.css | 21 +- 29 files changed, 3561 insertions(+), 37 deletions(-) create mode 100644 Paper/gtk-3.0/assets/switch-off-dark.svg create mode 100644 Paper/gtk-3.0/assets/switch-off-dark@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-off-disabled.svg create mode 100644 Paper/gtk-3.0/assets/switch-off-disabled@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-off.svg create mode 100644 Paper/gtk-3.0/assets/switch-off@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-on-dark.svg create mode 100644 Paper/gtk-3.0/assets/switch-on-dark@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-on-disabled.svg create mode 100644 Paper/gtk-3.0/assets/switch-on-disabled@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-on.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-dark.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-dark@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-focus.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-focus@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-insensitive-dark.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-insensitive-dark@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-insensitive.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider-insensitive@2.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider.svg create mode 100644 Paper/gtk-3.0/assets/switch-slider@2.svg create mode 100644 Paper/gtk-3.0/widgets/floating-bar.css diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css index 3f965d0..681e73b 100644 --- a/Paper/gtk-3.0/apps/nautilus.css +++ b/Paper/gtk-3.0/apps/nautilus.css @@ -79,11 +79,6 @@ NautilusWindow .dynamic-notebook tab.right:active { box-shadow:inset 3px 0 0 0 @nautilus; } -.nautilus-circular-button, -.button .image-button .nautilus-circular-button { - border-radius: 50%; -} - .nautilus-canvas-item { border-radius: 5px; } @@ -128,33 +123,6 @@ NautilusWindow .dynamic-notebook tab.right:active { outline-radius: 20px; } -/* Floating status bar */ -.floating-bar { - padding: 2px; - background-color: @background; - border-width: 1px; - border-style: solid solid none; - border-color: @border; - border-radius: 3px 3px 0 0; -} - -.floating-bar.bottom.left { /* axes left border and border radius */ - border-left-style: none; - border-top-left-radius: 0; -} -.floating-bar.bottom.right { /* axes right border and border radius */ - border-right-style: none; - border-top-right-radius: 0; -} - -.floating-bar:backdrop { - background-color: @backdrop_background; - border-color: @backdrop_border; -} - -.floating-bar .button { - padding: 4px; -} .search-bar { box-shadow: none; diff --git a/Paper/gtk-3.0/assets/switch-off-dark.svg b/Paper/gtk-3.0/assets/switch-off-dark.svg new file mode 100644 index 0000000..f62f496 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off-dark.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-off-dark@2.svg b/Paper/gtk-3.0/assets/switch-off-dark@2.svg new file mode 100644 index 0000000..def55f5 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off-dark@2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-off-disabled.svg b/Paper/gtk-3.0/assets/switch-off-disabled.svg new file mode 100644 index 0000000..8668702 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off-disabled.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-off-disabled@2.svg b/Paper/gtk-3.0/assets/switch-off-disabled@2.svg new file mode 100644 index 0000000..da7726b --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off-disabled@2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-off.svg b/Paper/gtk-3.0/assets/switch-off.svg new file mode 100644 index 0000000..4f2fe0d --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-off@2.svg b/Paper/gtk-3.0/assets/switch-off@2.svg new file mode 100644 index 0000000..3bdc956 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-off@2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-on-dark.svg b/Paper/gtk-3.0/assets/switch-on-dark.svg new file mode 100644 index 0000000..173e381 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-on-dark.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-on-dark@2.svg b/Paper/gtk-3.0/assets/switch-on-dark@2.svg new file mode 100644 index 0000000..43992ae --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-on-dark@2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-on-disabled.svg b/Paper/gtk-3.0/assets/switch-on-disabled.svg new file mode 100644 index 0000000..2b4ca24 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-on-disabled.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-on-disabled@2.svg b/Paper/gtk-3.0/assets/switch-on-disabled@2.svg new file mode 100644 index 0000000..93a6ef1 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-on-disabled@2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-on.svg b/Paper/gtk-3.0/assets/switch-on.svg new file mode 100644 index 0000000..e627672 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-on.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-dark.svg b/Paper/gtk-3.0/assets/switch-slider-dark.svg new file mode 100644 index 0000000..09cc80b --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-dark.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-dark@2.svg b/Paper/gtk-3.0/assets/switch-slider-dark@2.svg new file mode 100644 index 0000000..8a66313 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-dark@2.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-focus.svg b/Paper/gtk-3.0/assets/switch-slider-focus.svg new file mode 100644 index 0000000..b48f6b0 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-focus.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-focus@2.svg b/Paper/gtk-3.0/assets/switch-slider-focus@2.svg new file mode 100644 index 0000000..703e1e0 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-focus@2.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-insensitive-dark.svg b/Paper/gtk-3.0/assets/switch-slider-insensitive-dark.svg new file mode 100644 index 0000000..7f04d7d --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-insensitive-dark.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-insensitive-dark@2.svg b/Paper/gtk-3.0/assets/switch-slider-insensitive-dark@2.svg new file mode 100644 index 0000000..a61b454 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-insensitive-dark@2.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-insensitive.svg b/Paper/gtk-3.0/assets/switch-slider-insensitive.svg new file mode 100644 index 0000000..fb24121 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-insensitive.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider-insensitive@2.svg b/Paper/gtk-3.0/assets/switch-slider-insensitive@2.svg new file mode 100644 index 0000000..5133443 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider-insensitive@2.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider.svg b/Paper/gtk-3.0/assets/switch-slider.svg new file mode 100644 index 0000000..baf8114 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/assets/switch-slider@2.svg b/Paper/gtk-3.0/assets/switch-slider@2.svg new file mode 100644 index 0000000..0766a63 --- /dev/null +++ b/Paper/gtk-3.0/assets/switch-slider@2.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Paper/gtk-3.0/gtk-widgets-assets-dark.css b/Paper/gtk-3.0/gtk-widgets-assets-dark.css index 87fb94f..0796d1d 100644 --- a/Paper/gtk-3.0/gtk-widgets-assets-dark.css +++ b/Paper/gtk-3.0/gtk-widgets-assets-dark.css @@ -273,6 +273,54 @@ background: url("assets/resize-grip.svg"); } + +/************* + * GtkSwitch * + *************/ + + +GtkSwitch.trough { + background: -gtk-scaled(url("assets/switch-off-dark.svg"),url("assets/switch-off-dark@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:active { + background: -gtk-scaled(url("assets/switch-on-dark.svg"),url("assets/switch-on-dark@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:insensitive { + background: -gtk-scaled(url("assets/switch-off-disabled.svg"),url("assets/switch-off-disabled@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:active:insensitive { + background: -gtk-scaled(url("assets/switch-on-disabled.svg"),url("assets/switch-on-disabled@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider { + background: -gtk-scaled(url("assets/switch-slider-dark.svg"),url("assets/switch-slider-dark@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider:focus { + background: -gtk-scaled(url("assets/switch-slider-focus.svg"),url("assets/switch-slider-focus@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider:insensitive { + background: -gtk-scaled(url("assets/switch-slider-insensitive-dark.svg"),url("assets/switch-slider-insensitive-dark@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + /******************* * Pane separators * *******************/ diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css index a91d8f1..f6eaf66 100644 --- a/Paper/gtk-3.0/gtk-widgets-assets.css +++ b/Paper/gtk-3.0/gtk-widgets-assets.css @@ -273,6 +273,53 @@ background: url("assets/resize-grip.svg"); } +/************* + * GtkSwitch * + *************/ + + +GtkSwitch.trough { + background: -gtk-scaled(url("assets/switch-off.svg"),url("assets/switch-off@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:active { + background: -gtk-scaled(url("assets/switch-on.svg"),url("assets/switch-on@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:insensitive { + background: -gtk-scaled(url("assets/switch-off-disabled.svg"),url("assets/switch-off-disabled@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.trough:active:insensitive { + background: -gtk-scaled(url("assets/switch-on-disabled.svg"),url("assets/switch-on-disabled@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider { + background: -gtk-scaled(url("assets/switch-slider.svg"),url("assets/switch-slider@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider:focus { + background: -gtk-scaled(url("assets/switch-slider-focus.svg"),url("assets/switch-slider-focus@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + +GtkSwitch.slider:insensitive { + background: -gtk-scaled(url("assets/switch-slider-insensitive.svg"),url("assets/switch-slider-insensitive@2.svg")); + background-repeat: no-repeat; + background-position: 0 center; +} + /******************* * Pane separators * diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css index 40bcfaa..0d87461 100644 --- a/Paper/gtk-3.0/gtk-widgets.css +++ b/Paper/gtk-3.0/gtk-widgets.css @@ -67,6 +67,7 @@ @import url("widgets/dialogs.css"); @import url("widgets/dynamic-notebook.css"); @import url("widgets/entry.css"); +@import url("widgets/floating-bar.css"); @import url("widgets/header-bar.css"); @import url("widgets/images.css"); @import url("widgets/infobars.css"); diff --git a/Paper/gtk-3.0/widgets/app-notifications.css b/Paper/gtk-3.0/widgets/app-notifications.css index f950e99..8afab8f 100644 --- a/Paper/gtk-3.0/widgets/app-notifications.css +++ b/Paper/gtk-3.0/widgets/app-notifications.css @@ -34,7 +34,8 @@ .app-notification:backdrop, .app-notification.frame:backdrop { - background-image: none; + background-color: @backdrop_background; + border-color: @backdrop_border; } .app-notification .button, .app-notification .header-bar .button.titlebutton, .header-bar .app-notification .button.titlebutton, diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css index 684aae1..bb48900 100644 --- a/Paper/gtk-3.0/widgets/buttons.css +++ b/Paper/gtk-3.0/widgets/buttons.css @@ -289,6 +289,16 @@ GtkCalendar.button:backdrop:hover, border-radius: 16px; } + +.button .circular-button { + padding-top: 4px; + padding-bottom: 4px; + padding-right: 2px; + padding-left: 2px; + border-radius: 12px; +} + + /*************************** * Overlay Button * ***************************/ diff --git a/Paper/gtk-3.0/widgets/floating-bar.css b/Paper/gtk-3.0/widgets/floating-bar.css new file mode 100644 index 0000000..0666baa --- /dev/null +++ b/Paper/gtk-3.0/widgets/floating-bar.css @@ -0,0 +1,29 @@ + +/* Floating status bar */ +.floating-bar { + padding: 2px; + background-color: @background; + border-width: 1px; + border-style: solid solid none; + border-color: @border; + border-radius: 3px 3px 0 0; +} + +.floating-bar.bottom.left { /* axes left border and border radius */ + border-left-style: none; + border-top-left-radius: 0; +} + +.floating-bar.bottom.right { /* axes right border and border radius */ + border-right-style: none; + border-top-right-radius: 0; +} + +.floating-bar:backdrop { + background-color: @backdrop_background; + border-color: @backdrop_border; +} + +.floating-bar .button { + padding: 4px; +} \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css index 0f3a40a..bc8ad3a 100644 --- a/Paper/gtk-3.0/widgets/switches.css +++ b/Paper/gtk-3.0/widgets/switches.css @@ -27,13 +27,12 @@ /************* * GtkSwitch * - *************/ + ************* GtkSwitch { border-radius: 1em; font: condensed; } -/* Trough */ GtkSwitch.trough { border-radius: 1em; border: 1px solid @trough_border; @@ -61,7 +60,6 @@ GtkSwitch.trough:active:insensitive { color: @insensitive_text; } -/* Slider */ GtkSwitch.slider { background-color: @slider_border; } @@ -78,4 +76,19 @@ GtkSwitch.slider:insensitive { GtkSwitch.slider:active:backdrop, GtkSwitch.slider:backdrop { background-color: @backdrop_slider_border; -} \ No newline at end of file +}*/ + +/************* + * GtkSwitch * + *************/ + +GtkSwitch { + font: 1; + -GtkSwitch-slider-width: 46; +} + +GtkSwitch.trough { + color: transparent; + border: none; + box-shadow: none; +}