diff options
| author | friendica <info@friendica.com> | 2014-02-01 20:47:19 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-01 20:47:19 -0800 |
| commit | a9ceeff988235d2ae16c2f9683a3fe210e956645 (patch) | |
| tree | 3aba0320fb2b3002014862035a698b963348c085 | |
| parent | 8e8b49d18c9dfe8190f7cc392f01f85202c5107e (diff) | |
| parent | de412abe88a697f08755f09694fd16f9230482cb (diff) | |
| download | volse-hubzilla-a9ceeff988235d2ae16c2f9683a3fe210e956645.tar.gz volse-hubzilla-a9ceeff988235d2ae16c2f9683a3fe210e956645.tar.bz2 volse-hubzilla-a9ceeff988235d2ae16c2f9683a3fe210e956645.zip | |
Merge pull request #296 from tazmandevil/master
link color
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 02832b5f0..1a36c1c43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -40,11 +40,11 @@ abbr { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #0080FF; + color: $link_colour; text-decoration: none; } -a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } +a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; } .fakelink { cursor: pointer; @@ -2449,4 +2449,4 @@ img.mail-list-sender-photo { .online-now { color: red; cursor: pointer; -}
\ No newline at end of file +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 20355197f..d6adf5381 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -7,6 +7,7 @@ function theme_content(&$a) { $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); @@ -33,6 +34,7 @@ function theme_post(&$a) { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); + set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); @@ -88,6 +90,7 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9956ccd31..fcb762891 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -13,6 +13,7 @@ // Load the owners pconfig $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); @@ -63,6 +64,8 @@ $nav_bg_3 = "#f00"; $nav_bg_4 = "#b00"; } + if (! $link_colour) + $link_colour = "#7b0000"; if (! $banner_colour) $banner_colour = "fff"; if (! $bgcolour) @@ -141,6 +144,7 @@ $options = array ( '$nav_bg_2' => $nav_bg_2, '$nav_bg_3' => $nav_bg_3, '$nav_bg_4' => $nav_bg_4, +'$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index e0f546896..ca05986a2 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -6,6 +6,7 @@ {{if $expert}} {{include file="field_select.tpl" field=$nav_colour}} {{include file="field_input.tpl" field=$banner_colour}} +{{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} {{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$item_colour}} |