From f9eddb89eff2601f8ef4318f16a8360296613935 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 22 Feb 2014 16:10:46 +0100 Subject: Add option for narrow navbar instead of the bootstrap default thick version --- view/theme/redbasic/css/narrow_navbar.css | 27 +++++++++++++++++++++++++++ view/theme/redbasic/php/config.php | 3 +++ view/theme/redbasic/php/style.php | 4 ++++ view/theme/redbasic/tpl/theme_settings.tpl | 1 + 4 files changed, 35 insertions(+) create mode 100644 view/theme/redbasic/css/narrow_navbar.css diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css new file mode 100644 index 000000000..51a0ec196 --- /dev/null +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -0,0 +1,27 @@ +.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} +.navbar {min-height:18px !important;} +nav img { +height: 25px; +width: 25px; +margin: 2px 0px 1px 10px; +border-radius: 0px; +} +.navbar-left{height: 30px;} +.container-fluid {min-height:30px;} +.collapse .navbar-collapse {min-height:30px; max-height:30px;} +#nav-search-text {margin:5px;} +header #banner {margin-top:5px;} +nav .dropdown-menu { +top: 30px;} +nav .badge { + position: relative; + top: -30px; + float: right; + font-size: 10px; + padding: 2px 6px; + cursor: pointer; +} +#jGrowl.top-right { + top: 30px; + right: 15px; +} \ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 68a72fffd..2235a9742 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -6,6 +6,7 @@ function theme_content(&$a) { $arr = array(); $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); + $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); $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' ); @@ -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', 'narrow_navbar', $_POST['redbasic_narrow_navbar']); 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']); @@ -97,6 +99,7 @@ if(feature_enabled(local_user(),'expert')) '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']), '$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']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8d5c23a03..901d06af7 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -14,6 +14,7 @@ if(! $a->install) { $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); // Load the owners pconfig + $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); @@ -213,3 +214,6 @@ echo str_replace(array_keys($options), array_values($options), $x); if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); } +if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { + echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); +} diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index cc573d99e..af2969397 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -5,6 +5,7 @@ {{if $expert}} {{* include file="field_select.tpl" field=$nav_colour *}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} -- cgit v1.2.3 From a5f70f6c10705c655ad31e906626ac3513da00fe Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 22 Feb 2014 20:30:41 +0100 Subject: little tweaks --- view/theme/redbasic/css/narrow_navbar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 51a0ec196..b05f46797 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,5 +1,5 @@ .navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} -.navbar {min-height:18px !important;} +.navbar {min-height:25px !important;} nav img { height: 25px; width: 25px; @@ -8,7 +8,7 @@ border-radius: 0px; } .navbar-left{height: 30px;} .container-fluid {min-height:30px;} -.collapse .navbar-collapse {min-height:30px; max-height:30px;} +.collapse .navbar-collapse {min-height:30px;} #nav-search-text {margin:5px;} header #banner {margin-top:5px;} nav .dropdown-menu { -- cgit v1.2.3