diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index e6629fe..a3acfe2 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -53,6 +53,20 @@ NautilusWindow .header-bar .entry {
box-shadow: none;
}
+/***********
+ * Sidebar *
+ ***********/
+
+NautilusWindow .sidebar {
+ box-shadow: none;
+ border-width: 0px;
+}
+
+NautilusWindow .pane-separator {
+ border-color: @border;
+ border-right-width: 1px;
+}
+
/************
* Notebook *
************/
diff --git a/Paper/gtk-3.0/apps/unity.css b/Paper/gtk-3.0/apps/unity.css
index a2f10be..27a84f4 100644
--- a/Paper/gtk-3.0/apps/unity.css
+++ b/Paper/gtk-3.0/apps/unity.css
@@ -93,7 +93,7 @@ UnityDecoration.right {
background-clip: border-box;
background-image: linear-gradient(to bottom,
@unity,
- shade(@unity, 0.6);
+ shade(@unity, 0.6)
);
background-image: -gtk-gradient (linear, left top, left bottom,
color-stop (0, @unity),
diff --git a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-prelight.svg b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-prelight.svg
index 886d274..d2cce28 100644
--- a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-prelight.svg
+++ b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-prelight.svg
@@ -10,10 +10,10 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="2"
- height="24"
+ height="22"
id="svg32934"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r"
sodipodi:docname="pane-separator-grip-prelight.svg">
@@ -25,14 +25,14 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="-12.302067"
- inkscape:cy="15.02026"
+ inkscape:cx="-180.80207"
+ inkscape:cy="5.02026"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
- inkscape:window-height="717"
+ inkscape:window-height="711"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -40,7 +40,8 @@
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
- inkscape:bbox-paths="true">
+ inkscape:bbox-paths="true"
+ showborder="false">
@@ -53,7 +54,7 @@
image/svg+xml
-
+
@@ -61,66 +62,48 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- transform="translate(0,8)">
-
+
-
+
-
+
-
+
-
+
-
+
+ cx="0.99999833"
+ cy="3.000001"
+ rx="1"
+ ry="0.99999791" />
diff --git a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical-prelight.svg b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical-prelight.svg
index e20857a..f1d2486 100644
--- a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical-prelight.svg
+++ b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical-prelight.svg
@@ -9,11 +9,11 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="24"
+ width="22"
height="2"
id="svg32934"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r"
sodipodi:docname="pane-separator-grip-vertical-prelight.svg">
@@ -24,15 +24,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="22.627417"
- inkscape:cx="5.6123664"
- inkscape:cy="1.3551453"
+ inkscape:zoom="1"
+ inkscape:cx="-1.8343519"
+ inkscape:cy="0.91320356"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
- inkscape:window-height="717"
+ inkscape:window-height="711"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -53,7 +53,7 @@
image/svg+xml
-
+
@@ -62,65 +62,52 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-14)">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical.svg b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical.svg
index db5bf42..09c8879 100644
--- a/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical.svg
+++ b/Paper/gtk-3.0/assets/scalable/pane-separator-grip-vertical.svg
@@ -9,11 +9,11 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="24"
+ width="22"
height="2"
id="svg32934"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r"
sodipodi:docname="pane-separator-grip-vertical.svg">
@@ -24,15 +24,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="18.28125"
- inkscape:cx="2.4244322"
- inkscape:cy="12.438041"
+ inkscape:zoom="1"
+ inkscape:cx="-6.7926618"
+ inkscape:cy="11.891032"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
- inkscape:window-height="717"
+ inkscape:window-height="711"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -53,7 +53,7 @@
image/svg+xml
-
+
@@ -62,65 +62,52 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-14)">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Paper/gtk-3.0/assets/scalable/pane-separator-grip.svg b/Paper/gtk-3.0/assets/scalable/pane-separator-grip.svg
index f46d491..d65cddb 100644
--- a/Paper/gtk-3.0/assets/scalable/pane-separator-grip.svg
+++ b/Paper/gtk-3.0/assets/scalable/pane-separator-grip.svg
@@ -10,10 +10,10 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="2"
- height="24"
+ height="22"
id="svg32934"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r"
sodipodi:docname="pane-separator-grip.svg">
@@ -24,15 +24,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="11.313708"
- inkscape:cx="17.5791"
- inkscape:cy="0.89052978"
+ inkscape:zoom="1"
+ inkscape:cx="0.34538712"
+ inkscape:cy="12.538408"
inkscape:current-layer="layer1"
- showgrid="true"
+ showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
- inkscape:window-height="717"
+ inkscape:window-height="711"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -40,7 +40,8 @@
inkscape:bbox-paths="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
- inkscape:bbox-nodes="true">
+ inkscape:bbox-nodes="true"
+ showborder="false">
image/svg+xml
-
+
@@ -65,66 +66,48 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- transform="translate(0,8)">
-
+
-
+
-
+
-
+
-
+
-
+
+ rx="1"
+ ry="0.99999791" />
diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css
index 47b3d98..4e572b2 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets.css
@@ -328,24 +328,28 @@ GtkSwitch.slider:insensitive {
background: url("assets/scalable/pane-separator-grip.svg");
background-repeat: no-repeat;
background-position: center;
+ background-size: 2px 22px;
}
.pane-separator:hover {
background: url("assets/scalable/pane-separator-grip-prelight.svg");
background-repeat: no-repeat;
background-position: center;
+ background-size: 2px 22px;
}
.pane-separator.vertical {
background: url("assets/scalable/pane-separator-grip-vertical.svg");
background-repeat: no-repeat;
background-position: center;
+ background-size: 2px 22px;
}
.pane-separator.vertical:hover {
background: url("assets/scalable/pane-separator-grip-vertical-prelight.svg");
background-repeat: no-repeat;
background-position: center;
+ background-size: 2px 22px;
}
/*********************
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 8f0114e..54d6cf0 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -32,7 +32,7 @@
@define-color header #636E73;/* Header color */
@define-color backdrop_header #5A6367; /* Header backdrop color */
@define-color header_text #fff;/* Header text color */
-@define-color header_text_dark alpha(#000, 0.5);/* Header text color */
+@define-color header_text_dark alpha(#000, 0.3);/* Header text color */
@define-color menu #636E73;/* Menu color */
@define-color menu_text #dbdee0;/* Menu color */
@define-color selection #9FB0B9;/* Selection color */
diff --git a/Paper/gtk-3.0/widgets/dialogs.css b/Paper/gtk-3.0/widgets/dialogs.css
index d26a346..6e8b6ba 100644
--- a/Paper/gtk-3.0/widgets/dialogs.css
+++ b/Paper/gtk-3.0/widgets/dialogs.css
@@ -59,10 +59,20 @@ GtkMessageDialog .titlebar:backdrop {
GtkDialog,
GtkAboutDialog,
GtkMessageDialog {
+ background: @background;
color: @text;
box-shadow: none;
}
+
+GtkDialog:backdrop,
+GtkAboutDialog:backdrop,
+GtkMessageDialog:backdrop {
+ background: @backdrop_background;
+ color: @backdrop_text;
+ box-shadow: none;
+}
+
GtkDialog GtkLabel,
GtkAboutDialog GtkLabel,
GtkMessageDialog GtkLabel {
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index fe6f295..1370a91 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -24,10 +24,17 @@
.header-bar {
padding-left: 6px;
padding-right: 6px;
+ border-radius: 0px;
background-image: none;
background-color: @header;
color: @header_text;
- /*box-shadow: inset 0 -3px 3px -4px alpha(#000, 0.7);*/
+ box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
+}
+
+
+.maximized .header-bar {
+ border-radius: 0px;
+ box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
}
.header-bar:backdrop {
@@ -81,7 +88,8 @@
* Header bar buttons *
**********************/
.header-bar .button {
- padding: 13px;
+ border: none;
+ padding: 12px 15px;
}
.header-bar .flat,
diff --git a/Paper/gtk-3.0/widgets/separators.css b/Paper/gtk-3.0/widgets/separators.css
index 2e10b82..4824515 100644
--- a/Paper/gtk-3.0/widgets/separators.css
+++ b/Paper/gtk-3.0/widgets/separators.css
@@ -33,8 +33,7 @@ GtkSeparator,
padding: 4px;
background-color: @background;
border: 1px solid @separator;
- border-left-width: 0px;
- border-right-width: 0px;
+ border-width: 0px;
color: @base;
}
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 9a82392..3ac407b 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -22,12 +22,17 @@
.titlebar {
padding: 0px;
- padding-left: 6px;
- padding-right: 6px;
border-width: 0px;
+ border-radius: 0px;
background-image: none;
background-color: @header;
color: @header_text;
+ box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
+}
+
+.maximized .titlebar {
+ border-radius: 0px;
+ box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
}
.titlebar:backdrop {
@@ -80,7 +85,8 @@
**********************/
.titlebar .button {
- padding: 13px;
+ border: none;
+ padding: 12px 15px;
}
.titlebar .flat,
diff --git a/Paper/metacity-1/metacity-theme.xml b/Paper/metacity-1/metacity-theme.xml
index 14b6d61..9384349 100644
--- a/Paper/metacity-1/metacity-theme.xml
+++ b/Paper/metacity-1/metacity-theme.xml
@@ -32,12 +32,12 @@
-
-
+
+
-
+
diff --git a/src/wm/wm-assets.svg b/src/wm/wm-assets.svg
index 51732a6..68f625e 100644
--- a/src/wm/wm-assets.svg
+++ b/src/wm/wm-assets.svg
@@ -34,17 +34,17 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="133.049"
- inkscape:cy="77.4181"
+ inkscape:cx="98.164685"
+ inkscape:cy="34.044388"
inkscape:current-layer="layer4"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
- inkscape:window-width="1301"
- inkscape:window-height="744"
- inkscape:window-x="65"
- inkscape:window-y="24"
+ inkscape:window-width="1366"
+ inkscape:window-height="711"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
width="400px"
height="300px"
inkscape:snap-nodes="true"