diff --git a/Paper/gtk-3.0/assets/scale-slider-down-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-down-insensitive.png
index 47b6acf..e89bd07 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-down-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-down-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-down-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-down-insensitive@2.png
index 77ee1a8..01ea36e 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-down-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-down-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-horz-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-horz-insensitive.png
index 1c02c0c..9464edf 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-horz-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-horz-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-horz-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-horz-insensitive@2.png
index 954ff0c..2f56acf 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-horz-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-horz-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-left-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-left-insensitive.png
index 979dc1c..878aaae 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-left-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-left-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-left-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-left-insensitive@2.png
index 3bb3563..1ce9072 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-left-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-left-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-right-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-right-insensitive.png
index f5485c5..f762384 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-right-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-right-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-right-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-right-insensitive@2.png
index 5859a9e..1a7176c 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-right-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-right-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-up-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-up-insensitive.png
index 9a00b91..dc1d17f 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-up-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-up-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-up-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-up-insensitive@2.png
index 39a7334..f17f980 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-up-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-up-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-vert-insensitive.png b/Paper/gtk-3.0/assets/scale-slider-vert-insensitive.png
index 1c02c0c..9464edf 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-vert-insensitive.png and b/Paper/gtk-3.0/assets/scale-slider-vert-insensitive.png differ
diff --git a/Paper/gtk-3.0/assets/scale-slider-vert-insensitive@2.png b/Paper/gtk-3.0/assets/scale-slider-vert-insensitive@2.png
index 954ff0c..2f56acf 100644
Binary files a/Paper/gtk-3.0/assets/scale-slider-vert-insensitive@2.png and b/Paper/gtk-3.0/assets/scale-slider-vert-insensitive@2.png differ
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index 313b123..ba5efb6 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -95,9 +95,9 @@
* Trough Colors *
*****************/
-@define-color trough_background @base;
-@define-color backdrop_trough_background @backdrop_base;
-@define-color insensitive_trough_background @insensitive_base;
+@define-color trough_background shade(@background, 0.9);
+@define-color backdrop_trough_background shade(@trough_background, 0.95);
+@define-color insensitive_trough_background shade(@trough_background, 1.05);
@define-color trough_border shade(@border, 1.02);
@define-color backdrop_trough_border shade(@backdrop_border, 1.2);
diff --git a/Paper/gtk-3.0/widgets/combobox.css b/Paper/gtk-3.0/widgets/combobox.css
index 188c6e4..a6af5ce 100644
--- a/Paper/gtk-3.0/widgets/combobox.css
+++ b/Paper/gtk-3.0/widgets/combobox.css
@@ -39,6 +39,7 @@ GtkComboBox .separator {
background: none;
border: none;
color: inherit;
+ -GtkComboBox-arrow-scaling: 1;
}
/******************
diff --git a/Paper/gtk-3.0/widgets/entry.css b/Paper/gtk-3.0/widgets/entry.css
index e34fae1..bc3ed01 100644
--- a/Paper/gtk-3.0/widgets/entry.css
+++ b/Paper/gtk-3.0/widgets/entry.css
@@ -32,14 +32,14 @@
background-color: @base;
color: @text;
border: 1px solid @border;
- box-shadow:inset 0 0 0 1px alpha(#000, 0.05),
+ box-shadow:inset 0 -1px 0 1px alpha(#000, 0.05),
inset 0 1px 0 0 alpha(#000, 0.02);
}
.entry:focus {
background-color: @base;
color: @text;
- border: 1px solid @selection;
+ border: 1px solid shade(@selection, 0.8);
box-shadow:inset 0 0 0 1px alpha(@selection, 0.4),
inset 0 1px 0 0 alpha(@selection, 0.1);
}
@@ -64,6 +64,11 @@
background-color: @selection;
}
+.entry:selected:backdrop {
+ color: @base;
+ background-color: @selection;
+}
+
.entry:backdrop {
background-color: @backdrop_background;
color: @backdrop_text;
@@ -77,12 +82,6 @@
box-shadow: none;
}
-.entry:selected:backdrop {
- color: @backdrop_selected_foreground;
- background-color: @backdrop_selected_background;
- box-shadow: none;
-}
-
.entry.image {
color: @insensitive_text;
}
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 0ba0cb9..0ff8461 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -329,7 +329,8 @@
.header-bar .button GtkArrow,
.header-bar .button GtkArrow:active,
.header-bar .button GtkArrow:focus,
-.header-bar .button GtkArrow:hover {
+.header-bar .button GtkArrow:hover {
+ -GtkComboBox-arrow-scaling: 1;
color: @header_text;
}
diff --git a/Paper/gtk-3.0/widgets/progressbars.css b/Paper/gtk-3.0/widgets/progressbars.css
index dd54f2c..87bbcba 100644
--- a/Paper/gtk-3.0/widgets/progressbars.css
+++ b/Paper/gtk-3.0/widgets/progressbars.css
@@ -18,10 +18,21 @@
*/
@define-color progressbar_background @progress_color;
-@define-color progressbar_border shade(@progressbar_background, 0.7);
@define-color backdrop_progressbar_background shade(@progressbar_background, 1.2);
@define-color insensitive_progressbar_background shade(@insensitive_background, 0.85);
+@define-color progressbar_border shade(@progressbar_background, 0.7);
+@define-color backdrop_progressbar_border shade(@progressbar_border, 1.3);
+@define-color insensitive_progressbar_border shade(@insensitive_border, 0.85);
+
+@define-color progressbar_trough_background @base;
+@define-color backdrop_progressbar_trough_background shade(@progressbar_trough_background, 1.2);
+@define-color insensitive_progressbar_trough_background shade(@insensitive_background, 0.85);
+
+@define-color progressbar_trough_border shade(@progressbar_trough_background, 0.8);
+@define-color backdrop_progressbar_trough_border shade(@progressbar_trough_border, 1.05);
+@define-color insensitive_progressbar_trough_border shade(@insensitive_border, 0.85);
+
/****************
* Progress bar *
@@ -48,45 +59,46 @@ GtkProgressBar.progressbar:active {
GtkProgressBar.progressbar:backdrop,
GtkProgressBar.progressbar:active:backdrop {
- border-color: @progressbar_border;
+ border-color: @backdrop_progressbar_border;
color: @backdrop_text;
background-color: @backdrop_progressbar_background;
+ box-shadow: none;
}
GtkProgressBar.trough {
- border-color: @trough_border;
- background-color: @trough_background;
+ border-color: @progressbar_trough_border;
+ background-color: @progressbar_trough_background;
}
GtkProgressBar.trough:backdrop {
- border-color: @backdrop_trough_border;
- background-color: @backdrop_trough_background;
+ border-color: @backdrop_progressbar_trough_border;
+ background-color: @backdrop_progressbar_trough_background;
}
GtkProgressBar.trough:insensitive {
- border-color: @insensitive_trough_border;
- background-color: @insensitive_trough_background;
+ border-color: @insensitive_progressbar_trough_border;
+ background-color: @insensitive_progressbar_trough_background;
}
.trough,
.trough.vertical {
padding: 0;
- border: 1px solid @trough_border;
- background-color: @trough_background;
+ border: 1px solid @progressbar_trough_border;
+ background-color: @progressbar_trough_background;
}
.trough:insensitive,
.trough.vertical:insensitive {
background-image:none;
- background-color:@insensitive_trough_background;
+ background-color:@insensitive_progressbar_trough_background;
border: 1px solid @insensitive_rough_border;
}
.trough:backdrop,
.trough.vertical:backdrop {
padding: 0;
- border: 1px solid @backdrop_trough_border;
- background-color: @backdrop_trough_background;
+ border: 1px solid @backdrop_progressbar_trough_border;
+ background-color: @backdrop_progressbar_trough_background;
}
@@ -137,6 +149,7 @@ GtkProgressBar.trough:insensitive {
padding: 0;
color: alpha(#000,0.5);
background-color: @backdrop_progressbar_background;
+ box-shadow: none;
}
.trough row,
@@ -151,7 +164,7 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px;
padding: 0;
color: alpha(#000,0.5);
- background-color: @trough_background;
+ background-color: @progressbar_trough_background;
}
@@ -167,7 +180,7 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px;
padding: 0;
color: alpha(#000,0.5);
- background-color: @insensitive_trough_background;
+ background-color: @insensitive_progressbar_trough_background;
}
.trough row:backdrop,
@@ -182,5 +195,5 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px;
padding: 0;
color: alpha(#000,0.5);
- background-color: @backdrop_trough_background;
+ background-color: @backdrop_progressbar_trough_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 d5bcd53..156d69e 100644
--- a/Paper/gtk-3.0/widgets/scales.css
+++ b/Paper/gtk-3.0/widgets/scales.css
@@ -18,8 +18,8 @@
@define-color scale_background @progress_color;
@define-color scale_border shade(@scale_background, 0.7);
-@define-color backdrop_scale_background shade(@scale_background, 1.2);
-@define-color insensitive_scale_background shade(@insensitive_background, 0.8);
+@define-color backdrop_scale_background shade(@scale_background, 0.95);
+@define-color insensitive_scale_background shade(@scale_background, 1.2);
/**********
* Scales *
diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css
index 976d27a..7ee4d0e 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -16,10 +16,6 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
-/* Trough colors */
-@define-color trough_border shade(@background, 0.7);
-@define-color backdrop_trough_border shade(@trough_border, 1.1);
-
/* Slider colors */
@define-color slider_border @trough_border;
@define-color backdrop_slider_border @backdrop_trough_border;
@@ -27,9 +23,9 @@
/*************
* GtkSwitch *
- *************
-GtkSwitch {
- border-radius: 1em;
+ *************/
+
+/*GtkSwitch {
font: condensed;
}
@@ -78,9 +74,6 @@ GtkSwitch.slider:backdrop {
background-color: @backdrop_slider_border;
}*/
-/*************
- * GtkSwitch *
- *************/
GtkSwitch {
font: 1;
diff --git a/Paper/unity/launcher_icon_glow_200.svg b/Paper/unity/launcher_icon_glow_200.svg
index 5c0c35d..4ae0449 100644
--- a/Paper/unity/launcher_icon_glow_200.svg
+++ b/Paper/unity/launcher_icon_glow_200.svg
@@ -45,8 +45,8 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="100.00004"
- inkscape:cy="100.00006"
+ inkscape:cx="-57.99996"
+ inkscape:cy="97.50006"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -55,9 +55,9 @@
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1301"
- inkscape:window-height="744"
+ inkscape:window-height="740"
inkscape:window-x="65"
- inkscape:window-y="24"
+ inkscape:window-y="28"
inkscape:window-maximized="1" />
@@ -67,7 +67,7 @@
image/svg+xml
-
+
@@ -83,6 +83,6 @@
height="172"
x="991.14288"
y="1083.505"
- ry="32" />
+ ry="16" />
diff --git a/Paper/unity/launcher_icon_glow_62.svg b/Paper/unity/launcher_icon_glow_62.svg
index 3fcd7e4..4a7d675 100644
--- a/Paper/unity/launcher_icon_glow_62.svg
+++ b/Paper/unity/launcher_icon_glow_62.svg
@@ -36,8 +36,8 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="59.082644"
- inkscape:cy="41.704107"
+ inkscape:cx="-96.917356"
+ inkscape:cy="37.204107"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -46,9 +46,9 @@
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1301"
- inkscape:window-height="744"
+ inkscape:window-height="740"
inkscape:window-x="65"
- inkscape:window-y="24"
+ inkscape:window-y="28"
inkscape:window-maximized="1"
borderlayer="false">
image/svg+xml
-
+
@@ -79,6 +79,6 @@
height="48"
x="1538.8572"
y="125.50504"
- ry="8" />
+ ry="4" />
diff --git a/src/gtk3/gtk3-assets.svg b/src/gtk3/gtk3-assets.svg
index 20ac713..e563f68 100644
--- a/src/gtk3/gtk3-assets.svg
+++ b/src/gtk3/gtk3-assets.svg
@@ -34,15 +34,15 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="350.88113"
- inkscape:cy="56.461941"
+ inkscape:cx="317.35554"
+ inkscape:cy="104.32826"
inkscape:current-layer="layer2"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1366"
- inkscape:window-height="713"
+ inkscape:window-height="710"
inkscape:window-x="0"
inkscape:window-y="28"
width="400px"
@@ -3341,9 +3341,9 @@
inkscape:connector-curvature="0"
id="path5218"
d="m 335,180 -5,5 -8,0 c 0,0 -1,0 -1,-1 l 0,-8 c 0,-1 1,-1 1,-1 l 8,0 z"
- style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" />
+ style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new" />
+ style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new" />
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />