Skip to content

Commit

Permalink
fix header separator spacing and port new window button styling from …
Browse files Browse the repository at this point in the history
…3.14
  • Loading branch information
horst3180 committed Sep 28, 2014
1 parent fef3930 commit bc21425
Show file tree
Hide file tree
Showing 30 changed files with 485 additions and 1,138 deletions.
Binary file modified Vertex-gtk/gtk-3.0/assets/header-separator-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vertex-gtk/gtk-3.0/assets/header-separator-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Vertex-gtk/gtk-3.0/assets/header-separator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Vertex-gtk/gtk-3.0/gtk-main-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@import url("tabs.css"); /*disable for 3.10*/
@import url("dark-tabs.css"); /*disable for 3.10*/
@import url("gnome-applications-dark-overrides.css");
@import url("window-controls.css"); /*disable for 3.10*/
@import url("window-controls-dark.css"); /*disable for 3.10*/
@import url("unity.css");

/*@import url("gtk-widgets-3_10.css");
Expand Down
2 changes: 1 addition & 1 deletion Vertex-gtk/gtk-3.0/gtk-main.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@import url("granite.css"); /*disable for 3.10*/
@import url("tabs.css"); /*disable for 3.10*/

@import url("window-controls.css"); /*disable for 3.10*/
@import url("window-controls-light.css"); /*disable for 3.10*/
@import url("unity.css");

/*@import url("gtk-widgets-3_10.css");*/
25 changes: 23 additions & 2 deletions Vertex-gtk/gtk-3.0/gtk-widgets-assets-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,46 @@
.header-bar > GtkBox > .separator.vertical,
.header-bar .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
-GtkWidget-separator-width: 9px;
background: transparent;
border-width: 0 4px 0 1px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-dark.png"),url("assets/header-separator-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.header-bar > GtkBox.left > .separator.vertical,
.header-bar .left .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-left-dark.png"),url("assets/header-separator-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

.selection-mode.header-bar > GtkBox > .separator.vertical,
.selection-mode.toolbar .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
-GtkWidget-separator-width: 9px;
background: transparent;
border-width: 0 4px 0 1px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-selectionmode-dark.png"),url("assets/header-separator-selectionmode-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.selection-mode.header-bar > GtkBox.left > .separator.vertical {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-selectionmode-left-dark.png"),url("assets/header-separator-selectionmode-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

/*************************
* Check and Radio items *
*************************/
Expand Down
25 changes: 23 additions & 2 deletions Vertex-gtk/gtk-3.0/gtk-widgets-assets.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,46 @@
.header-bar > GtkBox > .separator.vertical,
.header-bar .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
-GtkWidget-separator-width: 9px;
background: transparent;
border-width: 0 4px 0 1px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.header-bar > GtkBox.left > .separator.vertical,
.header-bar .left .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-left.png"),url("assets/header-separator-left@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

.selection-mode.header-bar > GtkBox > .separator.vertical,
.selection-mode.toolbar .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
-GtkWidget-separator-width: 9px;
background: transparent;
border-width: 0 4px 0 1px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-selectionmode.png"),url("assets/header-separator-selectionmode@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.selection-mode.header-bar > GtkBox.left > .separator.vertical {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-selectionmode-left.png"),url("assets/header-separator-selectionmode-left@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

/*************************
* Check and Radio items *
*************************/
Expand Down
21 changes: 21 additions & 0 deletions Vertex-gtk/gtk-3.0/gtk-widgets-darker-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,17 @@ GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar {
border-image: -gtk-scaled(url("assets/header-separator-dark.png"),url("assets/header-separator-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.header-bar > GtkBox.left > .separator.vertical,
.header-bar .left .separator {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-left-dark.png"),url("assets/header-separator-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

/**************************
* Selection Mode classes *
**************************/
Expand All @@ -745,6 +756,16 @@ GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar {
border-image: -gtk-scaled(url("assets/header-separator-selectionmode-dark.png"),url("assets/header-separator-selectionmode-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch;
}

.selection-mode.header-bar > GtkBox.left > .separator.vertical {
-GtkWidget-wide-separators: 1;
-GtkWidget-separator-width: 10px;
background: transparent;
border-width: 0 1px 0 4px;
border-style: solid;
border-color: transparent;
border-image: -gtk-scaled(url("assets/header-separator-selectionmode-left-dark.png"),url("assets/header-separator-selectionmode-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch;
}

/***********
* Popover *
***********/
Expand Down
137 changes: 137 additions & 0 deletions Vertex-gtk/gtk-3.0/window-controls-dark.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/*
Set correct layout with
gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for buttons on the right
or
gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
for buttons on the left
*/

.header-bar .button.titlebutton,
.titlebar .button.titlebutton,
GtkCalendar.header .button.titlebutton,
.header-bar .button.titlebutton:hover,
.titlebar .button.titlebutton:hover,
GtkCalendar.header .button.titlebutton:hover,
.header-bar .button.titlebutton:active,
.titlebar .button.titlebutton:active,
GtkCalendar.header .button.titlebutton:active {
background: none;
border-width: 1px 0px 2px 0px;
border-color: transparent;
border-style: solid;
border-image: none;
icon-shadow: none;
box-shadow: none; }

.header-bar .right .button.titlebutton,
.titlebar .right .button.titlebutton,
GtkCalendar .right .header .button.titlebutton {
padding-left: 0px;
padding-right: 1px; }

.header-bar .left .button.titlebutton,
.titlebar .left .button.titlebutton,
GtkCalendar .left .header .button.titlebutton {
padding-left: 1px;
padding-right: 0px; }

.titlebar .right .titlebutton,
.titlebar .left .titlebutton,
.titlebar .right .titlebutton:hover,
.titlebar .left .titlebutton:hover,
.titlebar .right .titlebutton:active:hover,
.titlebar .left .titlebutton:active:hover,
.titlebar .right .titlebutton:backdrop,
.titlebar .left .titlebutton:backdrop {
color: transparent;
background-position: center;
background-repeat: no-repeat;
}

/* Generic titlebutton */
.titlebar .right .titlebutton,
.titlebar .left .titlebutton {
background-image: url('window-controls/titlebutton.svg');
}

.titlebar .right .titlebutton:backdrop,
.titlebar .left .titlebutton:backdrop {
background-image: url('window-controls/titlebutton_unfocused.svg');
}

/* :hover and :active states */

/* Minimize */
.titlebar .right .titlebutton:nth-last-child(3):hover,
.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
.titlebar .left .titlebutton:nth-child(3):hover,
.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
background-image: url('window-controls/min_prelight.svg');
}

/* Maximize */
.titlebar .right .titlebutton:nth-last-child(2):hover,
.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
.titlebar .left .titlebutton:nth-child(2):hover,
.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
background-image: url('window-controls/max_prelight.svg');
}

/* Close */
.titlebar .right .titlebutton:last-child:hover,
.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
.titlebar .left .titlebutton:first-child:hover,
.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
background-image: url('window-controls/close_prelight.svg');
}

.titlebar .right .titlebutton:active:hover,
.titlebar .left .titlebutton:active:hover {
background-image: url('window-controls/titlebutton_pressed.svg');
}

/*GtkMenuButton*/
.titlebar .left GtkMenuButton.titlebutton:first-child,
.titlebar .left GtkMenuButton.titlebutton:first-child:hover,
.titlebar .left GtkMenuButton.titlebutton:first-child:active,
.titlebar .right GtkMenuButton.titlebutton:last-child,
.titlebar .right GtkMenuButton.titlebutton:last-child:hover,
.titlebar .right GtkMenuButton.titlebutton:last-child:active {
background-image: none;
border-width: 1px 1px 2px 1px;
padding-left: 4px;
padding-right: 4px;
icon-shadow: none;
}

.titlebar .left GtkMenuButton.titlebutton:first-child,
.titlebar .right GtkMenuButton.titlebutton:last-child {
color: @wm_title;
}

.titlebar .left GtkMenuButton.titlebutton:first-child:hover,
.titlebar .right GtkMenuButton.titlebutton:last-child:hover {
color: @theme_fg_color;
background-image: linear-gradient(to bottom,
@button_hover_gradient_color_a,
@button_hover_gradient_color_b);
text-shadow: 0 -1px alpha(black, 0.7);
icon-shadow: 0 -1px alpha(black, 0.7);
-gtk-image-effect: highlight;
border-image: -gtk-scaled(url("borders/button-border-dark.png"),url("borders/button-border-dark@2.png")) 2 2 3 2 / 2px 2px 3px 2px stretch;
border-radius: 2px;
border-style: solid;
border-color: transparent; }

.titlebar .left GtkMenuButton.titlebutton:first-child:active,
.titlebar .right GtkMenuButton.titlebutton:last-child:active {
color: @button_active_text;
background-image: linear-gradient(to bottom,
@button_active_gradient_color_a,
@button_active_gradient_color_b);
text-shadow: 0 -1px alpha(black, 0.7);
icon-shadow: 0 -1px alpha(black, 0.7);
box-shadow: inset 0 1px 2px alpha(black, 0.2);
transition-duration: 50ms;
outline-color: alpha(@button_active_text, 0.3);
border-image: -gtk-scaled(url("borders/button-active-border-dark.png"),url("borders/button-active-border-dark@2.png")) 2 2 3 2 / 2px 2px 3px 2px stretch; }
Loading

0 comments on commit bc21425

Please sign in to comment.