diff --git a/Paper/gnome-shell/assets/panel-button-border.svg b/Paper/gnome-shell/assets/panel-button-border.svg
deleted file mode 100644
index c3ba394..0000000
--- a/Paper/gnome-shell/assets/panel-button-border.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
diff --git a/Paper/gnome-shell/assets/toggle-off.svg b/Paper/gnome-shell/assets/toggle-off.svg
index 664d2c8..3a3adc1 100644
--- a/Paper/gnome-shell/assets/toggle-off.svg
+++ b/Paper/gnome-shell/assets/toggle-off.svg
@@ -93,9 +93,9 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="8.0384568"
- inkscape:cx="27.434171"
- inkscape:cy="9.8544528"
+ inkscape:zoom="8"
+ inkscape:cx="52.419868"
+ inkscape:cy="9.4089895"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -130,7 +130,7 @@
image/svg+xml
-
+
@@ -139,41 +139,47 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(-444.64286,-782.36218)">
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Paper/gnome-shell/assets/toggle-on.svg b/Paper/gnome-shell/assets/toggle-on.svg
index 937e573..27e8de1 100644
--- a/Paper/gnome-shell/assets/toggle-on.svg
+++ b/Paper/gnome-shell/assets/toggle-on.svg
@@ -93,9 +93,9 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="8.0384568"
- inkscape:cx="33.883431"
- inkscape:cy="8.8706673"
+ inkscape:zoom="8"
+ inkscape:cx="30.669868"
+ inkscape:cy="8.4089895"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -130,7 +130,7 @@
image/svg+xml
-
+
@@ -139,37 +139,47 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(-444.64286,-782.36218)">
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css
index bd3203e..c867adc 100644
--- a/Paper/gnome-shell/gnome-shell.css
+++ b/Paper/gnome-shell/gnome-shell.css
@@ -2,7 +2,7 @@
*
* This file is part of the Paper theme.
*
-* Portions adapted from Gnome-Shell default theme
+* Layout and code style adapted from the default GNOME Shell theme
* Copyright 2009 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or modify it
@@ -66,6 +66,8 @@ StEntry {
selection-background-color: #9FB0B9;
selected-color: #ffffff; }
StEntry:focus {
+ background-color: #dbdee0;
+ color: #2d3335;
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.5);
border-color: rgba(0, 0, 0, 0.5); }
StEntry:insensitive {
@@ -130,16 +132,14 @@ StScrollBar {
width: 72px;
height: 21px;
background-size: contain; }
-
-.toggle-switch-us {
- background-image: url("assets/toggle-off.svg"); }
- .toggle-switch-us:checked {
- background-image: url("assets/toggle-on.svg"); }
-
-.toggle-switch-intl {
- background-image: url("assets/toggle-off.svg"); }
- .toggle-switch-intl:checked {
+ .toggle-switch-intl, .toggle-switch-us {
+ background-image: url("assets/toggle-off.svg"); }
+ .toggle-switch:hover .toggle-switch-intl, .toggle-switch:hover .toggle-switch-us {
+ background-image: url("assets/toggle-off-hover.svg"); }
+ .toggle-switch-intl:checked, .toggle-switch-us:checked {
background-image: url("assets/toggle-on.svg"); }
+ .toggle-switch:hover .toggle-switch-intl:checked, .toggle-switch:hover .toggle-switch-us:checked {
+ background-image: url("assets/toggle-on-hover.svg"); }
/* links */
.shell-link {
@@ -313,7 +313,7 @@ StScrollBar {
/* Password or Authentication Dialog */
.prompt-dialog {
width: 500px;
- border: 2px solid rgba(159, 176, 185, 0.2); }
+ border: 1px solid rgba(0, 0, 0, 0.5); }
.prompt-dialog-main-layout {
spacing: 24px;
@@ -1062,7 +1062,7 @@ StScrollBar {
.grid-search-result:active .overview-icon,
.grid-search-result:checked .overview-icon {
background-color: rgba(45, 51,53,0.9);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.7); }
+ box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.7); }
.app-well-app:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon,
.app-well-app.app-folder:hover .overview-icon,
@@ -1188,12 +1188,20 @@ StScrollBar {
.notification-banner .secondary-icon {
icon-size: 1.09em; }
.notification-banner .notification-actions {
- background-color: rgba(0, 0, 0, 0.7);
- padding-top: 2px;
+ background-color: #454d50;
+ padding-top: 0px;
spacing: 1px; }
.notification-banner .notification-button {
padding: 4px 4px 5px;
- background-color: #2d3335; }
+ background-color: #2d3335;
+ border-radius: 0;
+ border-width: 0;
+ padding: 4px 32px;
+ color: #dbdee0;
+ background-color: #2d3335;
+ border-color: rgba(0, 0, 0, 0.5);
+ border-top-width: 1px;
+ box-shadow: none}
.notification-banner .notification-button:first-child {
border-radius: 0 0 0 6px; }
.notification-banner .notification-button:last-child {
@@ -1249,13 +1257,24 @@ StScrollBar {
padding-right: 6px; }
.notification-button {
- height: 24px; }
+ height: 24px;
+ padding: 4px 4px 5px;
+ background-color: #2d3335;
+ border-radius: 0;
+ border-width: 0;
+ color: #dbdee0;
+ background-color: #2d3335;
+ border-color: rgba(0, 0, 0, 0.5);
+ border-top-width: 1px;
+ box-shadow: none }
.notification-icon-button {
border-radius: 5px;
padding: 5px;
height: 24px;
- width: 24px; }
+ width: 24px;
+ border: none;
+ box-shadow: none; }
.notification-icon-button > StIcon {
icons-size: 16px;
width: 16px;
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index 97d2c49..bbd9eea 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -27,16 +27,16 @@
@define-color insensitive_border shade(@border, 1.1);
@define-color insensitive_button @insensitive_background;
@define-color insensitive_separator shade(@separator, 1.05);
-@define-color insensitive_text alpha(#000, 0.3);
+@define-color insensitive_text shade(@text, 2.6);
@define-color insensitive_selection shade(@selection, 1.05);
/* Backdrop colors */
-@define-color backdrop_base shade(@base, 0.9);
+@define-color backdrop_base shade(@base, 0.99);
@define-color backdrop_background shade(@background, 0.99);
@define-color backdrop_foreground shade(@foreground, 1.2);
@define-color backdrop_border shade(@border, 1.02);
@define-color backdrop_separator shade(@separator, 0.99);
-@define-color backdrop_text alpha(@text, 0.5);
+@define-color backdrop_text shade(@text, 2.2);
@define-color backdrop_selection shade(@selection, 1.3);
/* Backdrop-insensitive colors */
@@ -113,7 +113,7 @@
****************/
@define-color progressbar_background shade(@selected_background, 1.02);
-@define-color backdrop_progressbar_background shade(@selected_background, 0.85);
+@define-color backdrop_progressbar_background shade(@selected_background, 1.2);
@define-color insensitive_progressbar_background shade(@insensitive_background, 0.85);
diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css
index ca4e134..a91d8f1 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets.css
@@ -273,6 +273,7 @@
background: url("assets/resize-grip.svg");
}
+
/*******************
* Pane separators *
*******************/
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 45cb41d..cedd08f 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -31,7 +31,7 @@
@define-color panel #454D50;/* Panel color */
@define-color header #636E73;/* Header color */
@define-color backdrop_header #454D50; /* Header backdrop color */
-@define-color header_text alpha(#fff, 0.8);/* Header text color */
+@define-color header_text alpha(#fff, 0.9);/* Header text color */
@define-color selection #9FB0B9;/* Selection color */
@define-color view_background #ffffff;/* View background */
@define-color inactive_frame @border;/* Inactive frame color */
diff --git a/Paper/gtk-3.0/widgets/app-notifications.css b/Paper/gtk-3.0/widgets/app-notifications.css
index 93eb50f..f950e99 100644
--- a/Paper/gtk-3.0/widgets/app-notifications.css
+++ b/Paper/gtk-3.0/widgets/app-notifications.css
@@ -22,13 +22,13 @@
*********************/
.app-notification,
.app-notification.frame {
- border: 1px solid alpha(#000, 0.1);
+ border: 1px solid @border;
border-top-width: 0px;
border-radius: 6px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
padding: 8px;
- background-color: alpha(#fff, 0.9);
+ background-color: @background;
color: @text;
}
diff --git a/Paper/gtk-3.0/widgets/progressbars.css b/Paper/gtk-3.0/widgets/progressbars.css
index 32faaaf..02c23ce 100644
--- a/Paper/gtk-3.0/widgets/progressbars.css
+++ b/Paper/gtk-3.0/widgets/progressbars.css
@@ -24,25 +24,41 @@
GtkProgressBar {
padding: 0;
- border-radius: 0px;
+ border-radius: 4px;
}
GtkProgressBar.progressbar,
GtkProgressBar.progressbar:active {
- color: alpha(#000,0.5);
+ border: 1px solid alpha(#000, 0.2);
+ color: @text;
background-color: @progressbar_background;
}
-GtkProgressBar.progressbar:backdrop {
- color: alpha(#000,0.5);
+GtkProgressBar.progressbar:backdrop,
+GtkProgressBar.progressbar:active:backdrop {
+ border: 1px solid alpha(#000, 0.15);
+ color: @backdrop_text;
background-color: @backdrop_progressbar_background;
}
GtkProgressBar.trough {
border: 1px solid alpha(#000, 0.2);
+ color: @text;
background-color: @trough_background;
}
+GtkProgressBar.trough:backdrop {
+ border: 1px solid alpha(#000, 0.15);
+ color: @backdrop_text;
+ background-color: @backdrop_trough_background;
+}
+
+GtkProgressBar.trough:insensitive {
+ border: 1px solid alpha(#000, 0.15);
+ color: @insensitive_text;
+ background-color: @insensitive_trough_background;
+}
+
.progressbar row,
.progressbar row:hover,
.progressbar row:selected,
@@ -87,20 +103,14 @@ GtkProgressBar.trough {
.trough row:hover,
.trough row:selected,
.trough row:selected:focus {
-
+ border-radius: 4px;
padding: 0;
-
border: 1px solid;
-
background-image: linear-gradient(to bottom,
@trough_background,
shade(@trough_background, 1.05)
);
-
- border-image: linear-gradient(to bottom,
- @border,
- shade(@border, 0.95)
- ) 1 1 1 1;
+ border: 1px solid @border;
}
.trough.vertical row,
@@ -111,32 +121,14 @@ GtkProgressBar.trough {
.trough:insensitive,
.trough.vertical:insensitive {
-
- padding: 0;
-
- border: 1px solid;
-
background-image:none;
background-color:@insensitive_base;
-
- border-image: linear-gradient(to bottom,
- @border,
- shade(@border, 0.95)
- ) 1 1 1 1;
+ border: 1px solid @insensitive_border;
}
.trough:backdrop,
.trough.vertical:backdrop {
-
padding: 0;
-
- border: 1px solid;
-
- background-image:none;
-
- border-image: linear-gradient(to bottom,
- @border,
- shade(@border, 0.95)
- ) 1 1 1 1;
+ border: 1px solid @backdrop_border;
background-color: @backdrop_background;
}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/scales.css b/Paper/gtk-3.0/widgets/scales.css
index 48f9866..4ca27cf 100644
--- a/Paper/gtk-3.0/widgets/scales.css
+++ b/Paper/gtk-3.0/widgets/scales.css
@@ -41,7 +41,7 @@
.scale.highlight.bottom:insensitive,
.menubar .menuitem .scale.highlight.left:insensitive,
.menubar .menuitem .scale.highlight.bottom:insensitive {
- border: 1px solid @border;
+ border: 1px solid @insensitive_base;
background-color: @insensitive_base;
}
@@ -50,7 +50,7 @@
.scale.highlight.bottom:hover,
.menubar .menuitem .scale.highlight.left:hover,
.menubar .menuitem .scale.highlight.bottom:hover {
- border: 1px solid @border;
+ border: 1px solid shade(@selection, 1.05);
background-color: shade(@selection, 1.05);
}
@@ -59,7 +59,7 @@
.scale.vertical.highlight.bottom:backdrop,
.menubar .menuitem.scale.highlight.left:backdrop,
.menubar .menuitem.scale.highlight.bottom:backdrop {
- border: 1px solid @border;
+ border: 1px solid @backdrop_selection;
background-color: @backdrop_selection;
}
diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css
index 0b6abba..2e10b82 100644
--- a/Paper/gtk-3.0/widgets/separators.css
+++ b/Paper/gtk-3.0/widgets/separators.css
@@ -75,4 +75,4 @@ GtkSeparator,
background-image: none;
background-color: @separator;
border: 1px solid @border;
-}
\ 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 9b1696e..5c99362 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -16,75 +16,64 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
-/* Slider colors */
-@define-color slider @background;
-@define-color slider_border alpha(#000, 0.3);
-@define-color backdrop_slider @backdrop_background;
-@define-color insensitive_slider @insensitive_background;
-
/* Trough colors */
-@define-color trough shade(@base, 0.8);
-@define-color trough_border alpha(#000, 0.2);
-@define-color backdrop_trough shade(@backdrop_base, 0.8);
-@define-color insensitive_trough shade(@insensitive_base, 0.8);
+@define-color trough_border shade(@text, 2.2);
+
+/* Slider colors */
+@define-color slider_border @trough_border;
+
/*************
* GtkSwitch *
*************/
-
GtkSwitch {
- border-radius: 5px;
- font: condensed;
+ border-radius: 1em;
+ font: bold;
}
/* Trough */
GtkSwitch.trough {
- border-radius: 5px;
+ border-radius: 1em;
border: 1px solid @trough_border;
- background-color: @trough;
- color: alpha(@text, 0.5);
+ background-color: @background;
+ color: @trough_border;
}
GtkSwitch.trough:active {
- border: 1px solid shade(@selection, 0.8);
- background-color: @selection;
- color: @selection_foreground;
+ border: 1px solid @selection;
+ background-color: alpha(@selection, 0.2);
+ color: @selection;
}
GtkSwitch.trough:backdrop,
GtkSwitch.trough:active:backdrop {
- background: none;
- border: 1px solid @backdrop_border;
+ border: 1px solid @backdrop_text;
+ background-color: @backdrop_background;
color: @backdrop_text;
}
GtkSwitch.trough:insensitive,
GtkSwitch.trough:active:insensitive {
background: none;
- border: 1px solid @insensitive_border;
+ border: 1px solid @insensitive_text;
color: @insensitive_text;
}
/* Slider */
+GtkSwitch.slider {
+ background-color: @slider_border;
+}
-GtkSwitch.slider,
GtkSwitch.slider:active {
- border: 1px solid @slider_border;
- background-color: @slider;
- background-image: linear-gradient(to bottom,
- @slider,
- shade(@slider, 0.98)
- );
+ background-color: @selection;
}
GtkSwitch.slider:active:insensitive,
GtkSwitch.slider:insensitive {
- border: 1px solid @insensitive_border;
- background-color: @insensitive_slider;
+ background-color: @insensitive_text;
}
GtkSwitch.slider:active:backdrop,
GtkSwitch.slider:backdrop {
- border: 1px solid @backdrop_border;
- background-color: @insensitive_slider;
+ background-color: @backdrop_text;
}
\ No newline at end of file