diff --git a/common/header.php b/common/header.php index 1caf292..02814ee 100644 --- a/common/header.php +++ b/common/header.php @@ -20,14 +20,28 @@ $this)); ?> getUri($storage->getPathByType($background, 'theme_uploads')); - echo ''; + $background_uri = $storage->getUri($storage->getPathByType($background_image, 'theme_uploads')); + $background_image = 'url('.$background_uri.') '.$tile_style; + } + if ($background_color || $background_image) { + echo ''; } if ($logo_size = get_theme_option('logo_size')) { echo ''; diff --git a/config.ini b/config.ini index c41da98..157f934 100644 --- a/config.ini +++ b/config.ini @@ -1,12 +1,22 @@ [config] ;Appearance +background_color.type = "text" +background_color.options.label = "Background Color" +background_color.options.description = "The background colour, where there is no background image. Any CSS color can be used" +background_color.options.value = "#103c63" + background_image.type = "file" background_image.options.label = "Background Image" -background_image.options.description = "Choose an image file to use as a background for the area outside the content. This image will repeat hoizontally and vertically. If absent, the bavkground will be a solid colour" +background_image.options.description = "Choose an image file to use as a background for the area outside the content. If absent, the background will be a solid colour" background_image.options.validators.count.validator = "Count" background_image.options.validators.count.options.max = "1" +background_tile.type = "checkbox" +background_tile.options.label = "Tile Background Image" +background_tile.options.description = "The background image is a tile that will repeat hoizontally and vertically. If unchecked, the background image will show horizontally centred." +single_line_item.options.value = "1" + single_line_item.type = "checkbox" single_line_item.options.label = "Single Line Item" single_line_item.options.description = "Check this box if you wish items to appear as a list-like single line caption with more information available on mouse-over." @@ -144,7 +154,9 @@ still_image_type.options.value = "Still Image" [groups] head_foot.options.legend = "Page Design" +head_foot.elements[] = "background_color" head_foot.elements[] = "background_image" +head_foot.elements[] = "background_tile" head_foot.elements[] = "single_line_item" head_foot.elements[] = "sortable_shortcodes" head_foot.elements[] = "logo" diff --git a/css/sass/_base.scss b/css/sass/_base.scss index 2150475..cf90c05 100644 --- a/css/sass/_base.scss +++ b/css/sass/_base.scss @@ -3,8 +3,8 @@ $base-font-size: 12px; $base-line-height: 18px; -$title-stack: 'Copperplate', 'Playfair Display', "Palatino Linotype", "Book Antiqua", "Times New Roman", Times, serif; -$header-stack: 'Copperplate', 'Playfair Display', "Palatino Linotype", "Book Antiqua", "Times New Roman", Times, serif; +$title-stack: 'Copperplate', 'Balthazar', "Merriweather", serif; +$header-stack: 'Copperplate', 'Balthazar', "Merriweather", serif; $minor-header-stack: Raleway, Verdana, sans-serif; $base-font-stack: Raleway, Verdana, sans-serif; $monospace-stack: 'Courier New',Courier,'Lucida Sans Typewriter','Lucida Typewriter',monospace; diff --git a/css/style.css b/css/style.css index 10f9eb7..1dcaf1f 100644 --- a/css/style.css +++ b/css/style.css @@ -428,7 +428,7 @@ h1, h2, h3, h4, h5, h6 { h1, h2, h3 { color: #103cb1; - font-family: "Copperplate", "Playfair Display", "Palatino Linotype", "Book Antiqua", "Times New Roman", Times, serif; + font-family: "Copperplate", "Balthazar", "Merriweather", serif; font-weight: 400; } @@ -611,7 +611,7 @@ header:after { float: left; width: 50%; font-weight: 700; - font-family: "Copperplate", "Playfair Display", "Palatino Linotype", "Book Antiqua", "Times New Roman", Times, serif; + font-family: "Copperplate", "Balthazar", "Merriweather", serif; font-variant: small-caps; letter-spacing: .1ex; color: #cccccc; @@ -1146,7 +1146,7 @@ header:after { } } #home #content h2 { - font-family: "Copperplate", "Playfair Display", "Palatino Linotype", "Book Antiqua", "Times New Roman", Times, serif; + font-family: "Copperplate", "Balthazar", "Merriweather", serif; font-weight: normal; }