Commit 02b45381 authored by Ruben Rodriguez's avatar Ruben Rodriguez

7.0/trisquel-gtk-theme:

Applied changes from #12123
Fixed menu text-shadows
Tuned up theme
Fixed borders in gnome panel buttons
Updated to last Zukitwo upstream version
parent d9c37d05
......@@ -49,12 +49,13 @@ style "murrine-default" {
GtkImage ::x-ayatana-indicator-dynamic = 1
GtkScrollbar ::has-backward-stepper = 0
GtkScrollbar ::has-forward-stepper = 0
GtkScrollbar ::min-slider-length = 15
GtkScrollbar ::slider-width = 13
GtkScrollbar ::trough-border = 0
GtkScrollbar ::activate-slider = 1
GtkScrollbar::activate-slider = 1
GtkScrollbar::has-backward-stepper = 0
GtkScrollbar::has-forward-stepper = 0
GtkScrollbar::min-slider-length = 42
GtkScrollbar::slider_width = 13
GtkScrolledWindow::scrollbar-spacing = 0
GtkScrolledWindow::scrollbars-within-bevel = 1
GtkScrolledWindow ::scrollbar-spacing = 0
GtkScrolledWindow ::scrollbars-within-bevel = 1
......@@ -493,19 +494,119 @@ style "pixmap-scale" {
}
}
style "murrine-scrollbar" {
bg[NORMAL] = shade (0.90, @bg_color)
bg[SELECTED] = shade (0.6, @base_color)
bg[ACTIVE] = shade (0.8, @bg_color)
bg[PRELIGHT] = shade (0.8, @bg_color)
engine "murrine" {
roundness = 8
border_shades = {0.80, 0.80}
contrast = 0.0
}
style "scrollbar"
{
engine "pixmap"
{
image
{
function = BOX
detail = "trough"
file = "Scrollbars/trough-scrollbar-horiz.png"
border = { 19, 19, 4, 4 }
stretch = TRUE
orientation = HORIZONTAL
}
image
{
function = BOX
detail = "trough"
file = "Scrollbars/trough-scrollbar-vert.png"
border = { 4, 4, 19, 19 }
stretch = TRUE
orientation = VERTICAL
}
# Sliders
image
{
function = SLIDER
state = NORMAL
file = "Scrollbars/slider-horiz.png"
border = { 7, 7, 5, 5 }
stretch = TRUE
orientation = HORIZONTAL
}
image
{
function = SLIDER
state = ACTIVE
file = "Scrollbars/slider-horiz-active.png"
border = { 7, 7, 5, 5 }
stretch = TRUE
orientation = HORIZONTAL
}
image
{
function = SLIDER
state = PRELIGHT
file = "Scrollbars/slider-horiz-prelight.png"
border = { 7, 7, 5, 5 }
stretch = TRUE
orientation = HORIZONTAL
}
image
{
function = SLIDER
state = INSENSITIVE
file = "Scrollbars/slider-horiz-insens.png"
border = { 7, 7, 5, 5 }
stretch = TRUE
orientation = HORIZONTAL
}
# X Verticals
image
{
function = SLIDER
state = NORMAL
file = "Scrollbars/slider-vert.png"
border = { 5, 5, 7, 7 }
stretch = TRUE
orientation = VERTICAL
}
image
{
function = SLIDER
state = ACTIVE
file = "Scrollbars/slider-vert-active.png"
border = { 5, 5, 7, 7 }
stretch = TRUE
orientation = VERTICAL
}
image
{
function = SLIDER
state = PRELIGHT
file = "Scrollbars/slider-vert-prelight.png"
border = { 5, 5, 7, 7 }
stretch = TRUE
orientation = VERTICAL
}
image
{
function = SLIDER
state = INSENSITIVE
file = "Scrollbars/slider-vert-insens.png"
border = { 5, 5, 7, 7 }
stretch = TRUE
orientation = VERTICAL
}
}
}
style "murrine-sidebar" {
xthickness = 0
ythickness = 0
......@@ -591,9 +692,9 @@ class "GtkScale" style "pixmap-scale"
class "GtkVScale" style "pixmap-scale"
class "GtkHScale" style "pixmap-scale"
class "GtkScrollbar" style "murrine-scrollbar"
class "GtkVScrollbar" style "murrine-scrollbar"
class "GtkHScrollbar" style "murrine-scrollbar"
class "GtkScrollbar" style "scrollbar"
class "GtkVScrollbar" style "scrollbar"
class "GtkHScrollbar" style "scrollbar"
widget "*ToggleSwitch*" style "murrine-toggleswitch"
......
......@@ -93,7 +93,7 @@
* Fallback Mode *
*****************/
@define-color os_chrome_bg_color black;
@define-color os_chrome_fg_color #ccc;
@define-color os_chrome_fg_color #eee;
@define-color os_chrome_selected_bg_color #333;
@define-color os_chrome_selected_fg_color white;
......
......@@ -1762,159 +1762,172 @@ GtkComboBox .button:hover {
**************/
.scrollbar {
background-image: none;
border-style: solid;
-GtkRange-trough-border: 0;
-GtkScrollbar-has-backward-stepper: false;
-GtkScrollbar-has-forward-stepper: false;
-GtkRange-slider-width: 13;
-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-GtkRange-stepper-spacing: 0;
-GtkRange-trough-under-steppers: 1;
}
.scrollbars-junction { /* the small square between scrollbars!!! */
background-image: none;
background-color: @theme_bg_color;
border-width: 0;
border-radius: 0;
border-image: none;
}
background-image: none;
border-style: solid;
-GtkRange-trough-border: 0;
-GtkScrollbar-has-backward-stepper: false;
-GtkScrollbar-has-forward-stepper: false;
-GtkRange-slider-width: 13;
-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
.scrollbar.trough,
.scrollbar.trough.vertical {
background-image: linear-gradient(to right,
@scrollbar_trough,
shade (@scrollbar_trough, 1.08));
border-left-width: 1px;
border-style: solid;
border-color: shade (@theme_bg_color, 0.94);
border-radius: 0;
border-image: none;
-GtkRange-stepper-spacing: 0;
-GtkRange-trough-under-steppers: 1;
}
.scrollbar.trough.horizontal {
background-image: linear-gradient(to bottom,
@scrollbar_trough,
shade (@scrollbar_trough, 1.08));
border-top-width: 1px;
border-style: solid;
border-color: shade (@theme_bg_color, 0.94);
border-radius: 0;
border-image: none;
.scrollbars-junction, /* the small square between scrollbars!!! */
.scrollbar.trough {
background-image: none;
background-color: @scrollbar_trough;
border-width: 0;
border-radius: 0;
border-image: none;
}
.scrollbar.button,
.scrollbar.button:active,
.scrollbar.button:active:hover,
.scrollbar.button:insensitive {
border-style: none;
border-image: none;
border-radius: 0;
background-image: none;
background-color: transparent;
.scrollbar.button:insensitive,
.scrollbar.button:hover:backdrop,
.scrollbar.button:active:hover:backdrop {
border-style: none;
border-image: none;
border-radius: 0;
background-image: none;
background-color: transparent;
}
.scrollbar.button:active,
.scrollbar.button:active:hover {
background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
background-color: mix(@scrollbar_slider, @scrollbar_trough, 0.8);
}
.scrollbar.button.top:hover {
box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
}
.scrollbar.button.bottom:hover {
box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
}
.scrollbar.button.right:hover {
box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
}
.scrollbar.button.left:hover {
box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
}
.scrollbar.button.top:hover:backdrop,
.scrollbar.button.bottom:hover:backdrop,
.scrollbar.button.right:hover:backdrop,
.scrollbar.button.left:hover:backdrop {
box-shadow: none;
}
.scrollbar.button {
color: @theme_fg_color;
color: @scrollbar_slider;
}
.scrollbar.button:hover {
color: @theme_fg_color;
color: @scrollbar_slider_prelight;
}
.scrollbar.button:insensitive {
color: @insensitive_fg_color;
color: mix(@scrollbar_slider, @scrollbar_trough, 0.6);
}
.scrollbar.button:active {
color: @theme_fg_color;
color: @scrollbar_slider_active;
}
.scrollbar.slider.vertical {
background-image: linear-gradient(to right,
shade(@scrollbar_slider, 0.95),
shade(@scrollbar_slider, 0.8));
border-radius: 20px;
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.65);
border-width: 1px;
.scrollbar.button:backdrop {
color: @scrollbar_slider_unfocused;
}
.scrollbar.slider.vertical:hover,
.scrollbar.slider.vertical:hover:active {
background-image: linear-gradient(to right,
shade(@scrollbar_slider, 0.85),
shade(@scrollbar_slider, 0.7));
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.65);
border-width: 1px;
.scrollbar.button:insensitive:backdrop {
color: mix(@scrollbar_slider_unfocused, @scrollbar_trough_unfocused, 0.7);
}
.scrollbar.slider.horizontal {
background-image: linear-gradient(to bottom,
shade(@scrollbar_slider, 0.95),
shade(@scrollbar_slider, 0.8));
border-radius: 20px;
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.65);
border-width: 1px;
.scrollbar.trough:insensitive {
background-color: @scrollbar_trough_insensitive;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider.horizontal:hover,
.scrollbar.slider.horizontal:hover:active {
background-image: linear-gradient(to bottom,
shade(@scrollbar_slider, 0.85),
shade(@scrollbar_slider, 0.7));
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.65);
border-width: 1px;
.scrollbars-junction:backdrop,
.scrollbar.trough:backdrop {
background-image: none;
background-color: @scrollbar_trough_unfocused;
border-width: 0;
border-radius: 0;
border-image: none;
}
.scrollbar.trough:insensitive:backdrop {
background-image: none;
background-color: mix(@scrollbar_trough_unfocused, @scrollbar_trough_insensitive, 0.5);
border-width: 0;
border-radius: 0;
border-image: none;
}
.scrollbar.slider {
background-image: none;
background-color: #999;
border-radius: 20px;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider:hover {
transition: 1000ms linear; /* doesn't work */
background-image: none;
background-color: @scrollbar_slider_prelight;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider:prelight:active {
background-image: none;
background-color: @scrollbar_slider_active;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider:insensitive {
background-color: shade(@scrollbar_slider, 0.85);
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.75);
border-width: 1px;
background-color: @scrollbar_slider_insensitive;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider.fine-tune:prelight:active {
background-image: linear-gradient(to right,
shade(@scrollbar_slider, 0.85),
shade(@scrollbar_slider, 0.7));
border-style: solid;
border-image: none;
border-color: shade(@scrollbar_slider, 0.65);
border-width: 1px;
.scrollbar.slider:backdrop {
background-color: @scrollbar_slider_unfocused;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 3px;
}
.scrollbar.slider.fine-tune:prelight:active {
background-image: none;
border-style: solid;
border-image: none;
border-color: transparent;
border-width: 5px;
}
/*********
* Menus *
*********/
......@@ -1951,6 +1964,7 @@ GtkTreeMenu .menuitem,
border: 1px solid @borders;
}
.menu.button {
background-image: none;
background-color: @theme_base_color;
......@@ -1982,10 +1996,9 @@ GtkTreeMenu .menuitem,
background-image: linear-gradient(to bottom,
@theme_bg_color,
shade (@theme_bg_color, 0.96));
border-width: 0 0 1px 0;
border-width: 0;
border-style: solid;
border-color: alpha (@theme_base_color, 0.2);
box-shadow: inset 0 -1px shade(@theme_bg_color, 0.92);
-GtkWidget-window-dragging: true;
}
......@@ -1995,12 +2008,16 @@ GtkTreeMenu .menuitem,
text-shadow: 0 1px @button_text_shadow;
}
.menubar .menuitem:hover {
.menubar .menuitem:hover
{
background-image: linear-gradient(to bottom,
shade (@theme_bg_color, 1.0),
shade (@theme_bg_color, 0.82));
text-shadow: 0px 1px alpha (#000, 0.3);
}
.menubar .menuitem:hover {
color: @menu_fg_color;
}
......@@ -2008,6 +2025,8 @@ GtkTreeMenu .menuitem,
.menu .menuitem {
-GtkMenuItem-arrow-scaling: 0.4;
padding: 4px;
text-shadow: none;
}
.menu .menuitem:hover {
......@@ -2020,7 +2039,6 @@ GtkTreeMenu .menuitem,
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 1.0),
shade (@theme_selected_bg_color, 0.85));
text-shadow: none;
border: none;
}
......@@ -3562,6 +3580,51 @@ GtkBubbleWindow .toolbar {
* Fallback Mode Panel
**********************/
PanelToplevel .menu , PanelApplet .menu,
PanelToplevel .menu .menuitem, PanelApplet .menu .menuitem,
PanelToplevel .menu GtkArrow, PanelApplet .menu GtkArrow,
PanelApplet .menu GtkCalendar, PanelApplet .menu GtkCalendar GtkWidget
{
background-color: #333;
border-color: #333;
color:#eee;
text-shadow: 0px 1px alpha (#000, 0.5);
}
PanelToplevel .menu .separator,
PanelApplet .menu .separator
{
color:#444;
}
.menuitem GtkCalendar,
.menuitem GtkCalendar.button,
.menuitem GtkCalendar.header,
.menuitem GtkCalendar.view {
background-color: @dark_bg_color;
background-image: none;
border-radius: 0;
border-style: solid;
border-width: 0;
padding: 0;
color: @dark_fg_color;
}
.menuitem GtkCalendar {
background-color: shade (@dark_bg_color, 1.3);
background-image: none;
}
.menuitem GtkCalendar:inconsistent {
color: shade (@bg_color, 0.6);
}
.gnome-panel-menu-bar,
PanelApplet > GtkMenuBar.menubar,
PanelToplevel,
......@@ -3575,20 +3638,36 @@ background-image: -gtk-gradient (linear, left top, left bottom,
-unico-inner-stroke-width: 0;
-unico-outer-stroke-width: 0;
color: white;
text-shadow: none;
text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.4);
}
ClockBox,
.gnome-panel-menu-bar.menubar,
PanelApplet > GtkMenuBar.menubar {
/* Clock */
PanelApplet > GtkMenuBar {
font: bold;
}
.gnome-panel-menu-bar.menubar .menuitem:hover,
PanelApplet > GtkMenuBar.menubar .menuitem:hover {
text-shadow: 0 1px @os_chrome_bg_color;
.gnome-panel-menu-bar {
-PanelMenuBar-icon-visible: true;
}
PanelApplet .menubar .menuitem:hover
{
text-shadow: 0px 1px alpha (#000, 0.3);
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 1.0),
shade (@theme_selected_bg_color, 0.85));
}
.gnome-panel-menu-bar.menubar .menuitem.check:active,