Codebase list sugar-artwork / fb23139
Merge branch 'upstream-git' into upstream Conflicts (merged manually): configure.ac Jonas Smedegaard 15 years ago
2 changed file(s) with 18 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all
0 AC_INIT([sugar-artwork],[0.79.3],[],[sugar-artwork])
0 AC_INIT([sugar-artwork],[0.81.1],[],[sugar-artwork])
11
22 AM_CONFIG_HEADER(config.h)
33
1919 icon_base = 11
2020 bullet_size = 9.5
2121 font_height = 24
22 default_padding = 7
22 default_padding = 6
2323 toolbutton_padding = 9
24 else: # About 50% smaller
24 else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
2525 xo = False
26 line_width = 1.0
27 thick_line_width = 1.75
28 subcell_size = 7
29 icon_base = 8
30 bullet_size = 5
31 font_height = 12
32 default_padding = 3
33 toolbutton_padding = 6
26 line_width = 2.0 # 1.62 rounded up
27 thick_line_width = 3.0 # 2.52
28 subcell_size = 11 # 10.8
29 icon_base = 8 # 7.92
30 bullet_size = 6.5 # 6.84
31 # This is a guess on the font size (Sans 10 at 96 DPI)
32 font_height = 17
33 default_padding = 4 # 4.32
34 toolbutton_padding = 6 # 7.68
3435
3536
3637 radio_size = my_floor(subcell_size + bullet_size + line_width)
366367 # "square" slider (really round of course)
367368 # Same as indicator-size?
368369 GtkRange::slider-width = $scale_slider_width
369 GtkScale::slider-toolbox-notebooklength = $scale_slider_width
370 GtkScale::slider-length = $scale_slider_width
370371 GtkRange::trough-border = 0
371372 GtkRange::stepper-spacing = 0
372373 GtkRange::trough-side-details = 1
695696 # The notebook is very high, so that everything is overriden
696697 # Only the color of the tab labels needs to be modified inside the
697698 # notebooks in this style (and the widget itself).
698 widget_class "*<GtkNotebook>*" style "notebook-tab"
699 # Assume that there is either just a normal label in the notebook tab, or
700 # it is inside a GtkBox (H- or VBox) together with eg. a close button.
701 widget_class "*<GtkNotebook>" style "notebook-tab"
702 widget_class "*<GtkNotebook>.<GtkLabel>" style "notebook-tab"
703 widget_class "*<GtkNotebook>.<GtkBox>.<GtkLabel>" style "notebook-tab"
699704
700705
701706 # SugarPalette and Menu