diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-07 16:13:22 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-07 16:13:22 -0700 |
| commit | c01a9839577a5fc3a8965713e206616edc586c74 (patch) | |
| tree | c9aa6cf42c2146bf5cee0a11a37ba6c93ef401d3 /view/theme/redbasic/php | |
| parent | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (diff) | |
| parent | d94f6f7c53fbb01a76a6d3beb14968d02ebb3afa (diff) | |
| download | volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.gz volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.bz2 volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index edf77cb0b..01ca5a7b9 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -109,6 +109,10 @@ if(! $a->install) { $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) $link_colour = "#428BCA"; + if (! $navaside_bghover) + $navaside_bghover = "#eee"; + if (! $link_font_weight) + $link_font_weight = "normal"; if (! $banner_colour) $banner_colour = "#fff"; if (! $search_background) @@ -320,7 +324,9 @@ $options = array ( '$navtabs_linkchover' => $navtabs_linkchover, '$navtabs_bgchover' => $navtabs_bgchover, '$navtabs_decohover' => $navtabs_decohover, +'$navaside_bghover' => $navaside_bghover, '$link_colour' => $link_colour, +'$link_font_weight' => $link_font_weight, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 2da04a389..2fbca2ef0 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -11,7 +11,7 @@ require_once('view/php/theme_init.php'); head_add_js('library/bootstrap/js/bootstrap.min.js'); head_add_js('library/bootstrap/js/bootbox.min.js'); -head_add_js('library/bootstrap-datetimepicker/js/moment.js'); +head_add_js('library/bootstrap-datetimepicker/js/moment.min.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); //head_add_js('library/colorpicker/js/colorpicker.js'); head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); |