AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: fix combos and buttons padding issues.

Browse Source 
For some strage reason (bug?) combobox buttons needs -2px vertical padding
wrt buttons to have the same size as buttons.
This commit is contained in:
Lapo Calamandrei 2014-07-07 11:45:13 +02:00
parent 3939e3ffcc
commit d96bdc357c
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/resources/theme/Adwaita/_common.scss
View File

@ -319,8 +319,10 @@ GtkLabel {
}
// buttons in header bars and action bars
&.image-button { padding: 8px; }
&.text-button { padding: 6px 8px 5px; } // due to font metrics
.header-bar &.image-button,
.action-bar &.image-button { padding: 8px; }
.header-bar &.text-button,
.action-bar &.text-button { padding: 6px 8px 5px; } // due to font metrics
//inline-toolbar buttons
.inline-toolbar &, .inline-toolbar &:backdrop {
@ -569,10 +571,9 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the
* ComboBoxes *
**************/
GtkComboBox {
//FIXME padding issue
padding: 0;
> .button { padding-top: 2px; padding-bottom: 2px; } // Otherwise combos
// are bigger then
// buttons
-GtkComboBox-arrow-scaling: 0.5;
-GtkComboBox-shadow-type: none;

8
gtk/resources/theme/Adwaita/gtk-contained-dark.css
View File

@ -452,9 +452,9 @@
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
.button.image-button {
.header-bar .button.image-button, .action-bar .button.image-button {
padding: 8px; }
.button.text-button {
.header-bar .button.text-button, .action-bar .button.text-button {
padding: 6px 8px 5px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
@ -753,12 +753,14 @@ GtkColorButton.button {
* ComboBoxes *
**************/
GtkComboBox {
padding: 0;
-GtkComboBox-arrow-scaling: 0.5;
-GtkComboBox-shadow-type: none;
box-shadow: 0 1px rgba(238, 238, 236, 0.1);
text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
GtkComboBox > .button {
padding-top: 2px;
padding-bottom: 2px; }
GtkComboBox:insensitive {
color: #939695;
text-shadow: none;

8
gtk/resources/theme/Adwaita/gtk-contained.css
View File

@ -444,9 +444,9 @@
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
.button.image-button {
.header-bar .button.image-button, .action-bar .button.image-button {
padding: 8px; }
.button.text-button {
.header-bar .button.text-button, .action-bar .button.text-button {
padding: 6px 8px 5px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
@ -745,12 +745,14 @@ GtkColorButton.button {
* ComboBoxes *
**************/
GtkComboBox {
padding: 0;
-GtkComboBox-arrow-scaling: 0.5;
-GtkComboBox-shadow-type: none;
box-shadow: 0 1px white;
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
GtkComboBox > .button {
padding-top: 2px;
padding-bottom: 2px; }
GtkComboBox:insensitive {
color: #8d9091;
text-shadow: none;