summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-03-01 13:56:20 -0500
committerlukefromdc <[email protected]>2016-03-01 13:56:20 -0500
commit35269bd27a2878cfa4122269c96e3a6c2b865229 (patch)
tree437a0210bb48ff1575b8d5b7c6c8eeb5899de21d
parent708a8ce78ea0a2a6b2ba269639f40c5aa495bec1 (diff)
parent02c8b9952ec6a429d682eace158c04aa60d2c26c (diff)
downloadmate-themes-35269bd27a2878cfa4122269c96e3a6c2b865229.tar.bz2
mate-themes-35269bd27a2878cfa4122269c96e3a6c2b865229.tar.xz
Merge pull request #11 from mate-desktop/master
Merge mate-desktop/master
-rw-r--r--desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css205
-rw-r--r--desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css229
2 files changed, 242 insertions, 192 deletions
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 0bc92379..056dd8fd 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -801,28 +801,36 @@ toolbar.horizontal button.text-button.toggle {
}
.path-bar button,
+.linked.path-bar button,
.path-bar button image,
.path-bar button label {
- padding: 2px;
+ padding: 4px 2px;
}
.path-bar button {
border-width: 1px 0px 1px 1px;
}
-.path-bar button:hover:active {
- border-left-width: 1px;
+.linked.path-bar button.toggle,
+.linked.path-bar button.toggle:checked:hover, /* this is really weird */
+.linked.path-bar button.image-button,
+.linked.path-bar button.toggle.image-button,
+.linked.path-bar button.toggle.text-button {
+ border-width: 1px 1px 1px 0px;
}
-.path-bar button:first-child,
-.path-bar button:first-child:hover:active {
- border-right-width: 0px;
+.linked.path-bar button.toggle:first-child,
+.linked.path-bar button.image-button:first-child,
+.linked.path-bar button.toggle.image-button:first-child,
+.linked.path-bar button.toggle.text-button:first-child {
+ border-width: 1px 1px 1px 1px;
}
-.path-bar button:only-child,
-.path-bar button:only-child:hover:active {
- border-radius: 3px;
- border-right-width: 1px;
+.linked.path-bar button.toggle:last-child,
+.linked.path-bar button.image-button:last-child,
+.linked.path-bar button.toggle.image-button:last-child,
+.linked.path-bar button.toggle.text-button:last-child {
+ border-width: 1px 1px 1px 0px;
}
.linked.raised button:first-child,
@@ -1424,9 +1432,9 @@ notebook header tab {
}
notebook header.top tab {
- padding: 7px 2px 0 2px;
- border-width: 0px 1px 1px 1px;
- border-radius: 3px 3px 0px 0px;;
+ padding: 7px 28px 0 28px;
+ border-width: 0px 0px 1px 0px;
+ border-radius: 0px;
background-image: linear-gradient(to bottom,
@notebook_tab_gradient_a,
@notebook_tab_gradient_b 50%,
@@ -1434,40 +1442,8 @@ notebook header.top tab {
@notebook_tab_gradient_d);
}
-notebook header.right tab {
- padding: 2px 7px 2px 0;
- border-width: 1px 0px 1px 1px;
- border-radius: 0px 3px 3px 0px;;
- background-image: linear-gradient(to left,
- @notebook_tab_gradient_a,
- @notebook_tab_gradient_b 50%,
- @notebook_tab_gradient_c 50%,
- @notebook_tab_gradient_d);
-}
-
-notebook header.bottom tab {
- padding: 0px 2px 7px 2px;
- border-width: 1px 1px 0px 1px;
- border-radius: 0px 0px 3px 3px;;
- background-image: linear-gradient(to top,
- @notebook_tab_gradient_a,
- @notebook_tab_gradient_b 50%,
- @notebook_tab_gradient_c 50%,
- @notebook_tab_gradient_d);
-}
-
-notebook header.left tab {
- padding: 2px 0 2px 7px;
- border-width: 1px 1px 1px 0px;
- border-radius: 3px 0px 0px 3px;;
- background-image: linear-gradient(to right,
- @notebook_tab_gradient_a,
- @notebook_tab_gradient_b 50%,
- @notebook_tab_gradient_c 50%,
- @notebook_tab_gradient_d);
-}
-
notebook header.top tab:active {
+ border-radius: 3px 3px 0px 0px;
border-width: 0px 1px 0px 1px;
border-top-color: @notebook_active_tab_border;
background-image: linear-gradient(to bottom,
@@ -1478,6 +1454,25 @@ notebook header.top tab:active {
@notebook_active_tab_gradient_b);
}
+notebook header.top tab:active:first-child {
+ border-width: 0px 1px 0px 0px;
+}
+
+notebook header.top tab:active:last-child {
+ border-width: 0px 0px 0px 1px;
+}
+
+notebook header.right tab {
+ padding: 2px 7px 2px 0;
+ border-width: 0px 0px 0px 1px;
+ border-radius: 0px;
+ background-image: linear-gradient(to left,
+ @notebook_tab_gradient_a,
+ @notebook_tab_gradient_b 50%,
+ @notebook_tab_gradient_c 50%,
+ @notebook_tab_gradient_d);
+}
+
notebook header.right tab:active {
border-width: 1px 0px 1px 0px;
border-right-color: @notebook_active_tab_border;
@@ -1489,6 +1484,25 @@ notebook header.right tab:active {
@notebook_active_tab_gradient_b);
}
+notebook header.right tab:active:first-child {
+ border-width: 0px 0px 1px 0px;
+}
+
+notebook header.right tab:active:last-child {
+ border-width: 1px 0px 0px 0px;
+}
+
+notebook header.bottom tab {
+ padding: 0px 28px 7px 28px;
+ border-width: 1px 0px 0px 0px;
+ border-radius: 0px;
+ background-image: linear-gradient(to top,
+ @notebook_tab_gradient_a,
+ @notebook_tab_gradient_b 50%,
+ @notebook_tab_gradient_c 50%,
+ @notebook_tab_gradient_d);
+}
+
notebook header.bottom tab:active {
border-width: 0px 1px 0px 1px;
border-bottom-color: @notebook_active_tab_border;
@@ -1500,6 +1514,25 @@ notebook header.bottom tab:active {
@notebook_active_tab_gradient_b);
}
+notebook header.bottom tab:active:first-child {
+ border-width: 0px 1px 0px 0px;
+}
+
+notebook header.bottom tab:active:last-child {
+ border-width: 0px 0px 0px 1px;
+}
+
+notebook header.left tab {
+ padding: 2px 0 2px 7px;
+ border-width: 0px 1px 0px 0px;
+ border-radius: 0px;
+ background-image: linear-gradient(to right,
+ @notebook_tab_gradient_a,
+ @notebook_tab_gradient_b 50%,
+ @notebook_tab_gradient_c 50%,
+ @notebook_tab_gradient_d);
+}
+
notebook header.left tab:active {
border-width: 1px 0px 1px 0px;
border-left-color: @notebook_active_tab_border;
@@ -1511,6 +1544,14 @@ notebook header.left tab:active {
@notebook_active_tab_gradient_b);
}
+notebook header.left tab:active:first-child {
+ border-width: 0px 0px 1px 0px;
+}
+
+notebook header.left tab:active:last-child {
+ border-width: 1px 0px 0px 0px;
+}
+
.notebook tab * {
background-color: transparent;
}
@@ -1535,6 +1576,51 @@ notebook button.flat.small-button:hover{
border-color: alpha(black, 0.1);
}
+notebook header.top tabs arrow.up,
+notebook header.bottom tabs arrow.up {
+ -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+ color: @theme_fg_color;
+}
+
+notebook header.top tabs arrow.down,
+notebook header.bottom tabs arrow.down {
+ -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+ color: @theme_fg_color;
+}
+
+notebook header.left tabs arrow.up,
+notebook header.right tabs arrow.up {
+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+ color: @theme_fg_color;
+}
+
+notebook header.left tabs arrow.down,
+notebook header.right tabs arrow.down {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+ color: @theme_fg_color;
+}
+
+notebook header tabs arrow {
+ color: @theme_fg_color;
+}
+
+notebook header tabs arrow:hover,
+notebook header tabs arrow:active {
+ color: @theme_selected_bg_color;
+}
+
+notebook header tabs arrow:disabled {
+ color: rgba(141, 144, 145, 0.3);
+}
+
+notebook header tabs arrow:backdrop {
+ color: rgba(84, 89, 90, 0.4);
+}
+
+notebook header tabs arrow:backdrop:disabled {
+ color: #c7c7c7;
+}
+
/**************
* ComboBoxes *
**************/
@@ -2900,12 +2986,14 @@ expander toolbar.inline-toolbar {
/* Calendars */
calendar {
padding: 2px;
+ border-style:none;
}
calendar.view {
border-radius: 3px;
border-style: solid;
border-width: 1px;
+ border-color: rgb(162,158,155);
padding: 2px;
}
@@ -3119,7 +3207,9 @@ messagedialog.csd decoration {
**************/
actionbar {
- border-style: none;
+ border-width: 1px 0px 0px 0px;
+ border-style:solid;
+ border-color: rgb(162,158,155);
padding: 7px 7px 3px 7px;
}
@@ -3234,6 +3324,19 @@ modelbutton.flat {
border-radius: 3px;
}
+modelbutton.flat,
+.linked button.image-button.model {
+ min-height: 24px;
+}
+
+modelbutton.flat arrow.left {
+ -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+modelbutton.flat arrow.right {
+ -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
modelbutton.flat:checked,
modelbutton.flat:active,
modelbutton.flat:disabled,
@@ -3248,7 +3351,8 @@ modelbutton.flat:checked:focus {
background-image: none;
border-color: transparent;
border-image: none;
- border-style: none;
+ border-style: solid;
+ border-width: 1px;
box-shadow: none;
border-radius: 3px;
}
@@ -3262,9 +3366,10 @@ modelbutton.flat:selected {
shade(@theme_selected_bg_color, 1.1),
shade(@theme_selected_bg_color, 0.8));
text-shadow: none;
- border-color: @border_color;
- border-width: 2px;
+ border-color: @button_active_gradient_a;
+ border-width: 1px;
border-radius: 3px;
+ border-style: solid;
}
popover separator {
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 1b87d583..983d952f 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -3,69 +3,74 @@
************/
/* caja sidebar */
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
+/* all sidebars */
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text,
+.caja-side-pane viewport.frame,
+.caja-side-pane widget .vertical {
background-color: shade (@theme_base_color, 1.00);
color: @theme_fg_color;
}
/* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
- padding: 0px 4px 0px 0px;
+.caja-side-pane treeview {
+ /* padding: 0px 4px 0px 0px; sigh, broken*/
+ padding: 3px 0px 3px 0px;
}
/* better for overlay scrollbars */
-CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaEmblemSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
+.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
+.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator {
-GtkRange-slider-width: 13;
}
/* ComboBox views */
-CajaWindow .toolbar.horizontal GtkComboBox .button,
-CajaWindow .primary-toolbar.toolbar.horizontal GtkComboBox .button {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo {
padding: 4px 4px;
}
-.caja-canvas-item,
-EelEditableLabel.entry {
+.caja-canvas-item {
border-radius: 3px;
}
-EelEditableLabel.entry,
-EelEditableLabel.entry:focus {
+/* EelEditableLabel (icon labels) */
+.caja-navigation-window .view .entry,
+.caja-navigation-window .view .entry:focus,
+.caja-desktop widget.entry,
+.caja-desktop widget.entry:focus {
border-image: none;
+ border-style: solid;
border-width: 1px;
border-color: @theme_fg_color;
box-shadow: none;
border-radius: 3px;
text-shadow: none;
+ background-image: -gtk-gradient(linear,
+ left top, left bottom,
+ from (shade(@theme_base_color, 0.86)),
+ color-stop (0.15, shade(@theme_base_color, 0.96)),
+ color-stop (0.50, shade(@theme_base_color, 0.98)),
+ to (shade(@theme_base_color, 1.00)));
}
/* desktop */
-CajaDesktopWindow.background .caja-canvas-item {
+.caja-desktop.caja-canvas-item {
color: @theme_base_color;
text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
}
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:hover,
-CajaDesktopWindow.background .caja-canvas-item:selected {
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover,
+.caja-desktop.caja-canvas-item:selected {
text-shadow: none;
}
/* view */
-CajaNavigationWindow.background .view.caja-canvas-item {
+.caja-navigation-window .view.caja-canvas-item {
color: @theme_fg_color;
}
-CajaNavigationWindow.background .view.caja-canvas-item:selected {
+.caja-navigation-window .view.caja-canvas-item:selected {
color: @theme_sectected_fg_color;
}
@@ -74,8 +79,8 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
***************/
.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
+MatePanelApplet > menubar,
+PanelToplevel.background,
PanelWidget,
PanelFrame,
PanelAppletFrame,
@@ -99,44 +104,7 @@ MatePanelApplet {
box-shadow: none;
}
-/* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
- background-image: none;
- background-color: shade(@theme_selected_bg_color, 1.1);
- border-style: none;
- border-image: none;
- /* join menuitem to menu */
- border-radius: 3px 3px 0px 0px;
- border-width: 0px;
- text-shadow: none;
- padding: 3px 5px;
-}
-
-/* set menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
- background-image: none;
- color: @theme_text_color;
- border-style: solid;
- border-width: 1px;
- border-radius: 3px;
- border-color: alpha(@theme_bg_color, 0.1);
- padding: 6px 5px;
-}
-
-/* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
- background-image: none;
- color: @theme_text_color;
- border-style: solid;
- border-width: 1px;
- border-radius: 3px;
- border-color: alpha(@theme_selected_bg_color, 0.1);
- padding: 6px 5px;
-}
-
-MatePanelApplet {
+#PanelApplet {
border-width: 0;
}
@@ -147,31 +115,40 @@ PanelSeparator {
text-shadow: none;
}
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
- /* Due to a bug somewhere in gtk or cairo,
- a padding of zero (or even one) doesn't work always!!! */
- padding: 0px;
+/* all applets */
+.mate-panel-menu-bar #PanelApplet button,
+.mate-panel-menu-bar #PanelApplet button.flat,
+.mate-panel-menu-bar #PanelApplet button.toggle,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle {
+ padding: 4px;
border-radius: 3px;
border-width: 1px;
border-style: solid;
text-shadow: none;
+ border-color: @border_color;
color: @theme_fg_color;
+ background-color: transparent;
background-image: -gtk-gradient (linear,
left top,
left bottom,
from (@button_gradient_a),
- color-stop (0.50, @button_gradient_b),
- color-stop (0.50, @button_gradient_c),
to (@button_gradient_d));
}
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
+.mate-panel-menu-bar #PanelApplet button:checked,
+.mate-panel-menu-bar #PanelApplet button:checked:hover,
+.mate-panel-menu-bar #PanelApplet button:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat:checked,
+.mate-panel-menu-bar #PanelApplet button.flat:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover:active,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover:active {
border-style: solid;
+ background-color: transparent;
background-image: linear-gradient(to bottom,
@button_active_gradient_a,
@button_active_gradient_b 3px,
@@ -181,60 +158,37 @@ MatePanelApplet .button:active {
@button_active_gradient_f);
}
-MatePanelApplet .button:hover {
+.mate-panel-menu-bar #PanelApplet button:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover {
border-style: solid;
- background-image: linear-gradient(to bottom,
- @button_gradient_color_b,
- @button_gradient_color_a);
-}
-
-/*Wncklist */
-WnckTasklist .button {
- padding: 0px;
- border-radius: 3px;
- border-width: 1px;
- border-style: solid;
- text-shadow: none;
- color: @theme_fg_color;
background-color: transparent;
- background-image: -gtk-gradient (linear,
- left top,
- left bottom,
- from (@button_gradient_a),
- color-stop (0.50, @button_gradient_b),
- color-stop (0.50, @button_gradient_c),
- to (@button_gradient_d));
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_a 5%,
+ @button_hover_gradient_b 95%,
+ @button_hover_gradient_c);
}
-WnckTasklist .button:checked:hover,
-WnckTasklist .button:checked,
-WnckTasklist .button:active:hover,
-WnckTasklist .button:active {
- padding: 0px;
- border-style: solid;
- background-color: transparent;
- background-image: linear-gradient(to bottom,
- @button_active_gradient_a,
- @button_active_gradient_b 3px,
- @button_active_gradient_c 4px,
- @button_active_gradient_d 50%,
- @button_active_gradient_e 50%,
- @button_active_gradient_f);
+#PanelApplet > #clock-applet-button.flat.toggle {
+ background-color: transparent;
+ background-image: none;
+ border-color: transparent;
}
-WnckTasklist .button:hover {
- padding: 0px;
+#PanelApplet > #clock-applet-button.flat.toggle:hover {
border-style: solid;
background-color: transparent;
background-image: linear-gradient(to bottom,
+ @button_hover_gradient_a 5%,
+ @button_hover_gradient_b 95%,
@button_hover_gradient_c);
}
-/* set selected button WnckSelector */
-.mate-panel-window-menu-menu-bar .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menuitem:hover {
- color: @theme_fg_color;
+#PanelApplet > #clock-applet-button.flat.toggle:checked {
border-style: solid;
+ border-color: @border_color;
+ background-color: transparent;
background-image: linear-gradient(to bottom,
@button_active_gradient_a,
@button_active_gradient_b 3px,
@@ -244,38 +198,34 @@ MatePanelApplet > WnckSelector.menubar .menuitem:hover {
@button_active_gradient_f);
}
-/* set WnckSelector selected menuitem */
-.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
- background-image: none;
- background-color: shade(@theme_selected_bg_color, 1.1);
- color: @theme_text_color;
- border-style: solid;
- border-width: 1px;
- border-radius: 3px;
- border-image: url("assets/menu-border.svg") 2 / 2px stretch;
- /*border-color: alpha(@theme_selected_bg_color, 0.1);*/
+#PanelApplet > #clock-applet-button.flat.toggle:checked:hover {
+ border-image: none;
}
-ClockBox,
-.mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
+
+#clock-applet-button.flat.toggle > box.horizontal > label {
font: normal;
}
-WnckPager {
+#PanelApplet.wnck-pager widget {
background-image: none;
border-color: transparent;
- background-color: shade(@theme_bg_color, 0.9);
+ background-color: transparent;
text-shadow: none;
}
+/* selected WnckPager */
+#PanelApplet.wnck-pager widget:selected {
+ background-image: linear-gradient(to bottom,
+ shade (@theme_selected_bg_color, 0.8),
+ shade (@theme_selected_bg_color, 1.06));
+}
+
/* hover of WnckPager */
-WnckPager:hover {
+#PanelApplet.wnck-pager widget:hover {
background-image: linear-gradient(to bottom,
shade (@theme_selected_bg_color, 1.86),
shade (@theme_selected_bg_color, 1.0));
- background-color: @theme_base_color;
}
/* Classic icon style */
@@ -283,12 +233,7 @@ WnckPager:hover {
-PanelMenuBar-icon-visible: true;
}
-/* no background for icon-padding area */
-GtkTrayIcon.background {
- background-color: transparent;
-}
-
-NaTrayApplet {
+na-tray-applet {
background-image: none;
background-color: transparent;
padding: 0;