Gtk3: Use theme colors for ruler. Reduce size of spin buttons.

(bzr r14881)

1 files changed, 48 insertions, 9 deletions

diff --git a/share/ui/style.css b/share/ui/style.css
index 3ee6f7450..091cfc319 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -4,16 +4,32 @@
 /*
  * Keep in order of:
  *   General -> Specific
- *   Order of default appearance
- *     Top -> Bottom (e.g. Selector Tool, Node Tool, ...)
- *     Left -> Right
+ *   Order of appearance in widget tree.
+ *   See GtkInspector
+ *     GTK_DEBUG=interactive ~/path_to_gtk3/bin/inkscape
  *
  * We need a standardized naming scheme.
  *
  * As of Gtk 3.20, you cannot use widget names.
  */
 
-/* Lightest to darkest based on linear rgb */
+/* Standard theme based colors. Prefer these.
+ *
+ * @theme_bg_color
+ * @theme_fg_color
+ * @theme_base_color
+ * @theme_text_color
+ * @theme_selected_bg_color
+ * @theme_selected_fg_color
+ * @theme_tooltip_bg_color
+ * @theme_tooltip_fg_color
+ *
+ */
+
+
+/* Our own custom shades... better not to use.
+ * Lightest to darkest based on linear rgb.
+ */
 @define-color bg_color0  #ffffff; /* White */
 @define-color bg_color05 #f8f8f8; /* Slightly off white */
 @define-color bg_color1  #f0f0f0;
@@ -25,22 +41,45 @@
 @define-color bg_color7  #636363;
 @define-color bg_color8  #000000; /* Black */
 
+/* Gtk  <= 3.18 */
 GtkWidget {
 /*    font-size: 12pt; */
 }
 
-/* Gtk  <= 3.18 */
+/* Gtk  >= 3.19.2 */
+widget {
+/*    font-size: 12pt; */
+}
+
+GtkSpinButton {
+    padding: 0;
+}
+
+spinbutton {
+    padding: 0;
+}
+
+GtkSpinButton.entry {
+    padding-left: 2px;
+}
+
+spinbutton.entry {
+    padding-left: 2px;
+}
+
 SPRuler {
-    background-color: @bg_color05;
+    background-color: @theme_bg_color;
+    color:            @theme_fg_color;
 }
 
-/* Gtk  > 3.18 */
 ruler-widget {
-    background-color: @bg_color05;
+    background-color: @theme_bg_color;
+    color:            @theme_fg_color;
 }
 
+/* The actual canvas (Inkscape's drawing area). */
 SPCanvas {
-    background-color: @bg_color0;
+    background-color: white;
 }
 
 combobox window.popup scrolledwindow treeview separator {