diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-11 18:50:19 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-11 18:50:19 (GMT) |
| commit | 8a21f6ccdfaeb4d04dc0f44a28070c7bd2a9e91d (patch) | |
| tree | 0a1f9cf121596926883143f9fef4710f841aae21 | |
| parent | acae2bc6541d02f92c68ca4a633f8702aece70f1 (diff) | |
| parent | 7ea7615b8acea22abceb050fc19824673cb54030 (diff) | |
Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gtk3/theme/gtk-widgets.css.em | 31 |
2 files changed, 25 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e628f60..3bedb37 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) -AC_INIT([sugar-artwork],[0.98.0],[],[sugar-artwork]) +AC_INIT([sugar-artwork],[0.98.1],[],[sugar-artwork]) AM_CONFIG_HEADER(config.h) diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em index e7b76c5..7b65a52 100644 --- a/gtk3/theme/gtk-widgets.css.em +++ b/gtk3/theme/gtk-widgets.css.em @@ -275,6 +275,11 @@ GtkTreeView row:nth-child(odd) { color: @black; } +.view:insensitive { + background-color: @white; + color: @black; +} + .entry:selected, .entry:selected:focused, .view:selected:focused { @@ -525,18 +530,23 @@ SugarPaletteHeaderSeparator.menuitem.separator { GtkProgressBar.progressbar { background-color: @white; - border-color: @white; - border-radius: 10px; + border-color: @button_grey; + border-radius: $(subcell_size)px; border-style: solid; - border-width: 0px; + border-width: $(thickness)px; } GtkProgressBar.trough { - background-color: alpha (@black, 0.0); + background-color: @selection_grey; border-style: solid; - border-radius: 10px; + border-radius: $(subcell_size)px; border-color: @button_grey; - border-width: 2px; + border-width: $(thickness)px; +} + +.toolbar GtkProgressBar.trough, +SugarPaletteWindowWidget GtkProgressBar.trough { + background-color: @black; } /* Separators */ @@ -575,10 +585,17 @@ SugarPaletteWindowWidget GtkToolButton .button { padding: $(toolbutton_padding)px; } +.toolbar GtkToolButton .button, +SugarPaletteWindowWidget GtkToolButton .button:prelight { + padding: $(toolbutton_padding - default_padding)px; + border-width: $(default_padding)px; + border-style: solid; + background-clip: padding-box; +} + .toolbar GtkToolButton .button:prelight, SugarPaletteWindowWidget GtkToolButton .button:prelight { background-color: @black; - border-radius: 0px; } .toolbar SugarRadioToolButton *:active, |