Commit 846d6126 authored by John Pucciarelli's avatar John Pucciarelli

Merge branch 'develop' into 'master'

0.0.3

See merge request !11
parents 14ef81b3 5a27fa15
......@@ -3,7 +3,7 @@ stage {
font-size: 11pt;
}
.button {
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.18);
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.27);
background: #006ccc;
border-radius: 3px;
cursor: pointer;
......@@ -371,7 +371,7 @@ StScrollBar StButton#hhandle:active {
/* PopupMenu */
.popup-menu-boxpointer,
.candidate-popup-boxpointer {
-arrow-background-color: rgba(0, 0, 0, 0.85);
-arrow-background-color: rgba(0, 0, 0, 0.01);
-arrow-border-width: 0;
-arrow-border-color: transparent;
-arrow-base: 64px;
......@@ -380,13 +380,13 @@ StScrollBar StButton#hhandle:active {
margin: 0.1em 0.3em 0.5em;
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.85);
box-shadow: 0 9px 12px rgba(0, 0, 0, 0.4), 0 5px 5px rgba(0, 0, 0, 0.32), 0 3px 3px rgba(0, 0, 0, 0.26);
box-shadow: 0 9px 12px rgba(0, 0, 0, 0.4), 0 5px 5px rgba(0, 0, 0, 0.32), 0 3px 3px rgba(0, 0, 0, 0.18);
}
.popup-menu {
margin: 5px 9px;
color: #dedede;
border-radius: 3px;
background-color: transparent;
background-color: rgba(0, 0, 0, 0.85);
}
.popup-menu.panel-menu {
-boxpointer-gap: 10px;
......@@ -403,11 +403,11 @@ StScrollBar StButton#hhandle:active {
background: none;
}
.popup-menu .popup-menu-item:hover {
background-color: rgba(255, 51, 0, 0.85);
background-color: rgba(64, 64, 64, 0.85);
}
.popup-menu .popup-menu-item:selected,
.popup-menu .popup-menu-item:active {
background-color: #ff3300;
background-color: rgba(102, 102, 102, 0.85);
}
.popup-submenu-menu-item {
background: none;
......@@ -507,7 +507,7 @@ StScrollBar StButton#hhandle:active {
}
.calendar-change-month-back:hover,
.calendar-change-month-back:focus {
background-color: rgba(74, 144, 217, 0.55);
background-color: #0081f5;
}
.calendar-change-month-back:active {
background-color: transparent;
......@@ -520,7 +520,7 @@ StScrollBar StButton#hhandle:active {
}
.calendar-change-month-forward:hover,
.calendar-change-month-forward:focus {
background-color: rgba(74, 144, 217, 0.55);
background-color: #0081f5;
}
.calendar-change-month-forward:active {
background-color: transparent;
......@@ -535,24 +535,29 @@ StScrollBar StButton#hhandle:active {
.datemenu-date-label:focus {
color: #e4e4e4;
}
.datemenu-date-label:active {
background-image: none;
background-gradient-direction: none;
background-color: #006ccc;
background-gradient-start: #0081f5;
background-gradient-end: #004b8f;
}
.datemenu-today-button {
color: #e4e4e4;
background-color: transparent;
}
.datemenu-today-button:hover,
.datemenu-today-button:focus {
color: #e4e4e4;
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.08);
background-color: #006ccc;
}
.datemenu-today-button:active,
.datemenu-today-button:active {
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.08);
}
.world-clocks-button:active,
.message-list-section-title:active {
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.08);
background-color: rgba(74, 144, 217, 0.65);
}
.datemenu-date-label:active {
background-image: none;
background-gradient-direction: none;
background-color: #006ccc;
background-gradient-start: #0081f5;
background-gradient-end: #004b8f;
}
.calendar-day-base {
font-size: 9pt;
......@@ -560,23 +565,19 @@ StScrollBar StButton#hhandle:active {
width: 2.4em;
height: 2.4em;
border: none;
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.27);
}
.calendar-day-base:hover,
.calendar-day-base:focus {
color: #f9f9f9;
color: white;
background-image: none;
background-gradient-direction: none;
background-color: #006ccc;
background-gradient-start: #0081f5;
background-gradient-end: #004b8f;
background-color: #0081f5;
}
.calendar-day-base:selected,
.calendar-day-base:active {
color: #f9f9f9;
color: white;
background-image: none;
background-gradient-direction: none;
background-color: #006ccc;
background-gradient-start: #0081f5;
background-gradient-end: #004b8f;
}
.calendar-day-heading {
color: #e4e4e4;
......@@ -644,12 +645,12 @@ StScrollBar StButton#hhandle:active {
}
.nm-dialog-header {
font-weight: bold;
color: rgba(74, 144, 217, 0.85);
color: #006ccc;
}
.nm-dialog-item:selected {
.nm-dialog-header:selected {
border-radius: 6px;
border: 1px rgba(10, 20, 10, 0.75);
background-color: rgba(74, 144, 217, 0.75);
background-color: #0081f5;
}
/* Overview */
#overview {
......
......@@ -34,6 +34,7 @@
@global-text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.65);
@global-highlight: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.18);
@global-highlight-bright: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.27);
@global-highlight-faded: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.08);
@global-transition-duration: 400ms;
@global-transition-duration-short: @global-transition-duration / 2;
......@@ -49,7 +50,7 @@ stage {
//background-color: @global-color-primary;
//border: none;
//box-shadow: none;
box-shadow: @global-highlight;
box-shadow: @global-highlight-bright;
background: @global-color-primary;
border-radius: @global-radius;
cursor:pointer;
......@@ -597,7 +598,7 @@ StScrollBar StButton#hhandle:active {
/* PopupMenu */
.popup-menu-boxpointer,
.candidate-popup-boxpointer {
-arrow-background-color: @global-color-background-primary;
-arrow-background-color: @global-color-clear;
-arrow-border-width: 0;
-arrow-border-color: transparent;
-arrow-base: 64px;
......@@ -606,7 +607,7 @@ StScrollBar StButton#hhandle:active {
margin: 0.1em 0.3em 0.5em;
border-radius: 2px;
background-color: @global-color-background-primary;
box-shadow: 0 9px 12px rgba(0, 0, 0, 0.4), 0 5px 5px rgba(0, 0, 0, 0.32), 0 3px 3px rgba(0, 0, 0, 0.26);
box-shadow: 0 9px 12px rgba(0, 0, 0, 0.4), 0 5px 5px rgba(0, 0, 0, 0.32), 0 3px 3px rgba(0, 0, 0, 0.18);
}
// wrapper for all panel popover menus
......@@ -614,7 +615,7 @@ StScrollBar StButton#hhandle:active {
margin: 5px 9px;
color: rgba(222, 222, 222, 1);
border-radius: @global-radius;
background-color: transparent;
background-color: @global-color-background-primary;
&.panel-menu {
// needed for menu drop-shadow
......@@ -635,11 +636,11 @@ StScrollBar StButton#hhandle:active {
.popup-menu-item {
background: none;
&:hover {
background-color: @global-color-primary-alt-faded;
background-color: lighten(@global-color-background-primary, 25%);
}
&:selected,
&:active {
background-color: @global-color-primary-alt;
background-color: lighten(@global-color-background-primary, 40%);
}
}
}
......@@ -758,15 +759,15 @@ StScrollBar StButton#hhandle:active {
border-radius: 30;
border: 1px transparent;
transition-duration: @global-transition-duration;
}
.calendar-change-month-back:hover,
.calendar-change-month-back:focus {
background-color: rgba(74, 144, 217, 0.55);
}
&:hover,
&:focus {
background-color: @global-color-primary-light;
}
.calendar-change-month-back:active {
background-color: transparent;
&:active {
background-color: transparent;
}
}
.calendar-change-month-forward {
......@@ -774,15 +775,15 @@ StScrollBar StButton#hhandle:active {
border-radius: 30;
border: 1px transparent;
transition-duration: @global-transition-duration;
}
.calendar-change-month-forward:hover,
.calendar-change-month-forward:focus {
background-color: rgba(74, 144, 217, 0.55);
}
&:hover,
&:focus {
background-color: @global-color-primary-light;
}
.calendar-change-month-forward:active {
background-color: transparent;
&:active {
background-color: transparent;
}
}
.datemenu-date-label {
......@@ -790,33 +791,41 @@ StScrollBar StButton#hhandle:active {
font-weight: bold;
text-align: center;
color: @global-color-background-secondary;
}
.datemenu-date-label:hover,
.datemenu-date-label:focus {
color: @global-color-background-secondary;
&:hover,
&:focus {
color: @global-color-background-secondary;
}
&:active {
background-image: none;
background-gradient-direction: none;
background-color: @global-color-primary;
background-gradient-start: @global-color-primary-start;
background-gradient-end: @global-color-primary-end;
}
}
.datemenu-today-button:hover,
.datemenu-today-button:focus {
.datemenu-today-button {
color: @global-color-background-secondary;
box-shadow: @global-highlight-faded;
background-color: @global-color-primary;
background-color: transparent;
&:hover,
&:focus {
color: @global-color-background-secondary;
box-shadow: @global-highlight-faded;
}
&:active {
box-shadow: @global-highlight-faded;
}
}
.datemenu-today-button:active,
.world-clocks-button:active,
.message-list-section-title:active {
box-shadow: @global-highlight-faded;
background-color: rgba(74, 144, 217, 0.65);
}
.datemenu-date-label:active {
background-image: none;
background-gradient-direction: none;
background-color: @global-color-primary;
background-gradient-start: @global-color-primary-start;
background-gradient-end: @global-color-primary-end;
}
.calendar-day-base {
......@@ -825,25 +834,21 @@ StScrollBar StButton#hhandle:active {
width: 2.4em;
height: 2.4em;
border: none;
}
box-shadow: @global-highlight-bright;
.calendar-day-base:hover,
.calendar-day-base:focus {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: @global-color-primary;
background-gradient-start: @global-color-primary-start;
background-gradient-end: @global-color-primary-end;
}
&:hover,
&:focus {
color: @global-color-light;
background-image: none;
background-color: @global-color-primary-light;
}
.calendar-day-base:active {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: @global-color-primary;
background-gradient-start: @global-color-primary-start;
background-gradient-end: @global-color-primary-end;
&:selected,
&:active {
color: @global-color-light;
background-image: none;
background-color: @global-color-primary;
}
}
.calendar-day-heading {
......@@ -878,27 +883,27 @@ StScrollBar StButton#hhandle:active {
border-radius: 32px;
padding: 13px;
border: 2px solid rgba(10, 10, 10, 0.3);
}
.system-menu-action:hover,
.system-menu-action:focus {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: rgba(0, 0, 0, 0.4);
background-gradient-start: rgba(0, 0, 0, 0.3);
background-gradient-end: rgba(0, 0, 0, 0.4);
border: 2px solid @global-color-primary-alt-faded;
}
&:hover,
&:focus {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: rgba(0, 0, 0, 0.4);
background-gradient-start: rgba(0, 0, 0, 0.3);
background-gradient-end: rgba(0, 0, 0, 0.4);
border: 2px solid @global-color-primary-alt-faded;
}
.system-menu-action:active {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: rgba(0, 0, 0, 0.4);
background-gradient-start: rgba(0, 0, 0, 0.3);
background-gradient-end: rgba(0, 0, 0, 0.4);
border: 2px solid @global-color-primary-alt;
&:active {
color: rgba(249, 249, 249, 1.0);
background-image: none;
background-gradient-direction: none;
background-color: rgba(0, 0, 0, 0.4);
background-gradient-start: rgba(0, 0, 0, 0.3);
background-gradient-end: rgba(0, 0, 0, 0.4);
border: 2px solid @global-color-primary-alt;
}
}
/* Network */
......@@ -925,16 +930,15 @@ StScrollBar StButton#hhandle:active {
.nm-dialog-header {
font-weight: bold;
color: rgba(74, 144, 217, 0.85);
}
color: @global-color-primary;
.nm-dialog-item:selected {
border-radius: 6px;
border: 1px rgba(10, 20, 10, 0.75);
background-color: rgba(74, 144, 217, 0.75);
&:selected {
border-radius: 6px;
border: 1px rgba(10, 20, 10, 0.75);
background-color: @global-color-primary-light
}
}
/* Overview */
#overview {
spacing: 24px;
......
{
"name": "dark-glass-redux",
"version": "0.0.2",
"version": "0.0.3",
"description": "Dark-Glass-Redux Gnome Shell Theme",
"main": "none",
"repository": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment