Commit 214da7e5 authored by Andrew Shadura's avatar Andrew Shadura Committed by Package Import Robot

Import upstream version 6.0.1

parent d1bdcb11
This diff is collapsed.
......@@ -12,41 +12,27 @@ Here are screenshots (if applicable, click to see the original image):
## Requirements
- Requirements for Clearlooks-Phenix 1: packages `gtk2-engines` (if GTK2 applications are used) and `gnome-themes-standard`.
- Requirements for Clearlooks-Phenix v1: packages `gtk2-engines` (if GTK2 applications are used) and `gnome-themes-standard`.
- Requirements for Clearlooks-Phenix 2: packages `gtk2-engines` (if GTK2 applications are used), `gnome-themes-standard` and `gtk3-engines-unico`.
- Requirements for Clearlooks-Phenix v2: packages `gtk2-engines` (if GTK2 applications are used), `gnome-themes-standard` and `gtk3-engines-unico`.
- Requirements for Clearlooks-Phenix 3 and newer: package `gtk2-engines` (if GTK2 applications are used).
- Requirements for Clearlooks-Phenix v3 and newer: package `gtk2-engines` (if GTK2 applications are used).
## Installation
Regardless of the installation method chosen, the theme must be selected once the installation is complete:
- On Gnome: with [gnome-tweak-tool](https://live.gnome.org/GnomeTweakTool), by setting *Theme > Window theme* and *Theme > GTK+ theme*, or in a terminal:
dconf write /org/gnome/desktop/wm/preferences/theme \'Clearlooks-Phenix\'
dconf write /org/gnome/desktop/interface/gtk-theme \'Clearlooks-Phenix\'
- On Xfce: by going to *Settings > Appearence > Style* in the main menu for the GTK theme, and to *Settings > Window Manager > Style* for the Xfwm4 theme, or in a terminal:
xfconf-query -s Clearlooks-Phenix -c xfwm4 -p /general/theme
xfconf-query -s Clearlooks-Phenix -c xsettings -p /Net/ThemeName
### Manually
**Manual installation ensures you get the latest version of the theme.** See below for other installation methods.
- Download the appropriate version according to your situation:
- for GTK 3.0 and 3.2: [download Clearlooks-Phenix 1](https://github.com/jpfleury/clearlooks-phenix/archive/v1.zip);
- for GTK 3.0 and 3.2: [download Clearlooks-Phenix v1](https://github.com/jpfleury/clearlooks-phenix/archive/v1.zip);
- for GTK 3.4: [download Clearlooks-Phenix 2](https://github.com/jpfleury/clearlooks-phenix/archive/v2.zip);
- for GTK 3.4: [download Clearlooks-Phenix v2](https://github.com/jpfleury/clearlooks-phenix/archive/v2.zip);
- for GTK 3.6: [download Clearlooks-Phenix 3](https://github.com/jpfleury/clearlooks-phenix/archive/v3.zip);
- for GTK 3.6: [download Clearlooks-Phenix v3](https://github.com/jpfleury/clearlooks-phenix/archive/v3.zip);
- for GTK 3.8: [download Clearlooks-Phenix 4](https://github.com/jpfleury/clearlooks-phenix/archive/v4.zip);
- for GTK 3.8: [download Clearlooks-Phenix v4](https://github.com/jpfleury/clearlooks-phenix/archive/v4.zip);
- for GTK 3.10 and newer: [download Clearlooks-Phenix 5](https://github.com/jpfleury/clearlooks-phenix/archive/master.zip).
- for GTK 3.10 and 3.12: [download Clearlooks-Phenix v5](https://github.com/jpfleury/clearlooks-phenix/archive/v5.zip);
- for GTK 3.14: [download Clearlooks-Phenix v6](https://github.com/jpfleury/clearlooks-phenix/archive/master.zip).
To find your GTK version:
......@@ -71,50 +57,22 @@ Regardless of the installation method chosen, the theme must be selected once th
- `/usr/share/themes/` for all users, including style for programs ran with root privileges (e.g. Synaptic).
### Arch Linux
An [AUR package](https://aur.archlinux.org/packages.php?ID=60380) is maintained by eworm.
### Selection
### Debian
The theme must be selected once the installation is complete:
The package [`clearlooks-phenix-theme`](http://packages.debian.org/sid/clearlooks-phenix-theme) can be installed on Debian unstable.
### Gentoo
See the following package:
- On Gnome: with [gnome-tweak-tool](https://live.gnome.org/GnomeTweakTool), by setting *Theme > Window theme* and *Theme > GTK+ theme*, or in a terminal:
http://packages.gentoo.org/package/x11-themes/clearlooks-phenix
dconf write /org/gnome/desktop/wm/preferences/theme \'Clearlooks-Phenix\'
dconf write /org/gnome/desktop/interface/gtk-theme \'Clearlooks-Phenix\'
### Ubuntu
- On Xfce: by going to *Settings > Appearence > Style* in the main menu for the GTK theme, and to *Settings > Window Manager > Style* for the Xfwm4 theme, or in a terminal:
The package [`clearlooks-phenix-theme`](http://packages.ubuntu.com/search?keywords=clearlooks-phenix-theme) can be installed on Ubuntu 12.10 and newer.
xfconf-query -s Clearlooks-Phenix -c xfwm4 -p /general/theme
xfconf-query -s Clearlooks-Phenix -c xsettings -p /Net/ThemeName
## Configuration
### Wallpaper
The wallpaper used for the Gnome 3 desktop screenshot is available in the folder `wallpapers`.
### Icons
The icon theme used for the same screenshot is Mist, installed with the package [`gnome-themes`](http://packages.ubuntu.com/oneiric/gnome-themes), under LGPL. However, this package is no longer available with last Ubuntu versions. Here's an easy way to install Mist:
- [Download the archive of the Mist icon theme.](http://www.jpfleury.net/site/fichiers/Mist.tar)
- Extract the archive.
- Copy the folder `Mist` in one of the following two locations:
- `~/.icons/` for the current user;
- `/usr/share/icons/` for all users.
- Then, choose Mist:
- on Gnome: with gnome-tweak-tool by setting *Theme > Icon theme*;
- on Xfce: by going to *Settings > Appearence > Icons* in the main menu.
### Desktop managed by Nautilus
By default, the font color on a desktop managed by Nautilus is black. To set it to white, open the file `gtk-3.0/applications.css` with a text editor, find the code relative to Nautilus:
......@@ -141,18 +99,36 @@ and uncomment it, as follows:
To get a custom color, change the color directly in the file `gtk-3.0/applications.css`.
### Color variants
From Clearlooks-Phenix 2, it's possible to create color variants of the GTK3 theme. Only a few color declarations must be changed in the file `gtk-3.0/gtk-variant.css`.
About button borders, they come from SVG files. [Inkscape](http://inkscape.org/) can be used to modify them. For more details, see the screencast [Utiliser Inkscape pour modifier la couleur de la bordure d'un bouton](http://www.youtube.com/watch?v=DWJHDS5hQsw). A Bash script is also shipped with Clearlooks-Phenix to assist the modification of SVG and PNG files. To use it, copy the file `doc/images.sh.txt`, paste it in the root folder of your development theme (same emplacement as the file `index.theme`) and rename it `images.sh`. Then, change variables in the first section of the file according to the color variant desired and run the script in a terminal (`bash images.sh`). The package `imagemagick` is required.
### Window buttons layout
If after installing or updating Ubuntu, the window buttons are on the left side, but you want them to the right, run the following command in a terminal:
gconftool-2 --set /apps/metacity/general/button_layout --type string ":minimize,maximize,close"
### Wallpaper
The wallpaper used for the Gnome 3 desktop screenshot is available in the folder `wallpapers`.
### Icons
The icon theme used for the same screenshot is Mist, installed with the package [`gnome-themes`](http://packages.ubuntu.com/oneiric/gnome-themes), under LGPL. However, this package is no longer available with last Ubuntu versions. Here's an easy way to install Mist:
- [Download the archive of the Mist icon theme.](http://www.jpfleury.net/site/fichiers/Mist.tar)
- Extract the archive.
- Copy the folder `Mist` in one of the following two locations:
- `~/.icons/` for the current user;
- `/usr/share/icons/` for all users.
- Then, choose Mist:
- on Gnome: with gnome-tweak-tool by setting *Theme > Icon theme*;
- on Xfce: by going to *Settings > Appearence > Icons* in the main menu.
## Development
Git is used for revision control. [Repository can be browsed online or cloned.](https://github.com/jpfleury/clearlooks-phenix)
......@@ -177,13 +153,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
### Third-party code
- Adwaita theme, from the package [`gnome-themes-standard`](http://packages.ubuntu.com/oneiric/gnome-themes-standard), under LGPL.
- Adwaita theme, from the package [`gnome-themes-standard`](http://packages.ubuntu.com/search?keywords=gnome-themes-standard), under LGPL.
- File `gtk-2.0/gtkrc`, from the package [`gtk2-engines`](http://packages.ubuntu.com/oneiric/gtk2-engines), under LGPL.
- File `gtk-2.0/gtkrc`, from the package [`gtk2-engines`](http://packages.ubuntu.com/search?keywords=gtk2-engines), under LGPL.
- File `metacity-1/metacity-theme-1.xml`, from the package [`gnome-themes-selected`](http://packages.ubuntu.com/oneiric/gnome-themes-selected), under LGPL.
- File `metacity-1/metacity-theme-1.xml`, from the package [`gnome-themes-selected`](http://packages.ubuntu.com/search?keywords=gnome-themes-selected), under LGPL.
- File `openbox-3/themerc`, from the package [`openbox`](http://packages.ubuntu.com/oneiric/openbox), under GPL.
- File `openbox-3/themerc`, from the package [`openbox`](http://packages.ubuntu.com/search?keywords=openbox), under GPL.
- [Clearlooks XFWM4](http://xfce-look.org/content/show.php/Clearlooks+for+XFWM4?content=137055) theme, under GPL.
......
doc/README.mkd
\ No newline at end of file
#!/bin/bash
# Script d'assistance à la modification des images du thème Clearlooks-Phénix
# dans le but de créer une variante de couleurs.
#
# Placer ce script à la racine du thème (c'est-à-dire au même emplacement que
# le fichier «index.theme»), personnaliser la section «Variables à modifier.»
# et lancer le script dans une console:
#
# $ bash images.sh
########################################################################
##
## Variables à modifier.
##
########################################################################
# Variation de la luminosité, de la saturation et de la teinte des fichiers PNG
# pour le style «hover». Pour plus de détails, voir le lien suivant:
# <http://www.imagemagick.org/script/command-line-options.php#modulate>.
pngVariation=100,100,300
# Liste des fichiers SVG.
# Fichiers SVG à modifier pour une variante de couleurs.
# Fichier «border-focused.svg».
svgBfCouleurBordure=4b6e99
svgBfCouleurBordureInterne=c8daef
svgBfCouleurBordureExterneBas=ffffff
# Fichier «border-focused-ptb.svg».
svgBfPtbCouleurBordure=869bb7
svgBfPtbCouleurBordureInterne=cccccc
# Fichier «border-focused-switch.svg».
svgBfScouleurBordure=4b6e99
svgBfScouleurBordureExterneBas=ffffff
# Fichiers SVG ne devant pas nécessairement être modifiés pour une variante
# de couleurs.
# Fichier «border.svg».
svgBcouleurBordure=918e8c
svgBcouleurBordureExterneBas=ffffff
# Fichier «border-error.svg».
svgBeCouleurBordure=9b3636
svgBeCouleurBordureExterneBas=ffffff
# Fichier «border-gnome-panel-button.svg».
svgBgPbCouleurBordure=918e8c
# Fichier «border-inline-button.svg».
svgBiBcouleurBordure=918e8c
svgBiBcouleurBordureExterneBas=ffffff
# Fichier «border-insensitive.svg».
svgBiCouleurBordure=a9a5a2
svgBiCouleurBordureExterneBas=ffffff
########################################################################
##
## Code principal. Ne pas modifier.
##
########################################################################
# Dépendances.
if ! type convert > /dev/null 2>&1; then
echo "Veuillez installer le paquet «imagemagick»" >&2
exit 1
fi
if ! type sed > /dev/null 2>&1; then
echo "Veuillez installer le paquet «sed»" >&2
exit 1
fi
# Dossier de sauvegarde des images modifiées.
dossierSauv=gtk-3.0/img/modif
i=0
while ! mkdir "$dossierSauv" > /dev/null 2>&1 && ((i < 100)); do
((++i))
dossierSauv=gtk-3.0/img/modif-$i
done
if [[ ! -d $dossierSauv ]]; then
echo "Impossible de créer un dossier de sauvegarde pour y déplacer les images modifiées." >&2
exit 1
fi
# Modification des images PNG.
png=(
gtk-3.0/img/checkbox-checked-hover.png
gtk-3.0/img/checkbox-mixed-hover.png
gtk-3.0/img/checkbox-unchecked-hover.png
gtk-3.0/img/menuitem-checkbox-checked-hover.png
gtk-3.0/img/menuitem-checkbox-hover.png
gtk-3.0/img/menuitem-checkbox-mixed-hover.png
gtk-3.0/img/menuitem-radio-checked-hover.png
gtk-3.0/img/menuitem-radio-hover.png
gtk-3.0/img/radio-checked-hover.png
gtk-3.0/img/radio-mixed-hover.png
gtk-3.0/img/radio-unchecked-hover.png
)
for image in "${png[@]}"; do
convert "$image" -modulate "$pngVariation" "$dossierSauv/${image##*/}"
done
# Modification des images SVG.
couleur1=918e8c
couleur2=ffffff
if [[ $svgBcouleurBordure != $couleur1 \
|| $svgBcouleurBordureExterneBas != $couleur2 ]]; then
fichier=gtk-3.0/img/border.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBcouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBcouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=9b3636
couleur2=ffffff
if [[ $svgBeCouleurBordure != $couleur1 \
|| $svgBeCouleurBordureExterneBas != $couleur2 ]]; then
fichier=gtk-3.0/img/border-error.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBeCouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBeCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=4b6e99
couleur2=c8daef
couleur3=ffffff
if [[ $svgBfCouleurBordure != $couleur1 || $svgBfCouleurBordureInterne != $couleur2 \
|| $svgBfCouleurBordureExterneBas != $couleur3 ]]; then
fichier=gtk-3.0/img/border-focused.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBfCouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBfCouleurBordureInterne;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur3;/#$svgBfCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=869bb7
couleur2=cccccc
if [[ $svgBfPtbCouleurBordure != $couleur1 \
|| $svgBfPtbCouleurBordureInterne != $couleur2 ]]; then
fichier=gtk-3.0/img/border-focused-ptb.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBfPtbCouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBfPtbCouleurBordureInterne;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=4b6e99
couleur2=ffffff
if [[ $svgBfScouleurBordure != $couleur1 \
|| $svgBfScouleurBordureExterneBas != $couleur2 ]]; then
fichier=gtk-3.0/img/border-focused-switch.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBfScouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBfScouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=918e8c
if [[ $svgBgPbCouleurBordure != $couleur1 ]]; then
fichier=gtk-3.0/img/border-gnome-panel-button.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBgPbCouleurBordure;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=918e8c
couleur2=ffffff
if [[ $svgBiBcouleurBordure != $couleur1 \
|| $svgBiBcouleurBordureExterneBas != $couleur2 ]]; then
fichier=gtk-3.0/img/border-inline-button.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBiBcouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBiBcouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
couleur1=a9a5a2
couleur2=ffffff
if [[ $svgBiCouleurBordure != $couleur1 \
|| $svgBiCouleurBordureExterneBas != $couleur2 ]]; then
fichier=gtk-3.0/img/border-insensitive.svg
cp "$fichier" "$dossierSauv"
sed -i "s/#$couleur1;/#$svgBiCouleurBordure;/" "$dossierSauv/${fichier##*/}"
sed -i "s/#$couleur2;/#$svgBiCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
fi
# Fin du script.
echo "Les images ont été modifiées."
......@@ -61,4 +61,3 @@ style "chrome-hacks"
class "ChromeGtkFrame" style "chrome-hacks"
widget_class "*Chrom*Button*" style "chromium_toolbar_button"
# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86abd9\nselected_fg_color:#ffffff\ntext_color:#1a1a1a\nbg_color:#edeceb\ntooltip_bg_color:#f5f5b5\nlink_color:#0000ee\nvisited_link_color:#551a8b"
......@@ -402,4 +401,3 @@ widget "gtk-tooltip*" style "tooltips"
##########################################################################
include "applications.rc"
......@@ -24,31 +24,39 @@
* gedit *
*********/
GeditMultiNotebook .notebook {
border-width: 0px 0px 1px 1px;
GeditMenuStackSwitcher.button.flat {
border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
border-radius: 3px;
border-width: 1px 1px 2px 1px;
border-style: solid;
border-color: transparent;
}
GeditPanel.horizontal .notebook {
border-width: 0px 1px 1px 1px;
.gedit-side-panel-paned,
.gedit-bottom-panel-paned {
border-style: solid;
border-color: @toolbar_border_top_color;
}
GeditPanel.vertical .notebook {
border-width: 0px 1px 1px 1px;
.gedit-side-panel-paned {
border-width: 0px 1px 0px 0px;
}
GeditViewFrame .gedit-search-slider {
padding: 4px;
border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
.gedit-bottom-panel-paned {
border-width: 1px 0px 0px 0px;
}
GeditViewFrame .gedit-search-slider .not-found {
background-color: @error_bg_color;
color: @error_fg_color;
.gedit-menu-stack-switcher {
padding: 15px 15px 2px 15px;
}
GeditViewFrame .gedit-search-slider .not-found:selected {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
GeditMultiNotebook .notebook {
border-width: 0px 0px 1px 1px;
}
GeditViewFrame .gedit-search-slider {
padding: 4px;
border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
}
.gedit-search-entry-occurrences-tag {
......@@ -58,6 +66,10 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
padding: 2px;
}
GeditStatusbar .frame.flat {
border: none;
}
/*******************
* gnome-documents *
*******************/
......@@ -194,4 +206,3 @@ UnityPanelWidget,
color-stop (0.50, @menubar_menuitem_hover_gradient_c),
to (@menubar_menuitem_hover_gradient_d));
}
/***********************************************************************
* This section can be modified to create color variants of the theme. *
***********************************************************************/
/****************
* color scheme *
****************/
@define-color theme_base_color #ffffff;
@define-color theme_bg_color #edeceb;
@define-color theme_fg_color #000000;
@define-color theme_selected_bg_color #86abd9;
@define-color theme_selected_fg_color #ffffff;
@define-color theme_tooltip_bg_color #f5f5b5;
@define-color theme_tooltip_fg_color #000000;
@define-color theme_text_color #1a1a1a;
@define-color link_color #0000ee;
@define-color visited_link_color #551a8b;
/*****************
* error/warning *
*****************/
@define-color error_color #cc0000;
@define-color warning_bg_color #faad3d;
/***************
* core colors *
***************/
/* Core colors are only used in the current file, as bases for other
color declarations. */
@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */
@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */
/********************************************
* End of configuration for color variants. *
********************************************/
This diff is collapsed.
......@@ -11,7 +11,7 @@
-GtkPaned-handle-size: 5;
-GtkCheckButton-indicator-size: 16;
-GtkCheckMenuItem-indicator-size: 12;
-GtkCheckMenuItem-indicator-size: 10;
-GtkScrolledWindow-scrollbar-spacing: 3;
-GtkScrolledWindow-scrollbars-within-bevel: 0;
......@@ -43,7 +43,8 @@ GtkWindow {
color: @theme_fg_color;
}
* {
.background {
color: @theme_fg_color;
background-color: @theme_bg_color;
}
......@@ -92,8 +93,23 @@ GtkGrid:insensitive {
* Miscellaneous *
*****************/
@keyframes spin {
to {
-gtk-icon-transform: rotate(1turn);
}
}
.spinner {
background-image: none;
background-color: blue;
opacity: 0;
-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
}
.spinner:active {
transition: 750ms linear loop;
opacity: 1;
animation: spin 1s linear infinite;
}
.spinner:active:insensitive {
opacity: 0.5;
}
.floating-bar {
......@@ -444,8 +460,26 @@ GtkScrolledWindow GtkViewport.frame {
.button,
.button.menuitem.menubar,
GtkComboBox.combobox-entry .button {
padding: 1px 4px;
.combobox-entry .button {
padding: 5px 8px 6px;
}
.path-bar .button,
.path-bar .button GtkImage,
.path-bar .button GtkLabel {
padding: 2px;
}
.path-bar .button {
border-width: 1px 0px 1px 1px;
}
.path-bar .button:hover:active {
border-left-width: 1px;
}
.path-bar .button.image-button:first-child {
border-right: none;
}
.button {
......@@ -471,6 +505,27 @@ GtkMenuToolButton *,
background-color: transparent;
}
GtkListBoxRow.button.list-row {
color: @theme_text_color;
background-color: @theme_base_color;
border: none;
}
GtkListBoxRow.button.list-row:selected {
color: @theme_selected_fg_color;
border-style: solid;
border-width: 1px;
border-radius: 0px;
border-color: @menubar_menuitem_hover_border_color;
background-image: -gtk-gradient (linear,
left top,
left bottom,
from (@menubar_menuitem_hover_gradient_a),
color-stop (0.50, @menubar_menuitem_hover_gradient_b),
color-stop (0.50, @menubar_menuitem_hover_gradient_c),
to (@menubar_menuitem_hover_gradient_d));
}
.primary-toolbar .button {
border-image: none;
border-style: solid;
......@@ -480,7 +535,9 @@ GtkMenuToolButton *,
.primary-toolbar .button *:active,
.inline-toolbar .button *:active,
.button *:active {
.button *:active,
.button *:active:focus,
.button *:focus {
color: @button_active_text_color;
}
......@@ -543,8 +600,8 @@ GtkMenuToolButton *,
.toolbar .raised .button:focus,
.toolbar GtkComboBox .button,
.toolbar GtkComboBox .button:focus,
GtkComboBox.combobox-entry .button,
.primary-toolbar GtkComboBox.combobox-entry .button,
.combobox-entry .button,
.primary-toolbar .combobox-entry .button,
.titlebar .titlebutton:hover,
GtkColorChooserWidget #add-color-button {
background-image: -gtk-gradient (linear,
......@@ -558,8 +615,11 @@ GtkColorChooserWidget #add-color-button {
}
/* Pushed button background */
.button:checked,
.button:checked:hover,
.button:active,
.button:active:hover,
.menuitem.button:hover,
.spinbutton .button:active,
.spinbutton .button:active:hover,
.toolbar .button:active,
......@@ -568,8 +628,8 @@ GtkColorChooserWidget #add-color-button {
.toolbar .raised .button:active,
.toolbar .button.raised:active:hover,
.toolbar .raised .button:active:hover,
.primary-toolbar GtkComboBox.combobox-entry .button:active,
GtkComboBox.combobox-entry .button:active,
.primary-toolbar .combobox-entry .button:active,
.combobox-entry .button:active,
.primary-toolbar .button:active,
.primary-toolbar .button:active:hover,
.primary-toolbar .button:focus:active,
......@@ -610,8 +670,8 @@ GtkComboBox.combobox-entry .button:active,
.toolbar .raised .button:hover,
.toolbar GtkComboBox .button:hover,
.primary-toolbar .button:hover,
GtkComboBox.combobox-entry .button:hover,
.primary-toolbar GtkComboBox.combobox-entry .button:hover,
.combobox-entry .button:hover,
.primary-toolbar .combobox-entry .button:hover,
GtkColorChooserWidget #add-color-button:hover {
background-color: transparent;
background-image: linear-gradient(to bottom,
......@@ -623,7 +683,7 @@ GtkColorChooserWidget #add-color-button:hover {
/* Insensitive button background */
.button:insensitive,
.toolbar GtkComboBox .button:insensitive,
GtkComboBox.combobox-entry .button:insensitive {
.combobox-entry .button:insensitive {
background-image: linear-gradient(to bottom,
@button_insensitive_inner_border_color 1px,
@button_insensitive_gradient_a 2px,
......@@ -672,9 +732,6 @@ GtkComboBox.combobox-entry .button:insensitive {
.notebook {
padding: 0;
border-color: @border_color;
border-style: solid;
border-width: 1px;
background-clip: border-box;
background-color: @notebook_bg_color;
-GtkNotebook-tab-overlap: 2;
......@@ -682,13 +739,18 @@ GtkComboBox.combobox-entry .button:insensitive {
-GtkNotebook-initial-gap: 0;
}
.notebook.header.frame {
border-width: 0;
}
.notebook GtkViewport {
background-color: @theme_base_color;
background-color: @theme_bg_color;
}
.notebook tab {
padding: 3px;
border-radius: 3px;
border-color: @border_color;
border-style: solid;
border-width: 1px;
background-color: transparent;
......@@ -841,40 +903,40 @@ GtkComboBox .separator {
-GtkWidget-vertical-separator: 0;
}
GtkComboBox.combobox-entry .entry:first-child,
GtkComboBox.combobox-entry .button:first-child {
.combobox-entry .entry:first-child,
.combobox-entry .button:first-child {
border-image-width: 3px 0 4px 3px;
border-radius: 3px 0 0 3px;
border-right-width: 0;
}
GtkComboBox.combobox-entry .entry:last-child,
GtkComboBox.combobox-entry .button:last-child {
.combobox-entry .entry:last-child,
.combobox-entry .button:last-child {
border-image-width: 3px 3px 4px 0;
border-radius: 0 3px 3px 0;
border-left-width: 0;
}
GtkComboBox.combobox-entry .button:last-child {
.combobox-entry .button:last-child {
border-image-width: 3px 3px 4px 2px;
}
.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
.primary-toolbar .combobox-entry .entry:first-child,
.primary-toolbar .combobox-entry .button:first-child {
border-image-width: 4px 0 4px 4px;
border-radius: 3px 0 0 3px;
border-right-width: 0;
}
.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
.primary-toolbar .combobox-entry .entry:last-child,
.primary-toolbar .combobox-entry .button:last-child {
border-image-width: 4px 4px 4px 0;
border-radius: 0 3px 3px 0;
border-left-width: 0;
}
GtkComboBox.combobox-entry .button *:active,
GtkComboBox.combobox-entry .button *:active:hover {
.combobox-entry .button *:active,
.combobox-entry .button *:active:hover {