diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 179c89212..7032c13e5 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -104,6 +104,12 @@ StScrollBar {
}
}
+/* Slider */
+
+.slider { //FIXME
+
+}
+
/* Check Boxes */
.check-box {
@@ -190,6 +196,10 @@ StScrollBar {
//.popup-status-menu-item { font-weight: normal; color: pink; } //dunno what that is
}
+ .popup-menu-ornament {
+ text-align: right;
+ width: 1em;
+ }
.popup-menu-boxpointer,
.candidate-popup-boxpointer {
-arrow-border-radius: 3px;
@@ -215,8 +225,13 @@ StScrollBar {
background-color: black;
font-weight: bold;
height: 1.86em;
+
&.unlock-screen,
- &.login-screen { background-color: transparent; }
+ &.login-screen,
+ &.lock-screen {
+ background-color: transparent;
+
+ }
#panelLeft, #panelCenter { // spacing between activities<>app menu and such
spacing: 4px;
@@ -235,9 +250,77 @@ StScrollBar {
-panel-corner-border-color: transparent;
}
}
+
+ .panel-button {
+ -natural-hpadding: 12px;
+ -minimum-hpadding: 6px;
+ font-weight: bold;
+ color: #ccc;
+ transition-duration: 100ms;
+
+ #appMenuIcon {
+ app-icon-bottom-clip: 1px;
+
+ .panel-button:active &,
+ .panel-button:overview &,
+ .panel-button:focus &,
+ .panel-button:checked & {
+ app-icon-bottom-clip: 2px;
+ }
+
+ }
+ &:hover {
+ color: lighten($fg_color, 10%);
+ text-shadow: black 0 2px 2px;
+ }
+
+ &:active, &:overview, &:focus, &:checked {
+ border-image: url("panel-button-border.svg") 6 10 0 2;
+ background-image: url("panel-button-highlight-wide.svg");
+ color: white;
+ text-shadow: black 0px 2px 2px;
+
+ & > .system-status-icon { icon-shadow: black 0 2px 2px; }
+ }
+
+ .system-status-icon { icon-size: 1.09em; padding: 0 5px; }
+ .unlock-screen &,
+ .login-screen &,
+ .lock-screen & {
+ color: lighten($fg_color, 10%);
+ &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
+ }
+ }
+ .panel-status-button {
+
+ &:active, &:overview, &:focus, &:checked {
+ background-image: url("panel-button-highlight-narrow.svg");
+ }
+ }
+
+ .panel-menu { -boxpointer-gap: 4px; } //FIXME
+ .panel-status-indicators-box, //FIXME
+ .panel-status-menu-box {
+ spacing: 2px;
+ }
}
+ #appMenu {
+ spinner-image: url("process-working.svg");
+ spacing: 4px;
+ .label-shadow { color: transparentize(#000,0.5); }
+ }
+
+ .aggregate-menu {
+ width: 360px;
+ .popup-menu-icon { padding: 0 4px; }
+ }
+
+ .system-menu-action { } //FIXME, what's this?
+ .system0switch-user0submenu-icon { } //FIXME, what's this?
+
+
// not really top bar only
.popup-menu-arrow { width: 16px; height: 16px; }
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 3d079c8da..cc364b75a 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -17,60 +17,6 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* Text Styles */
-
-/* default text style */
-
-
-
-/* Slider */
-
-.slider {
- height: 1em;
- -slider-height: 0.3em;
- -slider-background-color: #333333;
- -slider-border-color: #5f5f5f;
- -slider-active-background-color: #76b0ec;
- -slider-active-border-color: #1f6dbc;
- -slider-border-width: 1px;
- -slider-handle-radius: 6px;
-}
-
-/* PopupMenu */
-
-.popup-menu-ornament {
- text-align: right;
- width: 1em;
-}
-
-
-
-.popup-sub-menu:scrolled .popup-menu-item:ltr {
- padding-right: 0em;
-}
-
-.popup-sub-menu:scrolled .popup-menu-item:rtl {
- padding-left: 0em;
-}
-
-.popup-sub-menu StScrollBar {
- padding: 4px;
-}
-
-.popup-sub-menu StScrollBar StBin#trough {
- border-width: 0px;
-}
-
-.popup-sub-menu StScrollBar StBin#vhandle {
- background-color: #4c4c4c;
- border-width: 0px;
-}
-
-/* The remaining popup-menu sizing is all done in ems, so that if you
- * override .popup-menu.font-size, everything else will scale with it.
- */
-
-
/* Switches */
.toggle-switch {
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 8d8e1e6f6..6368fe7e6 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,43 +16,6 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* Text Styles */
-/* default text style */
-/* Slider */
-.slider {
- height: 1em;
- -slider-height: 0.3em;
- -slider-background-color: #333333;
- -slider-border-color: #5f5f5f;
- -slider-active-background-color: #76b0ec;
- -slider-active-border-color: #1f6dbc;
- -slider-border-width: 1px;
- -slider-handle-radius: 6px; }
-
-/* PopupMenu */
-.popup-menu-ornament {
- text-align: right;
- width: 1em; }
-
-.popup-sub-menu:scrolled .popup-menu-item:ltr {
- padding-right: 0em; }
-
-.popup-sub-menu:scrolled .popup-menu-item:rtl {
- padding-left: 0em; }
-
-.popup-sub-menu StScrollBar {
- padding: 4px; }
-
-.popup-sub-menu StScrollBar StBin#trough {
- border-width: 0px; }
-
-.popup-sub-menu StScrollBar StBin#vhandle {
- background-color: #4c4c4c;
- border-width: 0px; }
-
-/* The remaining popup-menu sizing is all done in ems, so that if you
- * override .popup-menu.font-size, everything else will scale with it.
- */
/* Switches */
.toggle-switch {
width: 65px;
@@ -1889,6 +1852,7 @@ StScrollBar {
StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
background-color: #215d9c; }
+/* Slider */
/* Check Boxes */
.check-box StBoxLayout {
spacing: .8em; }
@@ -1967,6 +1931,10 @@ StScrollBar {
.popup-menu .popup-inactive-menu-item:insensitive {
color: rgba(238, 238, 236, 0.5); }
+.popup-menu-ornament {
+ text-align: right;
+ width: 1em; }
+
.popup-menu-boxpointer,
.candidate-popup-boxpointer {
-arrow-border-radius: 3px;
@@ -1986,7 +1954,7 @@ StScrollBar {
background-color: black;
font-weight: bold;
height: 1.86em; }
- #panel.unlock-screen, #panel.login-screen {
+ #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
background-color: transparent; }
#panel #panelLeft, #panel #panelCenter {
spacing: 4px; }
@@ -2001,6 +1969,51 @@ StScrollBar {
-panel-corner-radius: 0;
-panel-corner-background-color: transparent;
-panel-corner-border-color: transparent; }
+ #panel .panel-button {
+ -natural-hpadding: 12px;
+ -minimum-hpadding: 6px;
+ font-weight: bold;
+ color: #ccc;
+ transition-duration: 100ms; }
+ #panel .panel-button #appMenuIcon {
+ app-icon-bottom-clip: 1px; }
+ .panel-button:active #panel .panel-button #appMenuIcon, .panel-button:overview #panel .panel-button #appMenuIcon, .panel-button:focus #panel .panel-button #appMenuIcon, .panel-button:checked #panel .panel-button #appMenuIcon {
+ app-icon-bottom-clip: 2px; }
+ #panel .panel-button:hover {
+ color: white;
+ text-shadow: black 0 2px 2px; }
+ #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+ border-image: url("panel-button-border.svg") 6 10 0 2;
+ background-image: url("panel-button-highlight-wide.svg");
+ color: white;
+ text-shadow: black 0px 2px 2px; }
+ #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon {
+ icon-shadow: black 0 2px 2px; }
+ #panel .panel-button .system-status-icon {
+ icon-size: 1.09em;
+ padding: 0 5px; }
+ .unlock-screen #panel .panel-button, .login-screen #panel .panel-button, .lock-screen #panel .panel-button {
+ color: white; }
+ .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
+ color: white; }
+ #panel .panel-status-button:active, #panel .panel-status-button:overview, #panel .panel-status-button:focus, #panel .panel-status-button:checked {
+ background-image: url("panel-button-highlight-narrow.svg"); }
+ #panel .panel-menu {
+ -boxpointer-gap: 4px; }
+ #panel .panel-status-indicators-box,
+ #panel .panel-status-menu-box {
+ spacing: 2px; }
+
+#appMenu {
+ spinner-image: url("process-working.svg");
+ spacing: 4px; }
+ #appMenu .label-shadow {
+ color: rgba(0, 0, 0, 0.5); }
+
+.aggregate-menu {
+ width: 360px; }
+ .aggregate-menu .popup-menu-icon {
+ padding: 0 4px; }
.popup-menu-arrow {
width: 16px;
diff --git a/data/theme/process-working.svg b/data/theme/process-working.svg
index e215d2fe1..43ffccad3 100644
--- a/data/theme/process-working.svg
+++ b/data/theme/process-working.svg
@@ -12,7 +12,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg5369"
version="1.1"
- inkscape:version="0.48+devel r10053 custom"
+ inkscape:version="0.48.5 r10040"
width="96"
height="48"
sodipodi:docname="process-working.svg"
@@ -25,12 +25,597 @@
image/svg+xml
-
+
+ id="defs5373">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:current-layer="layer2"
+ inkscape:snap-bbox="true"
+ inkscape:snap-nodes="false">
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png"
+ sodipodi:open="true"
+ sodipodi:end="4.712389"
+ sodipodi:start="0.23191105"
+ sodipodi:type="arc"
+ style="fill:none;stroke:url(#radialGradient10713);stroke-width:12.18051815;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path10452-5"
+ sodipodi:cx="-25.809397"
+ sodipodi:cy="179.43886"
+ sodipodi:rx="22.98097"
+ sodipodi:ry="22.98097"
+ d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907"
+ transform="matrix(-0.16397381,0.61157081,-0.61162275,-0.16377992,-372.32298,1442.5061)" />
-
-
-
-
-
-
+ transform="matrix(-0.63300818,0.01438356,-0.01458424,-0.63300359,-491.4014,1510.996)"
+ d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907"
+ sodipodi:ry="22.98097"
+ sodipodi:rx="22.98097"
+ sodipodi:cy="179.43886"
+ sodipodi:cx="-25.809397"
+ id="path10454-7"
+ style="fill:none;stroke:url(#radialGradient10715);stroke-width:12.18051815;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ sodipodi:type="arc"
+ sodipodi:start="0.23191105"
+ sodipodi:end="4.712389"
+ sodipodi:open="true"
+ inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ xlink:href="#g10450-5-3"
+ id="use13294"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,35.986458,-4.9737924)"
+ width="96"
+ height="48" />
+ xlink:href="#use13294"
+ id="use13314"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,43.036943,-21.933639)"
+ width="96"
+ height="48" />
+ xlink:href="#use13314"
+ id="use13334"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,50.085328,-38.904987)"
+ width="96"
+ height="48" />
+ xlink:href="#use13334"
+ id="use13354"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-38.894841,-31.888724)"
+ width="96"
+ height="48" />
+ xlink:href="#use13354"
+ id="use13374"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,52.971072,2.0670843)"
+ width="96"
+ height="48" />
+ xlink:href="#use13374"
+ id="use13394"
+ transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,60.017834,-14.929741)"
+ width="96"
+ height="48" />
+ xlink:href="#use13394"
+ id="use13414"
+ transform="matrix(0.86602541,0.50000001,-0.50000001,0.86602541,50.044124,-25.16226)"
+ width="96"
+ height="48" />