1 files changed, 216 insertions, 15 deletions

diff --git a/sugar-theme.css b/sugar-theme.css
index d275a4c..d4134d3 100644
--- a/sugar-theme.css
+++ b/sugar-theme.css
@@ -1,11 +1,20 @@
+* {
 
+    -GtkCheckButton-indicator-size: 26; /* $radio_size */
+
+}
 
 GtkButton {
-    color: #ffffff;
+    color: @white;
     padding: 4;
     -GtkButton-inner-border: 4 4 4 4;
 }
 
+GtkButton:active:focus:hover {
+    color: @black;
+    background-color: @white;
+}
+
 .entry {
     border-width: 0;
     padding: 6;  /* $default_padding */
@@ -18,21 +27,29 @@ GtkButton {
 
 GtkToggleButton:active {
     background-color: @white;
-    color: @black; /* FIXME */
 }
 
-
-GtkToggleButton:active GtkLabel:active{
-    background-color: @white;
+GtkToggleButton:active GtkLabel:active {
     color: @black;
 }
 
-SugarToggleToolButton:active {
-    background-color: #C0C0C0; /* FIXME */
+/* toolbar */
+
+.toolbar GtkToolButton .button {
+    border-radius: 6;
+    padding: 6;
+}
+
+.toolbar GtkToggleButton:active {
+    background-color: @selection_grey;
+}
+
+.toolbar GtkToolButton .button:prelight {
+    background-color: @black;
 }
 
 GtkRadioButton, GtkCheckButton {
-    color: #000000;
+    color: @black;
     border-radius: 10;
 }
 
@@ -41,13 +58,6 @@ GtkCheckButton:prelight {
     background-color: @selection_grey;
 }
 
-GtkRadioButton:active,
-GtkCheckButton:active {
-    border-style: solid;
-    border-color: @white;
-    border-width: 2;
-}
-
 GtkVSeparator, GtkHSeparator {
     color: @button_grey;
 }
@@ -65,6 +75,10 @@ GtkComboBox {
     color: @white;
 }
 
+GtkComboBox .separator {
+    color: alpha(@theme_base_color, 0.0);
+}
+
 /* FIXME
 GtkMenu {
     background-color: #000000;
@@ -75,3 +89,190 @@ GtkMenu:active {
     background-color: #808080;
 }
 */
+
+/* check */
+
+.check,
+.check row:selected,
+.check row:selected:focused {
+    background-image: url("assets/checkbox-unchecked.svg");
+}
+
+.check:selected,
+.check:selected row:selected,
+.check:selected row:selected:focused {
+    background-image: url("assets/checkbox-unchecked-selected.svg");
+}
+
+.check:insensitive,
+.check row:selected:insensitive,
+.check row:selected:focused:insensitive {
+}
+
+.check:active,
+.check row:selected:active,
+.check row:selected:focused:active {
+    background-image: url("assets/checkbox-checked.svg");
+}
+
+.check:active:selected,
+.check:selected row:selected:active,
+.check:selected row:selected:focused:active {
+    background-image: url("assets/checkbox-checked-selected.svg");
+}
+
+.check:active:insensitive,
+.check row:selected:active:insensitive,
+.check row:selected:focused:active:insensitive {
+}
+
+.check:inconsistent,
+.check row:selected:inconsistent,
+.check row:selected:focused:inconsistent {
+}
+
+.check:inconsistent:insensitive,
+.check row:selected:inconsistent:insensitive,
+.check row:selected:focused:inconsistent:insensitive {
+}
+
+/* radio */
+
+.radio,
+.radio row:selected,
+.radio row:selected:focused {
+    background-image: url("assets/radio.svg");
+}
+
+.radio:selected,
+.radio:selected row:selected,
+.radio:selected row:selected:focused {
+    background-image: url("assets/radio-selected.svg");
+}
+
+.radio:insensitive,
+.radio row:selected:insensitive,
+.radio row:selected:focused:insensitive {
+}
+
+.radio:active,
+.radio row:selected:active,
+.radio row:selected:focused:active {
+    background-image: url("assets/radio-active.svg");
+}
+
+.radio:active:selected,
+.radio:selected row:selected:active,
+.radio:selected row:selected:focused:active {
+    background-image: url("assets/radio-active-selected.svg");
+}
+
+.radio:active:insensitive,
+.radio row:selected:active:insensitive,
+.radio row:selected:focused:active:insensitive {
+}
+
+.radio:active:insensitive,
+.radio row:selected:active:insensitive,
+.radio row:selected:focused:active:insensitive {
+}
+
+.radio:inconsistent,
+.radio row:selected:inconsistent,
+.radio row:selected:focused:inconsistent {
+}
+
+.radio:inconsistent:insensitive,
+.radio row:selected:inconsistent:insensitive,
+.radio row:selected:focused:inconsistent:insensitive {
+}
+
+/* GtkScale */
+
+GtkScale {
+    -GtkScale-slider-length: 32; /* $scale_slider_width */
+    -GtkRange-slider-width: 32; /* $scale_slider_width */
+}
+
+GtkScale.trough {
+    border-width: 2;
+    border-radius: 30;
+    border-style: solid;
+    border-color: @button_grey;
+    background-color: @button_grey;
+}
+
+/*
+
+FIXME - :active selection is not working
+
+GtkScale.trough:active {
+    border-color: @white;
+}
+
+*/
+
+GtkScale.slider {
+    border-width: 0;
+    border-radius: 0;
+    border-style: none;
+    color: alpha(@theme_base_color, 0.0);
+    background-color: alpha(@theme_base_color, 0.0);
+    background-image: url("assets/scale-slider.svg");
+}
+
+GtkScale.slider:active {
+    background-image: url("assets/scale-slider-active.svg");
+}
+
+GtkScale.slider:insensitive {
+}
+
+Sugar3PaletteWindow.background {
+    background-color: @black;
+}
+
+Sugar3PaletteWindow GtkLabel {
+    color: @white;
+}
+
+/* spinbutton */
+
+/*
+
+FIXME - wait for gnome 3.3.3 (19th december)
+
+.spinbutton.button {
+    color: alpha(@theme_base_color, 0.0);
+    background-color: alpha(@theme_base_color, 0.0);
+    border-width: 0;
+    border-radius: 0;
+    border-style: none;
+    padding-left: 20;
+}
+
+.spinbutton.button.arrow:nth-child(first) {
+    background-image: url("assets/spinbutton-button-up.svg");
+}
+
+.spinbutton.button.arrow:nth-child(last) {
+    background-image: url("assets/spinbutton-button-down.svg");
+}
+
+*/
+
+/* notebook */
+
+/*
+
+FIXME not in the repo yet?
+
+.notebook tab {
+    color: #f00;
+}
+
+.notebook tab:active {
+    color: #0f0;
+}
+
+*/