diff options
| author | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
| commit | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (patch) | |
| tree | 3746742dc12c2863c61c4c7cba8f4f9666590e49 /view/theme/diabook/config.php | |
| parent | 9663299da1be50eef4327778fae619fc6f9edef4 (diff) | |
| parent | 2170df897b9dc72b87cc104520f6a67ddfbb994f (diff) | |
| download | volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.gz volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.bz2 volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/diabook/config.php')
| -rw-r--r-- | view/theme/diabook/config.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index 9ff074e9d..2477bb3d3 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -53,6 +53,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ $line_heights = array( "1.3"=>"1.3", "---"=>"---", + "1.6"=>"1.6", "1.5"=>"1.5", "1.4"=>"1.4", "1.2"=>"1.2", @@ -60,11 +61,12 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ ); $font_sizes = array( - '13'=>'13', + '14'=>'14', "---"=>"---", + "16"=>"16", "15"=>"15", - '14'=>'14', - '13.5'=>'13.5', + '13.5'=>'13.5', + '13'=>'13', '12.5'=>'12.5', '12'=>'12', ); @@ -76,8 +78,10 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ 'diabook'=>'diabook', 'aerith'=>'aerith', 'blue'=>'blue', + 'green'=>'green', + 'pink'=>'pink', 'red'=>'red', - 'pink'=>'pink', + 'dark'=>'dark', ); |