From 18defb2984db8447a43de6bcffb3bdc5e596a8e0 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 15:26:02 +0100 Subject: Include bootstrap --- view/css/default.css | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ view/php/theme_init.php | 21 +++++++++++++--- 2 files changed, 85 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/css/default.css b/view/css/default.css index deb39fbe2..eb39b31d5 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -32,3 +32,70 @@ section { } +/* override some bootstrap settings */ +*, +*:before, +*:after { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +html { +font-size: 100%; +} + +.panel-body .form-control{ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.profile-jot-text{ + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + + +h1, +.h1 { + font-size: 24px; +} + +h2, +.h2 { + font-size: 18px; +} + +h3, +.h3 { + font-size: 16px; +} + +h4, +.h4 { + font-size: 14px; +} + +h5, +.h5 { + font-size: 12px; +} + +h6, +.h6 { + font-size: 10px; +} +textarea { +line-height: initial; +} + +.radio, .checkbox{ +padding-left: 0px; +margin-left: 0px; +} + +.checkbox input[type="checkbox"], inline input[type="checkbox"]{ +float:none; +margin-left:0px; +} diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0867c989d..f2f0af5f1 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,19 +1,22 @@ get_channel(); +if($channel && file_exists($channel['channel_address'] . '.js')) + head_add_js('/' . $channel['channel_address'] . '.js'); -- cgit v1.2.3