Skip to content

Commit

Permalink
Merge pull request #18 from smurphos/nextupdate
Browse files Browse the repository at this point in the history 
20180415 - release candidates
  • Loading branch information
@smurphos
smurphos committed Apr 15, 2018
2 parents 313c0ee + 918f739 commit 8e08fb6
Show file tree
Hide file tree
Showing 48 changed files with 2,280 additions and 2,368 deletions.
151 changes: 70 additions & 81 deletions Cinnamox-Aubergine/cinnamon/cinnamon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
background-gradient-start: #210017;
background-gradient-end: #370026; }

.sound-player-overlay StButton, .keyboard-key, .notification-button, .notification-icon-button, .modal-dialog-button {
.sound-player StButton, .keyboard-key, .notification-button, .notification-icon-button, .modal-dialog-button {
background-gradient-direction: vertical;
background-gradient-start: #763164;
background-gradient-end: #471d3c; }

.sound-player-overlay StButton:hover, .keyboard-key:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button:hover {
.sound-player StButton:hover, .keyboard-key:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button:hover {
background-gradient-direction: vertical;
background-gradient-start: #7b3369;
background-gradient-end: #4a1f3f; }
Expand All @@ -41,7 +41,7 @@
background-gradient-start: #6c165d;
background-gradient-end: #410d38; }

.sound-player-overlay StButton:active, .keyboard-key:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button:active, .modal-dialog-button:pressed, .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus, .workspace-graph .workspace:active, .calendar-today, .switcher-list .item-box:selected, .window-caption#selected, .expo-workspaces-name-entry#selected {
.sound-player StButton:active, .keyboard-key:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button:active, .modal-dialog-button:pressed, .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus, .workspace-graph .workspace:active, .calendar-today, .switcher-list .item-box:selected, .window-caption#selected, .expo-workspaces-name-entry#selected {
background-gradient-direction: vertical;
background-gradient-start: #b53c12;
background-gradient-end: #ef825c; }
Expand Down Expand Up @@ -112,27 +112,28 @@
color: #f2d9f0; }

.slider, .popup-slider-menu-item, .sound-player .slider {
height: 1em;
height: 1.2em;
min-width: 15em;
color: #f2d9f0;
-slider-height: 0.7em;
color: #5E2750;
-slider-height: 2px;
-slider-background-color: #3d0d35;
-slider-border-color: rgba(242, 217, 240, 0.22);
-slider-active-background-color: #cb4728;
-slider-active-border-color: #ce4827;
-slider-border-width: 1px;
-slider-border-radius: 0.3em;
-slider-handle-radius: 0.7em; }
-slider-border-radius: 10px;
-slider-handle-radius: 8px;
-slider-handle-border-color: rgba(242, 217, 240, 0.22); }

.separator, .popup-separator-menu-item {
-gradient-height: 3px;
-gradient-start: #E95420;
-gradient-end: #2C001E;
-margin-horizontal: 1em;
-margin-horizontal: 4px;
height: 1em; }

#menu-search-entry, #notification StEntry, .run-dialog-entry {
padding: 6px;
padding: 5px;
border-radius: 10px;
color: #f2d9f0;
border: 1px solid rgba(242, 217, 240, 0.22);
Expand All @@ -155,17 +156,17 @@
border-radius: 10px;
transition-duration: 150; }

.sound-player-overlay StButton, .keyboard-key, .notification-button, .notification-icon-button, .modal-dialog-button {
.sound-player StButton, .keyboard-key, .notification-button, .notification-icon-button, .modal-dialog-button {
border: 1px solid rgba(242, 217, 240, 0.22);
border-radius: 10px;
text-align: center;
color: #f2d9f0;
transition-duration: 150; }

.sound-player-overlay StButton:hover, .keyboard-key:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button:hover {
.sound-player StButton:hover, .keyboard-key:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button:hover {
border: 1px solid #ce4827; }

.sound-player-overlay StButton:active, .keyboard-key:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button:active, .modal-dialog-button:pressed {
.sound-player StButton:active, .keyboard-key:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button:active, .modal-dialog-button:pressed {
color: #000000; }

.menu, .popup-combo-menu {
Expand All @@ -181,7 +182,7 @@
padding-right: 4px; }

.popup-menu-item, .popup-combobox-item, .menu-favorites-button, .menu-application-button, .menu-application-button-selected, .menu-category-button, .menu-category-button-greyed, .menu-category-button-selected {
padding: 6px; }
padding: 5px; }

.show-processes-dialog-subject, .mount-question-dialog-subject {
font-weight: bold;
Expand Down Expand Up @@ -241,7 +242,7 @@
border: 2px solid #ce4827; }

stage {
font-family: sans, sans-serif;
font-family: roboto, Noto Sans, sans, sans-serif;
font-size: 1em; }

.cinnamon-link {
Expand Down Expand Up @@ -326,18 +327,6 @@ StScrollView StScrollBar {
border-radius: 10px;
padding: 8px;
margin: 8px 0; }
.popup-sub-menu StScrollBar {
padding: 2px;
min-width: 0.8em;
min-height: 0.8em; }
.popup-sub-menu StScrollBar StBin#trough {
background-color: #3d0d35;
border-radius: 10px; }
.popup-sub-menu StScrollBar StBin#vhandle {
background-color: #a2759c;
border-radius: 10px; }
.popup-sub-menu StScrollBar StBin#vhandle:hover {
background-color: #cb4728; }

.popup-menu-content {
padding: 0; }
Expand All @@ -362,7 +351,8 @@ StScrollView StScrollBar {
color: #f2d9f0; }

.popup-subtitle-menu-item {
font-weight: bold; }
font-weight: bold;
font-size: 1em; }

.popup-menu-icon {
icon-size: 1.14em;
Expand Down Expand Up @@ -514,57 +504,53 @@ StScrollView StScrollBar {
border-bottom: 1px solid;
border-color: #b289ac; }
.panel-top .workspace-switcher, .panel-top .workspace-graph {
padding: 1px 4px; }
padding: 1px 3px; }
.panel-top .applet-box {
padding: 1px 4px;
margin-bottom: 1px; }
padding: 1px 3px;
margin: 1px 0; }
.panel-top .panel-launchers .launcher:hover {
border-bottom: 2px solid;
border-color: #ce4827; }
box-shadow: 0 -2px 0 0 #ce4827 inset; }
.panel-top .applet-separator {
padding: 3px 4px; }
padding: 3px 3px; }

.panel-bottom {
border-top: 1px solid;
border-color: #b289ac; }
.panel-bottom .workspace-switcher, .panel-bottom .workspace-graph {
padding: 1px 4px; }
padding: 1px 3px; }
.panel-bottom .applet-box {
padding: 1px 4px;
margin-top: 1px; }
padding: 1px 3px;
margin: 1px 0; }
.panel-bottom .panel-launchers .launcher:hover {
border-top: 2px solid;
border-color: #ce4827; }
box-shadow: 0 2px 0 0 #ce4827 inset; }
.panel-bottom .applet-separator {
padding: 3px 4px; }
padding: 3px 3px; }

.panel-left {
border-right: 1px solid;
border-color: #b289ac; }
.panel-left .workspace-switcher, .panel-left .workspace-graph {
padding: 4px 1px; }
padding: 3px 1px; }
.panel-left .applet-box {
padding: 4px 1px;
margin-right: 1px; }
padding: 3px 1px;
margin: 0 1px; }
.panel-left .panel-launchers .launcher:hover {
border-right: 3px solid;
border-color: #ce4827; }
box-shadow: -2px 0 0 0 #ce4827 inset; }
.panel-left .applet-separator {
padding: 4px 3px; }
padding: 3px 3px; }

.panel-right {
border-left: 1px solid;
border-color: #b289ac; }
.panel-right .workspace-switcher, .panel-right .workspace-graph {
padding: 4px 1px; }
padding: 3px 1px; }
.panel-right .applet-box {
padding: 4px 1px;
margin-left: 1px; }
padding: 3px 1px;
margin: 0 1px; }
.panel-right .panel-launchers .launcher:hover {
border-left: 3px solid;
border-color: #ce4827; }
box-shadow: 2px 0 0 0 #ce4827 inset; }
.panel-right .applet-separator {
padding: 4px 3px; }
padding: 3px 3px; }

.applet-separator-line {
width: 2px;
Expand Down Expand Up @@ -618,8 +604,7 @@ StScrollView StScrollBar {
-natural-hpadding: 4px;
-minimum-hpadding: 4px;
font-weight: bold;
color: #f2d9f0;
height: 2em; }
color: #f2d9f0; }
.panel-status-button:hover {
color: #E95420; }

Expand All @@ -628,20 +613,21 @@ StScrollView StScrollBar {
spacing: 10px; }

.user-icon {
padding: 4px; }
padding: 4px;
border: none; }

.user-label {
color: #f2d9f0;
font-weight: bold; }
font-weight: bold;
font-size: 1em; }

.window-list-box {
spacing: 4px;
padding: 1px 3px; }
spacing: 3px;
padding: 1px 3px;
font-size: 0.9em; }
.window-list-box.vertical {
spacing: 4px;
spacing: 3px;
padding: 3px 1px; }
.window-list-box #appMenuIcon {
padding: 1px; }

.window-list-item-box {
border: 1px solid rgba(242, 217, 240, 0.22);
Expand Down Expand Up @@ -671,16 +657,22 @@ StScrollView StScrollBar {
.sound-player StButton {
min-width: 2em;
min-height: 2em;
padding: 6px;
color: #f2d9f0; }
padding: 5px;
color: #f2d9f0;
border-radius: 10px; }
.sound-player StButton:small {
min-width: 1.5em;
min-height: 1.5em;
padding: 4px; }
padding: 3px; }
.sound-player StButton:small StIcon {
icon-size: 1em; }
.sound-player StButton StIcon {
icon-size: 1.5em; }
.sound-player StButton:focus {
color: #000000; }

.sound-player .slider {
height: 4px; }

.sound-player StBoxLayout {
spacing: 0.5em; }
Expand All @@ -692,19 +684,10 @@ StScrollView StScrollBar {
background: rgba(0, 0, 0, 0.2); }

.sound-player-overlay {
width: 300px;
min-width: 300px;
padding: 12px 16px;
spacing: 0.5em;
color: #f2d9f0; }
.sound-player-overlay StButton {
border-radius: 10px;
padding: 8px; }
.sound-player-overlay StButton:focus {
color: #000000; }
.sound-player-overlay StButton > StIcon {
icon-size: 1.5em; }
.sound-player-overlay StBoxLayout {
padding-top: 2px; }

.workspace-button {
width: 2em;
Expand Down Expand Up @@ -734,11 +717,13 @@ StScrollView StScrollBar {
-inactive-window-border: rgba(0, 0, 0, 0.7); }

.panel-launchers {
padding: 1px 4px;
spacing: 4px; }
padding: 0 4px;
spacing: 3px; }
.panel-launchers .launcher {
background-color: rgba(0, 0, 0, 0.01); }
.panel-launchers.vertical {
padding: 4px 1px;
spacing: 4px; }
padding: 4px 0;
spacing: 3px; }
.panel-launchers.vertical .launcher .icon-box {
padding-top: 0; }

Expand Down Expand Up @@ -912,15 +897,15 @@ StScrollView StScrollBar {
border-radius: 10px;
min-width: 5em;
min-height: 1em;
padding: 6px; }
padding: 5px; }
.notification-button:focus {
color: #000000; }

.notification-icon-button {
border-radius: 10px;
min-width: 2em;
min-height: 2em;
padding: 6px; }
padding: 5px; }
.notification-icon-button:focus {
color: #000000; }
.notification-icon-button > StIcon {
Expand All @@ -938,7 +923,7 @@ StScrollView StScrollBar {
.modal-dialog-button {
min-width: 5em;
min-height: 1em;
padding: 6px; }
padding: 5px; }
.modal-dialog-button:focus {
color: #000000; }
.modal-dialog-button:disabled {
Expand Down Expand Up @@ -1064,6 +1049,7 @@ StScrollView StScrollBar {
color: #f2d9f0; }

.desklet {
font-size: 0.9em;
padding: 8px;
color: #f2d9f0;
border-radius: 10px;
Expand All @@ -1072,11 +1058,13 @@ StScrollView StScrollBar {
background-color: #E95420; }

.desklet-with-borders {
font-size: 0.9em;
border-radius: 10px; }
.desklet-with-borders:highlight {
background-color: #E95420; }

.desklet-with-borders-and-header {
font-size: 0.9em;
border-radius-bottomleft: 10px;
border-radius-bottomright: 10px; }
.desklet-with-borders-and-header:highlight {
Expand Down Expand Up @@ -1229,6 +1217,7 @@ StScrollView StScrollBar {

.expo-workspaces-name-entry {
padding: 4px 6px;
height: 1.5em;
border: 1px solid #b289ac;
border-radius: 10px;
selected-color: #000000;
Expand Down

0 comments on commit 8e08fb6

Please sign in to comment.