diff --git a/changelog b/changelog index cae14f6..9d6e312 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ -- new unity controls -- improved rc files +- improve rc files +- fix gnome / gtk3 scrollbars +- fix progress bars +- add more icons +- more icon resolutions - re-merge with ubuntu themes +- overall re-compress + diff --git a/src/usr/share/icons/Lubuntu/devices/22/battery.svg b/src/usr/share/icons/Lubuntu/devices/22/battery.svg index 83f25d9..1d7a722 100644 --- a/src/usr/share/icons/Lubuntu/devices/22/battery.svg +++ b/src/usr/share/icons/Lubuntu/devices/22/battery.svg @@ -12,27 +12,23 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="22" height="22" - id="svg4700" + viewBox="0 0 22 22" + id="svg4605" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="battery.svg"> + id="defs4607"> - - - - + inkscape:collect="always" + xlink:href="#linearGradient4047" + id="linearGradient3321" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.63636364,0,0,0.60000007,-4.2727297,1029.9622)" + x1="18" + y1="4" + x2="30" + y2="4" /> - - - - - - - - - - + gradientTransform="matrix(-1.0689655,0,0,1,68.655172,1020.3622)" + x1="46.480427" + y1="25" + x2="61.294987" + y2="25" /> + id="linearGradient4101"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop4103" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop4109" + offset="0.5" + style="stop-color:#019aff;stop-opacity:1" /> + style="stop-color:#044874;stop-opacity:1" + offset="1" + id="stop4105" /> - - - + gradientTransform="matrix(-1,0,0,1,67,1020.3622)" + x1="48.31094" + y1="17.103319" + x2="63.734489" + y2="17.103319" /> - + id="linearGradient4111-3"> - - + style="stop-color:#808080;stop-opacity:1" + offset="0" + id="stop4113-8" /> + id="stop4119-9" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1" /> + style="stop-color:#808080;stop-opacity:1" + offset="1" + id="stop4115-3" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient4050-0"> - + style="stop-color:white;stop-opacity:0.50196081;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + inkscape:window-maximized="1"> + id="grid4683" /> + id="metadata4610"> image/svg+xml - + - + id="layer1" + transform="translate(0,-1030.3622)"> - - - - - - + transform="translate(4.2044911,825.67428)" /> - - - - - - - - - - - - - - - - - + transform="matrix(0.12117717,0,0,0.12117717,81.53415,1000.3476)" /> + transform="matrix(0.12117717,0,0,0.12117717,43.779665,1064.9168)" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3321);fill-opacity:1;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3309);stroke-width:1.00209522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + + + + + + diff --git a/src/usr/share/icons/Lubuntu/devices/24/battery.svg b/src/usr/share/icons/Lubuntu/devices/24/battery.svg index 93423fc..40ce74b 100644 --- a/src/usr/share/icons/Lubuntu/devices/24/battery.svg +++ b/src/usr/share/icons/Lubuntu/devices/24/battery.svg @@ -12,27 +12,23 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" - id="svg4700" + viewBox="0 0 24 24" + id="svg4605" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="battery.svg"> + sodipodi:docname="batt.svg"> + id="defs4607"> - - - - + inkscape:collect="always" + xlink:href="#linearGradient4047" + id="linearGradient3321" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.63636364,0,0,0.60000007,-3.2727297,1028.9622)" + x1="18" + y1="4" + x2="30" + y2="4" /> - - - - - - - - - - + gradientTransform="matrix(-1.0689655,0,0,1,69.655172,1019.3622)" + x1="46.480427" + y1="25" + x2="61.294987" + y2="25" /> + id="linearGradient4101"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop4103" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop4109" + offset="0.5" + style="stop-color:#019aff;stop-opacity:1" /> + style="stop-color:#044874;stop-opacity:1" + offset="1" + id="stop4105" /> - - - + gradientTransform="matrix(-1,0,0,1,68,1019.3622)" + x1="48.31094" + y1="17.103319" + x2="63.734489" + y2="17.103319" /> - + id="linearGradient4111-3"> - - + style="stop-color:#808080;stop-opacity:1" + offset="0" + id="stop4113-8" /> + id="stop4119-9" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1" /> + style="stop-color:#808080;stop-opacity:1" + offset="1" + id="stop4115-3" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient4050-0"> - + style="stop-color:white;stop-opacity:0.50196081;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + inkscape:window-maximized="1"> + id="grid4683" /> + id="metadata4610"> image/svg+xml - + - + id="layer1" + transform="translate(0,-1028.3622)"> - - - - - - + transform="translate(5.2044911,824.67426)" /> - - - - - - - - - - - - - - - - - + transform="matrix(0.12117717,0,0,0.12117717,82.53415,999.3476)" /> + transform="matrix(0.12117717,0,0,0.12117717,44.779665,1063.9168)" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3321);fill-opacity:1;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient3309);stroke-width:1.00209522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + + + + + + diff --git a/src/usr/share/icons/Lubuntu/devices/32/battery.svg b/src/usr/share/icons/Lubuntu/devices/32/battery.svg index 50d90ea..6259c49 100644 --- a/src/usr/share/icons/Lubuntu/devices/32/battery.svg +++ b/src/usr/share/icons/Lubuntu/devices/32/battery.svg @@ -12,1052 +12,40 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="32" height="32" - id="svg4700" + viewBox="0 0 32 32.000001" + id="svg4613" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="battery.svg"> + sodipodi:docname="batt.svg"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="defs4615"> - - - - - - - - - - - - - - - + gradientTransform="matrix(0.06214,0,0,0.029,-0.3635,24.95316)" + cx="605.71429" + cy="486.64789" + r="117.1429" /> + + + + + y1="35.5863" + x2="0" + y2="42.629299" /> - - - - - + + + + + + + gradientTransform="matrix(0.63636359,0,0,0.60000016,0.72727355,1020.9622)" /> + + + + + + gradientTransform="translate(35.999999,1008.2997)" + x1="-29" + y1="20.0625" + x2="-11" + y2="20.0625" /> + + + + + + gradientTransform="matrix(0.48678826,0,0,0.63704457,3.9039163,1022.4566)" /> + + + + + inkscape:window-maximized="1"> + id="grid4730" /> + id="metadata4618"> @@ -1182,12 +208,12 @@ + id="layer1" + transform="translate(0,-1020.3622)"> - - - - - - - - - - - - - - - - - - - - - - - - + x="-26.5" + y="1023.8621" + ry="2" + transform="scale(-1,1)" /> + transform="matrix(0.66666667,0,0,0.66666666,3.4696603,900.57018)" /> + transform="matrix(0.08078478,0,0,0.08078478,55.022766,1017.0191)" /> + transform="matrix(0.08078478,0,0,0.08078478,29.853109,1060.0652)" /> + - - - - - - - - - - - - - + id="layer4-3" + transform="matrix(-1,0,0,1,78.795508,828.6117)" /> - - - - - - - - - - - - - - - - + id="layer6-1-3" + transform="matrix(-0.12117717,0,0,0.12117717,1.4658496,1003.285)" /> - - - - - - - + id="layer6-08-4" + transform="matrix(-0.12117717,0,0,0.12117717,39.220334,1067.8543)" /> + + + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 14.999999,1027.3622 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 0,-2 -2,0 z" + id="rect4728" /> + + + + diff --git a/src/usr/share/icons/Lubuntu/devices/48/battery.svg b/src/usr/share/icons/Lubuntu/devices/48/battery.svg index 5bdf649..ece298d 100644 --- a/src/usr/share/icons/Lubuntu/devices/48/battery.svg +++ b/src/usr/share/icons/Lubuntu/devices/48/battery.svg @@ -10,1055 +10,44 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg4700" + width="48" + height="48" + viewBox="0 0 48 48.000001" + id="svg4920" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="xfpm-ac-adapter.svg"> + sodipodi:docname="batt.svg"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="defs4922"> - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(0.06214,0,0,0.029,-0.3635,24.95316)" + cx="605.71429" + cy="486.64789" + r="117.1429" /> + id="linearGradient5060-10"> + + + + y1="35.5863" + x2="0" + y2="42.629299" /> + + inkscape:collect="always" + xlink:href="#linearGradient4047" + id="linearGradient4567" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.80000001,-48,1.2999999)" + x1="18" + y1="4" + x2="30" + y2="4" /> + + style="stop-color:#3c3c3c;stop-opacity:1;" + offset="0" + id="stop4049" /> + id="stop4055" + offset="0.5" + style="stop-color:white;stop-opacity:1;" /> + - + gradientTransform="matrix(-1.0689655,0,0,1,1.655172,2.9802322e-8)" + x1="9" + y1="25" + x2="39" + y2="25" /> + + + + + - + + + + + + + gradientTransform="matrix(0.74299263,0,0,0.98211042,-42.462443,2.7913702)" + x1="22.440199" + y1="4.8942533" + x2="22.440199" + y2="38.21666" /> + + + + + inkscape:window-maximized="1"> + id="grid4182" /> + id="metadata4925"> @@ -1159,624 +208,118 @@ - - - - - + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1004.3622)"> - - - + id="layer4" + transform="matrix(-1,0,0,1,42.795509,824.67429)" /> - - + transform="matrix(-0.12117717,0,0,0.12117717,-34.53415,999.3476)" /> + id="layer6-08" + transform="matrix(-0.12117717,0,0,0.12117717,3.2203353,1063.9168)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.42564105;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect4547" + width="4.0000005" + height="38" + x="-35" + y="6" /> - - - - - - - - - - - - - - - - - - - - - + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m -25,9 0,3 -3,0 0,2 3,0 0,3 2.042969,0 0,-3 2.957031,0 0,-2 -2.957031,0 0,-3 L -25,9 Z" + id="path4549" /> + + + + + diff --git a/src/usr/share/icons/Lubuntu/devices/64/battery.svg b/src/usr/share/icons/Lubuntu/devices/64/battery.svg new file mode 100644 index 0000000..b8074ca --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/battery.svg @@ -0,0 +1,521 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/usr/share/icons/Lubuntu/devices/64/gnome-dev-battery.svg b/src/usr/share/icons/Lubuntu/devices/64/gnome-dev-battery.svg new file mode 120000 index 0000000..a400f38 --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/gnome-dev-battery.svg @@ -0,0 +1 @@ +battery.svg \ No newline at end of file diff --git a/src/usr/share/icons/Lubuntu/devices/64/gnome-power-manager.svg b/src/usr/share/icons/Lubuntu/devices/64/gnome-power-manager.svg new file mode 120000 index 0000000..a400f38 --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/gnome-power-manager.svg @@ -0,0 +1 @@ +battery.svg \ No newline at end of file diff --git a/src/usr/share/icons/Lubuntu/devices/64/preferences-system-power-management.svg b/src/usr/share/icons/Lubuntu/devices/64/preferences-system-power-management.svg new file mode 120000 index 0000000..a400f38 --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/preferences-system-power-management.svg @@ -0,0 +1 @@ +battery.svg \ No newline at end of file diff --git a/src/usr/share/icons/Lubuntu/devices/64/xfce4-power-manager-settings.svg b/src/usr/share/icons/Lubuntu/devices/64/xfce4-power-manager-settings.svg new file mode 120000 index 0000000..a400f38 --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/xfce4-power-manager-settings.svg @@ -0,0 +1 @@ +battery.svg \ No newline at end of file diff --git a/src/usr/share/icons/Lubuntu/devices/64/xfpm-ac-adapter.svg b/src/usr/share/icons/Lubuntu/devices/64/xfpm-ac-adapter.svg new file mode 120000 index 0000000..a400f38 --- /dev/null +++ b/src/usr/share/icons/Lubuntu/devices/64/xfpm-ac-adapter.svg @@ -0,0 +1 @@ +battery.svg \ No newline at end of file diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc b/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc deleted file mode 100644 index 1c69c1a..0000000 --- a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc +++ /dev/null @@ -1,204 +0,0 @@ -style "nautilus-window-base" -{ - bg[NORMAL] = @base_color -} - -style "nautilus-sidebar" = "sidebar" -{ - GtkTreeView::horizontal_separator = 15 - GtkTreeView::vertical_separator = 2 -} - -style "nautilus-sidebar-other" = "nautilus-sidebar" -{ - xthickness = 0 - bg[NORMAL] = @sidebar_color -} - -style "nautilus-view" -{ - xthickness = 0 - ythickness = 0 -} - -style "nautilus-handle" -{ - GtkPaned::handle-size = 2 - - engine "pixmap" - { - image # for the thin gray line separating the sidepane and viewpane - { - function = HANDLE - recolorable = TRUE - file = "/Sidebar/handle.png" - stretch = TRUE - border = { 0, 0, 0, 0 } - } - } -} - -style "nautilus-extra-view" -{ - - xthickness = 0 - ythickness = 0 - - bg_pixmap[NORMAL] = "/nautilus/extra-widget.png" - -} - -style "nautilus-statusbar" -{ - xthickness = 4 - - bg[NORMAL] = @base_color - bg[PRELIGHT] = shade (1.16, mix (0.1, @bg_color, @selected_bg_color)) - bg[SELECTED] = @fg_color - - base[SELECTED] = shade (0.8, @selected_bg_color) - - fg[NORMAL] = mix (0.4, @base_color, @text_color) - fg[PRELIGHT] = mix (0.4, @base_color, @text_color) - fg[SELECTED] = mix (0.4, @base_color, @text_color) - fg[ACTIVE] = mix (0.4, @base_color, @text_color) - fg[INSENSITIVE] = mix (0.4, @base_color, @text_color) - - engine "pixmap" - { - - image - { - function = RESIZE_GRIP - recolorable = TRUE - detail = "statusbar" - overlay_file = "/nautilus/resize_grip.png" - overlay_border = {0,0,0,0 } - overlay_stretch = FALSE - } - } -} - -style "nautilus-notebook" -{ - xthickness = 0 - ythickness = 0 -} - -style "nautilus-scale" -{ - ythickness = 0 - - GtkRange ::trough-border = 0 - GtkScale ::trough-side-details = 0 - - engine "pixmap" - { - image - { - function = BOX - detail = "trough" - file = "/Range/trough.png" - border = { 10, 10, 5, 15 } - } - image - { - function = SLIDER - overlay_file = "/Range/slider.png" - overlay_stretch = FALSE - } - } -} - - -style "nautilus-mode-button" -{ - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "/nautilus/mode_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "/nautilus/mode_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "/nautilus/mode_pressed.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = INSENSITIVE - file = "/nautilus/mode_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "/nautilus/mode_pressed.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - } - -} - -style "nautilus-right-slider" -{ - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image { - function = BOX - file = "/nautilus/right_slider_normal.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -widget "*NautilusNavigationWindow" style "nautilus-window-base" -widget "*Nautilus*Splitter" style "nautilus-handle" -widget_class "*Nautilus*View*" style "nautilus-view" -widget_class "*Nautilus*NautilusSidePane*" style "nautilus-sidebar" -widget_class "*Nautilus*Statusbar*" style "nautilus-statusbar" -widget_class "*Nautilus*Scale*" style "nautilus-scale" - -widget_class "*Nautilus*Notebook" style "nautilus-notebook" - -widget "*GtkModeButton*" style "nautilus-mode-button" - -widget "*.nautilus-extra-view-widget" style : highest "nautilus-extra-view" - -widget_class "*NautilusPathBar.*ToggleButton*" style "nautilus-breadcrumbs" -widget "Nautilus*left_slider*" style "nautilus-left-slider" -widget "Nautilus*right_slider*" style "nautilus-right-slider" - diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc b/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc index d369138..d809d62 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc +++ b/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc @@ -37,20 +37,20 @@ style "thunar-handle" { } } -#style "thunar-statusbar" { -# bg[NORMAL] = @base_color -# -# engine "pixmap" { -# image { -# function = RESIZE_GRIP -# recolorable = FALSE -# detail = "statusbar" -# overlay_file = "/images/null.png" -# overlay_border = {0,0,0,0 } -# overlay_stretch = FALSE -# } -# } -#} +style "thunar-statusbar" { + bg[NORMAL] = @base_color + + engine "pixmap" { + image { + function = RESIZE_GRIP + recolorable = FALSE + detail = "statusbar" + overlay_file = "/images/null.png" + overlay_border = {0,0,0,0 } + overlay_stretch = FALSE + } + } +} style "thunar-location" { ThunarLocationButtons::spacing = 0 @@ -67,4 +67,4 @@ widget_class "*ThunarLocationButtons*" style "thunar-location" widget_class "*ThunarShortcutsView*" style "thunar-sidepane" widget_class "*ThunarTreeView*" style "thunar-sidepane" widget_class "*ThunarWindow*." style "thunar-handle" -#widget_class "*ThunarStatusbar*" style "thunar-statusbar" +widget_class "*ThunarStatusbar*" style "thunar-statusbar" diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css index f4dcf6c..8c52090 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css @@ -1,3 +1,12 @@ + +BaobabWindow GtkGrid { + background-color: @bg_color; +} + +BaobabLocationList GtkGrid { + background-color: transparent; +} + .baobab-toolbar.toolbar { border-color: shade (@bg_color, 0.9); border-style: solid; diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css index 6f11618..6f9722b 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css @@ -14,7 +14,6 @@ GeditDocumentsPanel .view:backdrop { } GeditWindow .notebook { - padding: 1px; border-radius: 1px; } @@ -28,7 +27,7 @@ GeditWindow .notebook tab { } GeditViewFrame .gedit-search-slider { - background-color: @theme_base_color; + background-color: @base_color; padding: 6px; border-color: shade (@notebook_tab_gradient_b, 0.80); border-radius: 0 0 3px 3px; @@ -43,12 +42,12 @@ GeditViewFrame .gedit-search-slider .not-found { } GeditViewFrame .gedit-search-slider .not-found:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; + background-color: @selected_bg_color; + color: @selected_fg_color; } GeditFileBrowserWidget .toolbar { - background-color: @theme_bg_color; + background-color: @bg_color; border: none; padding-bottom: 3px; } @@ -59,3 +58,113 @@ GeditFileBrowserWidget .toolbar { margin: 2px; padding: 2px; } + + +/* Things from Adwaita start here...*/ + +GeditOpenDocumentSelector .open-document-selector-treeview:prelight { + background-color: alpha(@selected_bg_color, 0.4); +} + +/* Only normal state is handle */ +.open-document-selector-path-label { + color: @backdrop_text_color; + font-size: smaller; +} + +.gedit-document-panel-group-row, +.gedit-document-panel-group-row:hover { + border-top: 1px solid shade(@bg_color, 0.90); + background-color: shade(@bg_color,0.95); +} + +.gedit-document-panel-document-row:hover { + background-color: shade(@bg_color,1.1); +} + + +.gedit-document-panel-document-row:selected, +.gedit-document-panel-document-row:selected:hover { + background-color: @selected_bg_color; +} + +/* sidepane close button styling (copied from the gtk tab close button) */ +.gedit-document-panel .list-row .button { + color: transparent; + border-image: none; + background-image: none; + background-color: transparent; + border-radius: 3px; + border-style: solid; + border-color: transparent; + border-width: 1px; + padding: 1px; + icon-shadow: none; +} + +.gedit-document-panel .prelight-row .button { + color: black; + border-color: transparent; +} + +.gedit-document-panel .prelight-row:selected .button { + color: white; +} + +.gedit-document-panel .prelight-row .button:backdrop { + color: black; +} + +.gedit-document-panel-placeholder-row { + border: none; + background-color: mix(@bg_color, @selected_bg_color, 0.20); +} + +GeditStatusbar { + border-top: 1px solid @borders; +} + +GeditStatusbar .button.flat { + border-radius: 0; + border-bottom: none; +} + +.notebook GeditCloseButton.button GtkImage { + padding: 1px; +} + +.notebook GeditCloseButton.button { + background-color: transparent; + background-image: none; + border-image: none; + border-radius: 3px; +} + +.gedit-document-panel-document-row { + padding: 5px; +} + + +.notebook GeditCloseButton.button:prelight{ + border-color: shade(@bg_color,0.65); +} + +.notebook GeditTabLabel.active-page GeditCloseButton.button:prelight{ + border-color: darker(@bg_color); +} + +.notebook GeditCloseButton:backdrop.button:prelight{ + border-color: shade(@bg_color,0.75); + border-image: none; + border-style: solid; + background-color: transparent; +} + +.notebook GeditTabLabel.active-page GeditCloseButton:backdrop.button:prelight{ + border-color: shade(@bg_color,0.85); + border-image: none; + border-style: solid; + background-color: transparent; +} + + diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/glade.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/glade.css new file mode 100644 index 0000000..5cff553 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/glade.css @@ -0,0 +1,8 @@ + +GladeEditor GtkContainer { + background-color: @bg_color +} + +GladeWindow GtkGrid { + background-color: @bg_color +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css index 9ee2792..6cf1a00 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css @@ -1,7 +1,23 @@ /* gnome-terminal */ +@define-color terminal_bg #300a24; + TerminalScreen { -TerminalScreen-background-darkness: 0.95; - background-color: #300a24; + background-color: @terminal_bg; color: #fff; } +TerminalScreenContainer .scrollbar:hover:not(.slider), +TerminalScreenContainer .scrollbar.dragging:not(.slider) { + background-color: alpha(@scrollbar_track_color, 0.4); +} + +/* Since .hovering class is not working here, we always use the same radius */ +TerminalScreenContainer .scrollbar.slider.hovering, +TerminalScreenContainer .scrollbar.slider.dragging { + border-radius: 1px; +} + +TerminalScreenContainer .scrollbar { + background-color: transparent; +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css index c68ad20..4abe735 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css @@ -1,35 +1,28 @@ -@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95); - -NautilusWindow * { - -GtkPaned-handle-size: 1; +.nautilus-canvas-item { + border-radius: 5px; } -NautilusDesktopWindow GtkWidget { - background-color: @transparent; +.nautilus-canvas-item.dim-label, +.nautilus-list-dim-label { + color: mix (@theme_fg_color, @theme_bg_color, 0.50); } -.nautilus-canvas-item { - border-radius: 4px; +.nautilus-canvas-item.dim-label:selected, +.nautilus-list-dim-label:selected { + color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20); } -/* desktop mode */ .nautilus-desktop.nautilus-canvas-item { - color: @bg_color; - text-shadow: 1px 1px alpha (#000000, 0.8); + color: @theme_selected_fg_color; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { - background-image: none; - background-color: alpha (@bg_color, 0.84); - - color: @fg_color; + color: @theme_text_color; } .nautilus-desktop.nautilus-canvas-item:selected { - background-image: none; - background-color: alpha (@selected_bg_color, 0.84); - - color: @selected_fg_color; + color: @theme_selected_fg_color; } .nautilus-desktop.nautilus-canvas-item:active, @@ -38,124 +31,91 @@ NautilusDesktopWindow GtkWidget { text-shadow: none; } -/* browser window */ -NautilusTrashBar.info, -NautilusXContentBar.info, -NautilusSearchBar.info, -NautilusQueryEditor.info { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@cluebar_color, 1.02)), - to (shade (@cluebar_color, 0.98))); - background-color: @cluebar_color; - border-bottom-color: shade (@cluebar_color, 0.92); - border-radius: 0; - border-style: solid; - border-width: 0px 0px 1px 0px; +.nautilus-desktop.nautilus-canvas-item:selected:backdrop { + color: @theme_unfocused_selected_fg_color; +} - box-shadow: inset -1px 0px shade (@cluebar_color, 1.02), - inset 1px 0px shade (@cluebar_color, 1.02), - inset 0 1px shade (@cluebar_color, 1.04), - inset 0 -1px shade (@cluebar_color, 1.01); +.nautilus-circular-button { + border-radius: 20px; + outline-radius: 20px; } -NautilusTrashBar.info:backdrop, -NautilusXContentBar.info:backdrop, -NautilusSearchBar.info:backdrop, -NautilusQueryEditor.info:backdrop { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@cluebar_color, 1.01)), - to (shade (@cluebar_color, 0.99))); - background-color: @cluebar_color; - border-bottom-color: shade (@cluebar_color, 0.92); +/* Toolbar */ - box-shadow: inset -1px 0px shade (@cluebar_color, 1.01), - inset 1px 0px shade (@cluebar_color, 1.01), - inset 0 1px shade (@cluebar_color, 1.02), - inset 0 -1px shade (@cluebar_color, 1.0); +/* Here we use the .button background-image colors from Adwaita, but ligthen them, + * since is not possible to use lighten () in common css. */ +@keyframes needs_attention_keyframes { + 0% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0); border-color: @borders; } + /* can't do animation-direction, so holding the color on two keyframes */ + 30% {background-image: linear-gradient(to bottom, @theme_base_color); border-color: @theme_fg_color; } + 90% {background-image: linear-gradient(to bottom, @theme_base_color); border-color: @theme_fg_color; } + 100% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0); border-color: @borders; } } - -NautilusSearchBar .entry { +.nautilus-operations-button-needs-attention { + animation: needs_attention_keyframes 2s ease-in-out; } - -.nautilus-cluebar-label { - font: bold; - text-shadow: 0 1px shade (@cluebar_color, 1.06); +.nautilus-operations-button-needs-attention-multiple { + animation: needs_attention_keyframes 3s ease-in-out; + animation-iteration-count: 3; } -.nautilus-cluebar-label:backdrop { - color: mix (@fg_color, @cluebar_color, 0.2); - text-shadow: 0 1px shade (@cluebar_color, 1.02); +/* Floating status bar */ +.floating-bar { + padding: 2px; + background-color: @theme_base_color; + border-width: 1px; + border-style: solid solid none; + border-color: @borders; + border-radius: 3px 3px 0 0; } -#nautilus-search-button *:active, -#nautilus-search-button *:active:prelight { - color: @dark_fg_color; +.floating-bar.bottom.left { /* axes left border and border radius */ + border-left-style: none; + border-top-left-radius: 0; } - -NautilusFloatingBar { - background-color: @info_bg_color; - border-radius: 3px 3px 0 0; - border-style: solid; - border-width: 1px; - border-color: darker (@info_bg_color); +.floating-bar.bottom.right { /* axes right border and border radius */ + border-right-style: none; + border-top-right-radius: 0; } -NautilusFloatingBar .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; +.floating-bar:backdrop { + background-color: @theme_unfocused_base_color; + border-color: @unfocused_borders; } -NautilusWindow .header-bar .button { - padding: 9px; +.floating-bar .button { + padding: 4px; } -/* sidebar */ -NautilusWindow .sidebar, -NautilusWindow .sidebar .view { - background-color: shade (@bg_color, 0.95); - - /*background-color: @bg_color;*/ - - color: @fg_color; - text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); +.search-bar { + box-shadow: none; } -NautilusWindow .sidebar .frame { - border-width: 1px 0 0 0; - border-style: solid; - border-color: shade (@bg_color, 0.86); - border-radius: 0; -} +@define-color disk_space_unknown #888a85; +@define-color disk_space_used #729fcf; +@define-color disk_space_free #eeeeec; -NautilusWindow .sidebar:backdrop, -NautilusWindow .sidebar .view:backdrop { - color: mix (@fg_color, shade (@bg_color, 0.95), 0.2); - text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); +.disk-space-display { + border-style: solid; + border-width: 2px; } -NautilusWindow .sidebar row:selected { - color: @selected_fg_color; - text-shadow: 0 1px shade (@selected_bg_color, 0.8); +.disk-space-display.unknown { + background-color: @disk_space_unknown; + border-color: shade(@disk_space_unknown, 0.7); } -NautilusWindow .sidebar row:selected:backdrop { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (shade (@bg_color, 0.95), 0.94)), - to (shade (shade (@bg_color, 0.95), 0.86))); - border-top-color: shade (shade (@bg_color, 0.95), 0.88); - - color: @fg_color; - text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); +.disk-space-display.used { + background-color: @disk_space_used; + border-color: shade(@disk_space_used, 0.7); } -NautilusWindow .pane-separator { - background-color: shade (shade (@bg_color, 0.95), 0.94); - border-color: @dark_bg_color; - border-style: solid; - border-width: 0; - box-shadow: none; +.disk-space-display.free { + background-color: @disk_space_free; + border-color: shade(@disk_space_free, 0.7); } -NautilusWindow .pane-separator:backdrop { - background-color: shade (shade (@bg_color, 0.95), 0.96); +/* View */ +NautilusListView .view { + border-bottom: 1px solid @theme_bg_color; } diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/software-center.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/software-center.css new file mode 100644 index 0000000..5c9d6b8 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/software-center.css @@ -0,0 +1,3 @@ +.action-bar { + background-color: @bg_color; +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity-greeter.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity-greeter.css new file mode 100644 index 0000000..8bccc4b --- /dev/null +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity-greeter.css @@ -0,0 +1,94 @@ +.lightdm.menu { + background-image: none; + background-color: alpha (black, 0.6); + border-color: alpha (white, 0.2); + border-radius: 4px; + padding: 1px; + + color: white; +} + +.lightdm-combo .menu { + background-color: shade (@dark_bg_color, 1.08); + border-radius: 0px; + padding: 0px; + + color: white; +} + +.lightdm.menu .menuitem *, +.lightdm.menu .menuitem.check:active, +.lightdm.menu .menuitem.radio:active { + color: white; +} + +.lightdm.menubar { + background-image: none; + background-color: alpha (black, 0.5); +} + +.lightdm-combo.combobox-entry .button, +.lightdm-combo .cell, +.lightdm-combo .button, +.lightdm-combo .entry, +.lightdm.button, +.lightdm.entry { + background-image: none; + background-color: alpha (black, 0.3); + border-color: alpha (white, 0.6); + border-radius: 5px; + padding: 7px; + + color: white; + text-shadow: none; +} + +.lightdm.button, +.lightdm.button:hover, +.lightdm.button:active, +.lightdm.button:active:focused, +.lightdm.entry, +.lightdm.entry:hover, +.lightdm.entry:active, +.lightdm.entry:active:focused { + background-image: none; + border-image: none; +} + +.lightdm.button:focused, +.lightdm.entry:focused { + border-color: alpha (white, 0.9); + border-width: 1px; + border-style: solid; + + color: white; +} + +.lightdm.entry:selected { + background-color: alpha (white, 0.2); +} + +@keyframes dashentry_spinner { + to { -gtk-icon-transform: rotate(1turn); } +} + +.lightdm.entry:active { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + animation: dashentry_spinner 1s infinite linear; +} + +.lightdm.option-button { + padding: 2px; + background: none; + border: 0; +} + +.lightdm.toggle-button { + background: none; + border-width: 0; +} + +.lightdm.toggle-button.selected { + background-color: alpha (black, 0.3); + border-width: 1px; +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css index 2d99583..b0f484c 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css @@ -1,15 +1,15 @@ /* Decorations */ UnityDecoration { - -UnityDecoration-extents: 28px 1px 1px 1px; + -UnityDecoration-extents: 28px 0 0 0; -UnityDecoration-input-extents: 10px; -UnityDecoration-shadow-offset-x: 1px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.647); - -UnityDecoration-active-shadow-radius: 15px; - -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.647); - -UnityDecoration-inactive-shadow-radius: 10px; + -UnityDecoration-shadow-offset-y: 5px; + -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78); + -UnityDecoration-active-shadow-radius: 30px; + -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3); + -UnityDecoration-inactive-shadow-radius: 25px; -UnityDecoration-glow-size: 10px; -UnityDecoration-glow-color: rgb (221, 72, 20); @@ -20,13 +20,13 @@ UnityDecoration { } UnityDecoration.top { - border: 1px solid rgba (72, 72, 72, 0.3568); /* shade (@bg_color, 0.8) - shade (#ededed, 1.06) */ + border: 1px solid rgba (85, 40, 0, 0.04); /* shade (@dark_bg_color) (shade (#edebe6, 1.06) */ border-bottom-width: 0; - border-radius: 8px 8px 0 0; - padding: 1px 8px 0 8px; + border-radius: 6px 6px 0 0; + padding: 1px 6px 0 6px; box-shadow: inset 0 0 transparent, inset 0 0 transparent, - inset 0 1px shade (#ededed, 1.08), inset 0 0 transparent; + inset 0 1px shade (#edebe6, 1.065), inset 0 0 transparent; background-color: transparent; background-clip: border-box; @@ -35,20 +35,21 @@ UnityDecoration.top { to (@dark_bg_color)); color: shade (@dark_bg_color, 0.4); - text-shadow: 1px 0 1px shade (@dark_bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06), - 0 1px 1px shade (@dark_bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06); + text-shadow: 1px 0 shade (@dark_bg_color, 1.06), -1px 0 shade (@dark_bg_color, 1.06), + 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06); } UnityDecoration.top:backdrop { - border: 1px solid rgba (74, 74, 74, 0.2784); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 0.96) */ + border: 1px solid rgba (110, 27, 0, 0.04); /* shade @dark_bg_color - shade (#edebe6, 0.96) */ border-bottom-width: 0; background-color: transparent; background-clip: border-box; background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (#e0e0e0, 0.96)), + from (shade (#edebe6, 0.96)), to (@dark_bg_color)); box-shadow: inset 0 0 transparent, inset 0 0 transparent, - inset 0 1px shade (#edebe6, 0.98), inset 0 0 transparent; + inset 0 1px shade (#edebe6, 0.97), inset 0 0 transparent; + color: #a39e9a; text-shadow: 1px 0 1px shade (@dark_bg_color, 1.08), -1px 0 1px shade (@dark_bg_color, 1.08), 0 1px 1px shade (@dark_bg_color, 1.08), 0 -1px 1px shade (@dark_bg_color, 1.08); @@ -62,8 +63,8 @@ UnityDecoration.right { /* start color: mix of the top border color and bg-image gradient end */ background-image: -gtk-gradient (linear, left top, left bottom, - color-stop (0, #a8a8a8), - color-stop (0.5, #a8a8a8), + color-stop (0, #a89686), + color-stop (0.5, #a89686), color-stop (1, shade (@bg_color, 0.7))); } @@ -71,8 +72,8 @@ UnityDecoration.left:backdrop, UnityDecoration.right:backdrop { /* start color: mix of the top border color and bg-image gradient end */ background-image: -gtk-gradient (linear, left top, left bottom, - color-stop (0, #b5b5b5), - color-stop (0.5, #b5b5b5), + color-stop (0, #b5a395), + color-stop (0.5, #b5a395), color-stop (1, shade (@bg_color, 0.7))); } @@ -86,15 +87,20 @@ UnityDecoration.bottom { UnityPanelWidget, .unity-panel { background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (#e0e0e0, 1.06)), - to (@bg_color)); - border-top-color: shade (#ededed, 1.08); + from (shade (#edebe6, 1.06)), + to (@dark_bg_color)); + border-top-color: shade (#edebe6, 1.08); border-style: solid; border-width: 1px 0 0 0; - color: @dark_fg_color; - text-shadow: 1px 0 1px shade (@bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06), - 0 1px 1px shade (@bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06); + color: shade (@dark_bg_color, 0.4); + text-shadow: 1px 0 shade (@dark_bg_color, 1.06), -1px 0 shade (@dark_bg_color, 1.06), + 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06); +} + +UnityPanelWidget:backdrop, +.unity-panel:backdrop { + color: #a39e9a; } .unity-panel.menubar, @@ -109,9 +115,17 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { - background-image: linear-gradient(to bottom, - shade (@selected_bg_color, 0.96), - shade (@selected_bg_color, 1.15)); - color: @selected_fg_color; + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 1.5)), + to (shade (@dark_bg_color, 1.02))); } +@keyframes playbackmenuitem_spinner { + to { -gtk-icon-transform: rotate(1turn); } +} + +.menu IdoPlaybackMenuItem.menuitem:active { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + animation: playbackmenuitem_spinner 1s infinite linear; + color: @selected_bg_color; +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/menubaritem.png b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/menubaritem.png deleted file mode 100644 index c96711a..0000000 Binary files a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/menubaritem.png and /dev/null differ diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png deleted file mode 100644 index 10cc80f..0000000 Binary files a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png and /dev/null differ diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css index 51a8b7a..a3116a6 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css @@ -144,7 +144,7 @@ *************************/ .scale.trough.highlight { - background-color: @progress_color; + background-color: #ff0000; background-image: none; background-clip: content-box; } diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css index 6395e24..0a58a05 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css @@ -1,5 +1,5 @@ /*default color scheme */ -@define-color bg_color #f2f1f0; +@define-color bg_color #f1f1f1; @define-color fg_color #4c4c4c; @define-color base_color #ffffff; @define-color text_color #333333; @@ -63,12 +63,15 @@ @import url("gtk-widgets-radiance.css"); @import url("apps/geary.css"); @import url("apps/unity.css"); +@import url("apps/unity-greeter.css"); @import url("apps/baobab.css"); @import url("apps/gedit.css"); @import url("apps/nautilus.css"); @import url("apps/gnome-panel.css"); @import url("apps/gnome-terminal.css"); @import url("apps/gnome-system-log.css"); +@import url("apps/glade.css"); +@import url("apps/software-center.css"); @import url("public-colors.css"); @import url("gtk-lubuntu.css"); diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css index 628d024..bf92be4 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css @@ -106,7 +106,8 @@ .primary-toolbar .toolbar, .primary-toolbar.toolbar, .menubar.toolbar, -.header-bar { +.header-bar, +.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.96)), to (shade (@dark_bg_color, 1.1))); diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css index f080ef0..a3bc064 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css @@ -286,6 +286,13 @@ GtkAssistant .sidebar { box-shadow: none; } +/* Make linked dialog buttons look like they are not linked */ +.message-dialog .linked.dialog-action-area .button { + border-image-width: 12px; + box-shadow: none; + border-radius: 7px; +} + /**************** * cell and row * ****************/ @@ -445,6 +452,10 @@ GdMainIconView.content-view { color: @text_color; } +.entry.flat, .entry.flat:focus { + padding: 2px; +} + .entry:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (shade (@base_color, 0.96), @bg_color, 0.5)), @@ -486,6 +497,15 @@ GdMainIconView.content-view { color: @selected_fg_color; } +/* Application notification */ +.app-notification, +.app-notification.frame { + padding: 3px; + border-width: 0 1px 1px; + border-style: solid; + background-color: @bg_color; +} + /************ * expander * ************/ @@ -1164,12 +1184,17 @@ GtkScale.mark { -GtkScrollbar-min-slider-length: 31; -GtkRange-slider-width: 10; + background-color: @scrollbar_track_color; background-image: none; background-size: 0; border: none; border-radius: 0; } +.scrollbar.overlay-indicator { + background-color: transparent; +} + .scrollbar:hover, .scrollbar.dragging { background-color: @scrollbar_track_color; @@ -1364,6 +1389,11 @@ GtkPlacesSidebar.sidebar row:selected:backdrop { text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); } +GtkPlacesSidebar.sidebar .sidebar-icon { + padding-left: 10px; + padding-right: 10px; +} + /************** * spinbutton * **************/ @@ -1567,6 +1597,10 @@ GtkTextView { border: none; } +.maximized .titlebar.header-bar.toolbar-mode { + box-shadow: none; +} + .titlebar.header-bar .button.titlebutton { background-clip: padding-box; border: 1px solid #d0c7bf; @@ -1628,7 +1662,8 @@ GtkTextView { * primary-toolbar * *******************/ .primary-toolbar, -.header-bar { +.header-bar, +.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) { -GtkWidget-window-dragging: true; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1646,6 +1681,10 @@ GtkTextView { box-shadow: inset 0 1px shade (@dark_bg_color, 0.94); } +.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) { + border-width: 0; +} + .primary-toolbar:backdrop, .header-bar:backdrop { background-image: none; @@ -2042,11 +2081,6 @@ GtkViewport.frame { icon-shadow: none; } -.osd .scale { - margin-left: 9px; - margin-right: 9px; -} - /************* * overshoot * *************/