From 79ef125123357fd8db5063ceaeb1f7934a69329f Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 16 Nov 2015 01:51:13 +0100
Subject: more cinnamon tweaks
---
common/cinnamon/cinnamon-dark.css | 36 ++---
common/cinnamon/cinnamon.css | 36 ++---
.../misc/calendar-arrow-left-hover.svg | 152 ++++++++++++++++++
.../common-assets/misc/calendar-arrow-left.svg | 152 ++++++++++++++++++
.../misc/calendar-arrow-right-hover.svg | 152 ++++++++++++++++++
.../common-assets/misc/calendar-arrow-right.svg | 152 ++++++++++++++++++
.../cinnamon/common-assets/misc/sound-overlay.svg | 68 --------
common/cinnamon/dark-assets/menu/submenu-open.svg | 109 -------------
common/cinnamon/dark-assets/menu/submenu.svg | 12 +-
.../dark-assets/misc/calendar-arrow-left-hover.svg | 169 --------------------
.../dark-assets/misc/calendar-arrow-left.svg | 169 --------------------
.../misc/calendar-arrow-right-hover.svg | 171 ---------------------
.../dark-assets/misc/calendar-arrow-right.svg | 171 ---------------------
common/cinnamon/light-assets/menu/submenu-open.svg | 109 -------------
common/cinnamon/light-assets/menu/submenu.svg | 14 +-
.../misc/calendar-arrow-left-hover.svg | 169 --------------------
.../light-assets/misc/calendar-arrow-left.svg | 169 --------------------
.../misc/calendar-arrow-right-hover.svg | 171 ---------------------
.../light-assets/misc/calendar-arrow-right.svg | 171 ---------------------
common/cinnamon/sass/_common.scss | 40 +++--
20 files changed, 682 insertions(+), 1710 deletions(-)
create mode 100644 common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
create mode 100644 common/cinnamon/common-assets/misc/calendar-arrow-left.svg
create mode 100644 common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
create mode 100644 common/cinnamon/common-assets/misc/calendar-arrow-right.svg
delete mode 100644 common/cinnamon/common-assets/misc/sound-overlay.svg
delete mode 100644 common/cinnamon/dark-assets/menu/submenu-open.svg
delete mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg
delete mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-left.svg
delete mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg
delete mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-right.svg
delete mode 100644 common/cinnamon/light-assets/menu/submenu-open.svg
delete mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg
delete mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-left.svg
delete mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg
delete mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-right.svg
diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css
index fdaf2d5..44b3bc2 100644
--- a/common/cinnamon/cinnamon-dark.css
+++ b/common/cinnamon/cinnamon-dark.css
@@ -140,7 +140,7 @@ StScrollBar {
background-color: rgba(64, 69, 82, 0.1);
border-radius: 8px; }
StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
- border-radius: 4px;
+ border-radius: 2px;
background-color: #767b87;
border: 0px solid;
margin: 0px; }
@@ -261,10 +261,6 @@ StScrollBar {
padding: 4px; }
.popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle {
border-width: 0; }
- .popup-menu .popup-sub-menu-menu-item:open {
- background: none;
- box-shadow: none;
- border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; }
.popup-menu .popup-menu-content {
padding: 1em 0em 1em 0em; }
.popup-menu .popup-menu-item {
@@ -403,7 +399,7 @@ StScrollBar {
.expo-workspaces-name-entry,
.expo-workspaces-name-entry#selected {
- spacing: 25px;
+ height: 15px;
border-radius: 2px;
font-size: 9pt;
padding: 5px 8px;
@@ -435,7 +431,7 @@ StScrollBar {
background-color: #353945; }
.workspace-thumbnails {
- spacing: 14px; }
+ spacing: 26px; }
.workspace-thumbnails-background, .workspace-thumbnails-background:rtl {
padding: 8px; }
@@ -533,30 +529,30 @@ StScrollBar {
height: 16px; }
.calendar-change-month-back {
- background-image: url("dark-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-back:focus, .calendar-change-month-back:hover {
- background-image: url("dark-assets/misc/calendar-arrow-left-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
.calendar-change-month-back:active {
- background-image: url("dark-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-back:rtl {
- background-image: url("dark-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover {
- background-image: url("dark-assets/misc/calendar-arrow-right-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
.calendar-change-month-back:rtl:active {
- background-image: url("dark-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward {
- background-image: url("dark-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward:focus, .calendar-change-month-forward:hover {
- background-image: url("dark-assets/misc/calendar-arrow-right-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
.calendar-change-month-forward:active {
- background-image: url("dark-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward:rtl {
- background-image: url("dark-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover {
- background-image: url("dark-assets/misc/calendar-arrow-left-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
.calendar-change-month-forward:rtl:active {
- background-image: url("dark-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.datemenu-date-label {
padding: 0.4em 1.75em;
@@ -658,6 +654,8 @@ StScrollBar {
border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
border-radius: 3px;
padding: 20px; }
+ .switcher-list > StBoxLayout {
+ padding: 4px; }
.switcher-list-item-container {
spacing: 8px; }
.switcher-list .item-box {
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index f63389d..daa4423 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -140,7 +140,7 @@ StScrollBar {
background-color: rgba(255, 255, 255, 0.1);
border-radius: 8px; }
StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
- border-radius: 4px;
+ border-radius: 2px;
background-color: #b8babf;
border: 0px solid;
margin: 0px; }
@@ -261,10 +261,6 @@ StScrollBar {
padding: 4px; }
.popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle {
border-width: 0; }
- .popup-menu .popup-sub-menu-menu-item:open {
- background: none;
- box-shadow: none;
- border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; }
.popup-menu .popup-menu-content {
padding: 1em 0em 1em 0em; }
.popup-menu .popup-menu-item {
@@ -403,7 +399,7 @@ StScrollBar {
.expo-workspaces-name-entry,
.expo-workspaces-name-entry#selected {
- spacing: 25px;
+ height: 15px;
border-radius: 2px;
font-size: 9pt;
padding: 5px 8px;
@@ -435,7 +431,7 @@ StScrollBar {
background-color: #353945; }
.workspace-thumbnails {
- spacing: 14px; }
+ spacing: 26px; }
.workspace-thumbnails-background, .workspace-thumbnails-background:rtl {
padding: 8px; }
@@ -533,30 +529,30 @@ StScrollBar {
height: 16px; }
.calendar-change-month-back {
- background-image: url("light-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-back:focus, .calendar-change-month-back:hover {
- background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
.calendar-change-month-back:active {
- background-image: url("light-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-back:rtl {
- background-image: url("light-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover {
- background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
.calendar-change-month-back:rtl:active {
- background-image: url("light-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward {
- background-image: url("light-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward:focus, .calendar-change-month-forward:hover {
- background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
.calendar-change-month-forward:active {
- background-image: url("light-assets/misc/calendar-arrow-right.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
.calendar-change-month-forward:rtl {
- background-image: url("light-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover {
- background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
.calendar-change-month-forward:rtl:active {
- background-image: url("light-assets/misc/calendar-arrow-left.svg"); }
+ background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
.datemenu-date-label {
padding: 0.4em 1.75em;
@@ -658,6 +654,8 @@ StScrollBar {
border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
border-radius: 3px;
padding: 20px; }
+ .switcher-list > StBoxLayout {
+ padding: 4px; }
.switcher-list-item-container {
spacing: 8px; }
.switcher-list .item-box {
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
new file mode 100644
index 0000000..a5cc13e
--- /dev/null
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-left.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg
new file mode 100644
index 0000000..2774254
--- /dev/null
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
new file mode 100644
index 0000000..f718628
--- /dev/null
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-right.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg
new file mode 100644
index 0000000..366e69b
--- /dev/null
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/misc/sound-overlay.svg b/common/cinnamon/common-assets/misc/sound-overlay.svg
deleted file mode 100644
index ad62be0..0000000
--- a/common/cinnamon/common-assets/misc/sound-overlay.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/dark-assets/menu/submenu-open.svg b/common/cinnamon/dark-assets/menu/submenu-open.svg
deleted file mode 100644
index bd817b0..0000000
--- a/common/cinnamon/dark-assets/menu/submenu-open.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/dark-assets/menu/submenu.svg b/common/cinnamon/dark-assets/menu/submenu.svg
index ebab963..9369544 100644
--- a/common/cinnamon/dark-assets/menu/submenu.svg
+++ b/common/cinnamon/dark-assets/menu/submenu.svg
@@ -28,8 +28,8 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="16.000001"
- inkscape:cx="17.662447"
- inkscape:cy="6.5634088"
+ inkscape:cx="6.5686977"
+ inkscape:cy="6.4384088"
inkscape:document-units="px"
inkscape:current-layer="g3027"
showgrid="true"
@@ -104,6 +104,14 @@
x="1058.3102"
y="-9.9350014"
transform="matrix(0,1,-1,0,0,0)" />
+
diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg
deleted file mode 100644
index 7f292f8..0000000
--- a/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg
deleted file mode 100644
index 5602eff..0000000
--- a/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg
deleted file mode 100644
index beadead..0000000
--- a/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg
deleted file mode 100644
index 734b53b..0000000
--- a/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/light-assets/menu/submenu-open.svg b/common/cinnamon/light-assets/menu/submenu-open.svg
deleted file mode 100644
index 8062443..0000000
--- a/common/cinnamon/light-assets/menu/submenu-open.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/light-assets/menu/submenu.svg b/common/cinnamon/light-assets/menu/submenu.svg
index 766c82e..378f29b 100644
--- a/common/cinnamon/light-assets/menu/submenu.svg
+++ b/common/cinnamon/light-assets/menu/submenu.svg
@@ -27,9 +27,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="16.000001"
- inkscape:cx="7.5374477"
- inkscape:cy="6.5634088"
+ inkscape:zoom="45.254837"
+ inkscape:cx="2.5411162"
+ inkscape:cy="14.440542"
inkscape:document-units="px"
inkscape:current-layer="g3027"
showgrid="true"
@@ -104,6 +104,14 @@
x="1058.3102"
y="-9.9350014"
transform="matrix(0,1,-1,0,0,0)" />
+
diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg
deleted file mode 100644
index 7f292f8..0000000
--- a/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left.svg b/common/cinnamon/light-assets/misc/calendar-arrow-left.svg
deleted file mode 100644
index 5602eff..0000000
--- a/common/cinnamon/light-assets/misc/calendar-arrow-left.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg
deleted file mode 100644
index beadead..0000000
--- a/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right.svg
deleted file mode 100644
index 734b53b..0000000
--- a/common/cinnamon/light-assets/misc/calendar-arrow-right.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 6568dfd..5a3f27d 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -122,7 +122,7 @@ StScrollBar {
}
StButton#vhandle, StButton#hhandle {
- border-radius: 4px;
+ border-radius: 2px;
background-color: mix($fg_color, $bg_color, 40%);
border: 0px solid;
margin: 0px;
@@ -278,12 +278,6 @@ StScrollBar {
padding: 4px;
StBin#trough, StBin#vhandle { border-width: 0; }
}
-
- &-menu-item:open {
- background: none;
- box-shadow: none;
- border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9;
- }
}
.popup-menu-content { padding: 1em 0em 1em 0em; }
@@ -455,7 +449,7 @@ StScrollBar {
.expo-workspaces-name-entry,
.expo-workspaces-name-entry#selected {
- spacing: 25px;
+ height: 15px;
border-radius: 2px;
font-size: 9pt;
padding: 5px 8px;
@@ -493,7 +487,7 @@ StScrollBar {
//&-controls { visible-height: 32px; }
&-thumbnails {
- spacing: 14px;
+ spacing: 26px;
&-background, &-background:rtl { padding: 8px; }
}
@@ -623,35 +617,35 @@ StScrollBar {
//arrow back
.calendar-change-month-back {
- background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg");
+ background-image: url("common-assets/misc/calendar-arrow-left.svg");
- &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); }
+ &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
- &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); }
+ &:active { background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
&:rtl {
- background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg");
+ background-image: url("common-assets/misc/calendar-arrow-right.svg");
- &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); }
+ &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
- &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); }
+ &:active { background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
}
}
//arrow forward
.calendar-change-month-forward {
- background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg");
+ background-image: url("common-assets/misc/calendar-arrow-right.svg");
- &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); }
+ &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); }
- &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); }
+ &:active { background-image: url("common-assets/misc/calendar-arrow-right.svg"); }
&:rtl {
- background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg");
+ background-image: url("common-assets/misc/calendar-arrow-left.svg");
- &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); }
+ &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); }
- &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); }
+ &:active { background-image: url("common-assets/misc/calendar-arrow-left.svg"); }
}
}
@@ -789,6 +783,10 @@ StScrollBar {
border-radius: 3px;
padding: 20px;
+ > StBoxLayout {
+ padding: 4px;
+ }
+
&-item-container { spacing: 8px; }
.item-box {
--
cgit v1.2.3