diff --git a/Paper/gnome-shell/assets/corner-ripple-ltr.png b/Paper/gnome-shell/assets/corner-ripple-ltr.png
index a5f3a3b..a9d18eb 100644
Binary files a/Paper/gnome-shell/assets/corner-ripple-ltr.png and b/Paper/gnome-shell/assets/corner-ripple-ltr.png differ
diff --git a/Paper/gnome-shell/assets/corner-ripple-rtl.png b/Paper/gnome-shell/assets/corner-ripple-rtl.png
index 9a39a6d..89a8520 100644
Binary files a/Paper/gnome-shell/assets/corner-ripple-rtl.png and b/Paper/gnome-shell/assets/corner-ripple-rtl.png differ
diff --git a/Paper/gtk-3.0/apps.css b/Paper/gtk-3.0/apps.css
index 1751164..21e04fe 100644
--- a/Paper/gtk-3.0/apps.css
+++ b/Paper/gtk-3.0/apps.css
@@ -26,7 +26,7 @@
@import url("apps/birdie.css");
@import url("apps/budgie.css");
@import url("apps/calculator.css");
-@import url("apps/california.css");
+@import url("apps/calendar.css");
@import url("apps/cheese.css");
@import url("apps/epiphany.css");
@import url("apps/fallback.css");
diff --git a/Paper/gtk-3.0/apps/calculator.css b/Paper/gtk-3.0/apps/calculator.css
index dac12db..a8fb6fc 100644
--- a/Paper/gtk-3.0/apps/calculator.css
+++ b/Paper/gtk-3.0/apps/calculator.css
@@ -22,11 +22,15 @@
* Header bar *
**************/
+PantheonCalculatorMainWindow .titlebar,
+PantheonCalculatorMainWindow .header-bar,
MathWindow .titlebar,
MathWindow .header-bar {
background-color: @calculator;
}
+PantheonCalculatorMainWindow .titlebar:backdrop,
+PantheonCalculatorMainWindow .header-bar:backdrop,
MathWindow .titlebar:backdrop,
MathWindow .header-bar:backdrop {
background-color: shade(@calculator,0.9);
diff --git a/Paper/gtk-3.0/apps/california.css b/Paper/gtk-3.0/apps/calendar.css
similarity index 75%
rename from Paper/gtk-3.0/apps/california.css
rename to Paper/gtk-3.0/apps/calendar.css
index 92d7fb5..10c802d 100644
--- a/Paper/gtk-3.0/apps/california.css
+++ b/Paper/gtk-3.0/apps/calendar.css
@@ -16,37 +16,39 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
-@define-color california #F34235;
+@define-color calendar #F34235;
/**********
* Header *
**********/
+MayaViewMayaToolbar .titlebar .header-bar,
CaliforniaHostMainWindow .header-bar,
CaliforniaHostMainWindow .titlebar {
- background-color: @california;
+ background-color: @calendar;
}
+MayaViewMayaToolbar .titlebar .header-bar:backdrop,
CaliforniaHostMainWindow .header-bar:backdrop,
CaliforniaHostMainWindow .titlebar:backdrop {
- background-color: shade(@california,0.9);
+ background-color: shade(@calendar,0.9);
}
/* Switch */
CaliforniaHostMainWindow .header-bar GtkSwitch.trough:active {
- background-color: @california;
+ background-color: @calendar;
}
CaliforniaHostMainWindow GtkSwitch.trough:active {
- border: 1px solid shade(@california, 0.8);
- background-color: @california;
+ border: 1px solid shade(@calendar, 0.8);
+ background-color: @calendar;
}
CaliforniaHostMainWindow GtkSwitch.slider:active {
- border: 1px solid shade(@california, 0.8);
+ border: 1px solid shade(@calendar, 0.8);
}
CaliforniaHostMainWindow .header-bar GtkSwitch.slider:active:backdrop,
CaliforniaHostMainWindow .header-bar GtkSwitch.slider:backdrop {
- background-color: shade(@california, 0.9);
+ background-color: shade(@calendar, 0.9);
}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index 0d87461..1781338 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -62,6 +62,7 @@
@import url("widgets/column-header.css");
@import url("widgets/combobox.css");
@import url("widgets/composited-indicator.css");
+@import url("widgets/csd.css");
@import url("widgets/cursor-handles.css");
@import url("widgets/destructive-action-buttons.css");
@import url("widgets/dialogs.css");
@@ -84,6 +85,7 @@
@import url("widgets/miscellaneous.css");
@import url("widgets/notebook.css");
@import url("widgets/osd.css");
+@import url("widgets/overflow.css");
@import url("widgets/popovers.css");
@import url("widgets/progressbars.css");
@import url("widgets/scales.css");
diff --git a/Paper/gtk-3.0/widgets/action-bar.css b/Paper/gtk-3.0/widgets/action-bar.css
index 4becad7..455f25f 100644
--- a/Paper/gtk-3.0/widgets/action-bar.css
+++ b/Paper/gtk-3.0/widgets/action-bar.css
@@ -19,21 +19,11 @@
/***************
* Action bars *
***************/
-.action-bar .title {
- font: Bold 11;
- padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
- color: inherit;
- font: 9;
- padding: 0px 12px 0px 12px;
-}
.action-bar {
background-color: shade(@background, 0.9);
border: solid @border;
- border-width: 0 1px 1px 1px;
+ border-width: 1px 0 0 0;
color: @text;
box-shadow: none;
}
@@ -44,7 +34,6 @@
-gtk-image-effect: dim;
}
-
.action-bar:first-child {
border-radius: 6px 6px 0px 0px;
border-width: 1px 1px 0px 1px;
diff --git a/Paper/gtk-3.0/widgets/check-radio.css b/Paper/gtk-3.0/widgets/check-radio.css
index 4a9a766..b51769e 100644
--- a/Paper/gtk-3.0/widgets/check-radio.css
+++ b/Paper/gtk-3.0/widgets/check-radio.css
@@ -24,20 +24,17 @@ GtkCheckButton:hover,
GtkCheckButton:active:hover,
GtkCheckButton:selected,
GtkCheckButton:selected:focus {
- background: none;
}
.check,
.check row:selected,
.check row:selected:focus {
- background: none;
color: @foreground;
}
.check:insensitive,
.check row:selected:insensitive,
.check row:selected:focus:insensitive {
- background: none;
color: @insensitive_text;
}
@@ -45,14 +42,12 @@ GtkCheckButton:selected:focus {
.check:backdrop,
.check row:selected:backdrop,
.check row:selected:focus:backdrop {
- background: none;
color: @backdrop_text;
}
.check:insensitive:backdrop,
.check row:selected:insensitive:backdrop,
.check row:selected:focus:insensitive:backdrop {
- background: none;
color: @backdrop_insensitive_text;
}
diff --git a/Paper/gtk-3.0/widgets/csd.css b/Paper/gtk-3.0/widgets/csd.css
new file mode 100644
index 0000000..80f6fed
--- /dev/null
+++ b/Paper/gtk-3.0/widgets/csd.css
@@ -0,0 +1,25 @@
+/* Copyright 2015 Sam Hewitt.
+*
+* This file is part of the Paper GTK theme.
+*
+* The Paper GTK theme is free software: you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* The Paper GTK theme is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+* Public License for more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
+*/
+
+/*******
+ * CSD *
+ *******/
+
+.csd.background {
+ border-radius: 0 0 4px 4px;
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/message-dialogs.css b/Paper/gtk-3.0/widgets/message-dialogs.css
index ed9cb06..c84ed31 100644
--- a/Paper/gtk-3.0/widgets/message-dialogs.css
+++ b/Paper/gtk-3.0/widgets/message-dialogs.css
@@ -23,7 +23,7 @@
.message-dialog {
padding: 0px;
padding-top: 8px;
- background: @background;
+ /*background: @background;*/
-GtkDialog-button-spacing: 0;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
@@ -35,7 +35,7 @@
}
.message-dialog.csd {
- border-radius: 0 0 4px 4px;
+ border-radius: 5px;
background: @background;
box-shadow: 0 3px 6px alpha (#000, 0.16),
0 3px 6px alpha (#000, 0.23);
@@ -43,31 +43,6 @@
margin: 0;
}
-.message-dialog .titlebar,
-.message-dialog .header-bar {
- padding:0;
- border: none;
- border-radius: 4px 4px 0 0;
- background-color: @header;
- color: @header_text;
- box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
- inset 0 -1px 0 0 rgba(0,0,0,0.1),
- inset 0 -3px 3px -4px alpha(#000, 0.4);
-}
-
-
-.message-dialog .titlebar:backdrop,
-.message-dialog .header-bar:backdrop {
- background-image: none;
- background-color: @backdrop_header;
- color: @backdrop_header_text;
-}
-
-.message-dialog .titlebar:insensitive,
-.message-dialog .header-bar:insensitive {
- color: @insensitive_header_text;
-}
-
.message-dialog.csd.background {
padding: 0px;
margin: 0px;
@@ -75,16 +50,6 @@
box-shadow: none;
}
-.message-dialog .titlebar .title {
- padding: 0px;
- color: @header_text;
-}
-
-.message-dialog .titlebar .title:backdrop {
- color: @backdrop_header_text;
-}
-
-
/* Buttons */
.message-dialog.csd .dialog-action-area {
padding: 0;
@@ -132,13 +97,6 @@
color: mix(@insensitive_text, @backdrop_text, 0.5);
}
-.message-dialog.csd .dialog-action-area .button:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label,
-.message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop:insensitive > .label {
- color: inherit;
-}
-
/* Suggested Action Button */
.message-dialog.csd .dialog-action-area .button.suggested-action {
border: 0px solid @suggested_action_button;
@@ -176,12 +134,6 @@
color: mix(@insensitive_text, @backdrop_text, 0.5);
}
-.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-.message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:insensitive > .label {
- color: inherit;
-}
/* Destructive Action Button */
.message-dialog.csd .dialog-action-area .button.destructive-action {
@@ -220,14 +172,24 @@
color: mix(@insensitive_text, @backdrop_text, 0.5);
}
-.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-.message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:insensitive > .label,
-.message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:insensitive > .label {
- color: inherit;
-}
-
-.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+.message-dialog.csd .dialog-action-area .button,
+.message-dialog.csd .dialog-action-area .button:hover,
+.message-dialog.csd .dialog-action-area .button:active,
+.message-dialog.csd .dialog-action-area .button:insensitive,
+.message-dialog.csd .dialog-action-area .button:backdrop,
+.message-dialog.csd .dialog-action-area .button:backdrop:insensitive,
+.message-dialog.csd .dialog-action-area .button.suggested-action,
+.message-dialog.csd .dialog-action-area .button.suggested-action:hover,
+.message-dialog.csd .dialog-action-area .button.suggested-action:active,
+.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop,
+.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive,
+.message-dialog.csd .dialog-action-area .button.suggested-action:insensitive,
+.message-dialog.csd .dialog-action-area .button.destructive-action,
+.message-dialog.csd .dialog-action-area .button.destructive-action:hover,
+.message-dialog.csd .dialog-action-area .button.destructive-action:active,
+.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop,
+.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive,
+.message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
border-left-style: solid;
border-right-style: none;
border-bottom-style: none;
@@ -240,5 +202,4 @@
.message-dialog.csd .dialog-action-area .button:first-child {
border-left-style: none;
/*border-bottom-left-radius: 7px;*/
-}
-
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index b415fea..aa5decc 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -31,6 +31,43 @@
background-color: @background;
}
+.notebook.header,
+.notebook.header:backdrop {
+ border-width: 0px;
+}
+
+.notebook.header.frame.top,
+.notebook.header.frame.top:backdrop {/*
+ border-top: 1px solid @border;
+ border-left: 1px solid @border;
+ border-right: 1px solid @border;*/
+ border:none;
+}
+
+.notebook.header.frame.bottom,
+.notebook.header.frame.bottom:backdrop {
+ /*border-bottom: 1px solid @border;
+ border-left: 1px solid @border;
+ border-right: 1px solid @border;*/
+ border:none;
+}
+
+.notebook.header.frame.left,
+.notebook.header.frame.left:backdrop {
+ /*border-top: 1px solid @border;
+ border-bottom: 1px solid @border;
+ border-left: 1px solid @border;*/
+ border:none;
+}
+
+.notebook.header.frame.right,
+.notebook.header.frame.right:backdrop {
+ /*border-top: 1px solid @border;
+ border-bottom: 1px solid @border;
+ border-right: 1px solid @border;*/
+ border:none;
+}
+
.notebook.frame {
/*FIXME: Move the border down here so devs have more control*/
border: none;
@@ -241,43 +278,6 @@
padding: 8px;
}
-.notebook.header,
-.notebook.header:backdrop {
- box-shadow: none;
- border-width: 0px;
-}
-
-.notebook.header.frame.top,
-.notebook.header.frame.top:backdrop {/*
- border-top: 1px solid @border;
- border-left: 1px solid @border;
- border-right: 1px solid @border;*/
- border:none;
-}
-
-.notebook.header.frame.bottom,
-.notebook.header.frame.bottom:backdrop {
- /*border-bottom: 1px solid @border;
- border-left: 1px solid @border;
- border-right: 1px solid @border;*/
- border:none;
-}
-
-.notebook.header.frame.left,
-.notebook.header.frame.left:backdrop {
- /*border-top: 1px solid @border;
- border-bottom: 1px solid @border;
- border-left: 1px solid @border;*/
- border:none;
-}
-
-.notebook.header.frame.right,
-.notebook.header.frame.right:backdrop {
- /*border-top: 1px solid @border;
- border-bottom: 1px solid @border;
- border-right: 1px solid @border;*/
- border:none;
-}
/*----- Labels -----*/
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 7e0d1ee..39c8b5a 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -16,9 +16,9 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
-/******************
- * Titlebar (CSD) *
- ******************/
+/************
+ * Titlebar *
+ ************/
.titlebar {
padding:0;
diff --git a/Paper/gtk-3.0/widgets/tooltips.css b/Paper/gtk-3.0/widgets/tooltips.css
index 24c8d87..96511e3 100644
--- a/Paper/gtk-3.0/widgets/tooltips.css
+++ b/Paper/gtk-3.0/widgets/tooltips.css
@@ -1,25 +1,41 @@
+/* Copyright 2015 Sam Hewitt.
+*
+* This file is part of the Paper GTK theme.
+*
+* The Paper GTK theme is free software: you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* The Paper GTK theme is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+* Public License for more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
+*/
+
/************
* Tooltips *
************/
.tooltip,
.overlay-bar {
- padding: 4px;
- border-style: none;
- border-radius: 5px;
-
- background-color: alpha(@panel, 0.95);
- color: white;
-
- text-shadow: 1px 1px #000;
+ padding: 4px 8px;
+ border: none;
+ border-radius: 2px;
+ background-color: @base;
+ color: @text;
+ box-shadow: 0 1px 2px 0 alpha(#000, 0.3);
}
.tooltip * {
background: none;
+ background-color: @base;
}
.tooltip GtkLabel,
.overlay-bar GtkLabel {
- color: white;
- text-shadow: 0 1px alpha(#000, 0.6);
+ color: @text;
}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/views.css b/Paper/gtk-3.0/widgets/views.css
index a96ca35..126ba1b 100644
--- a/Paper/gtk-3.0/widgets/views.css
+++ b/Paper/gtk-3.0/widgets/views.css
@@ -70,7 +70,7 @@
.view:selected,
.view:selected:focus {
background-color: @selection;
- border-color: @selection;
+ border-color: shade(@selection, 0.8);
color: @selected_foreground;
}
@@ -177,7 +177,7 @@ GtkIconView.view.cell:hover {
GtkIconView.view.cell:selected,
GtkIconView.view.cell:selected:focus {
- border: 1px solid transparent;
+ border: 1px solid shade(@selection, 0.8);
border-radius: 6px;
background-color: @selection;
color: @selected_foreground;
@@ -309,5 +309,4 @@ GtkHTML:active:backdrop,
border-width: 0px;
/* background-image in assets */
-}
-
+}
\ No newline at end of file
diff --git a/src/gnome-shell/corner-ripples.svg b/src/gnome-shell/corner-ripples.svg
index 02ac3cd..494fa27 100644
--- a/src/gnome-shell/corner-ripples.svg
+++ b/src/gnome-shell/corner-ripples.svg
@@ -16,7 +16,7 @@
height="144"
id="svg11300"
sodipodi:version="0.32"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r"
sodipodi:docname="corner-ripples.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
@@ -32,17 +32,17 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="21.765775"
- inkscape:cy="56.293534"
+ inkscape:cx="69.80934"
+ inkscape:cy="45.813604"
inkscape:current-layer="g3958"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
- inkscape:window-width="1364"
+ inkscape:window-width="1366"
inkscape:window-height="710"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="28"
width="400px"
height="300px"
inkscape:snap-nodes="true"
@@ -390,24 +390,6 @@
id="rect3942"
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-
-
-
-
-
@@ -533,35 +505,15 @@
style="display:inline;enable-background:new"
id="g3928"
clip-path="url(#clipPath3940)">
-
-
@@ -620,38 +572,18 @@
-
-