Merge branch 'bootstrap'

2 files changed, 71 insertions, 0 deletions

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 42badc01d..e0992f0f0 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -2,6 +2,8 @@
 
 require_once('include/plugin.php');
 
+head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
+head_add_css('library/bootstrap/css/bootstrap.css'); 
 head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
 head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
@@ -12,6 +14,8 @@ head_add_css('library/colorbox/colorbox.css');
 head_add_css('view/css/conversation.css');
 
 head_add_js('js/jquery.js');
+head_add_js('library/bootstrap/js/bootstrap.min.js');
+head_add_js('library/bootstrap/js/bootbox.min.js');
 head_add_js('js/jquery-migrate-1.1.1.js');
 //head_add_js('js/jquery-compat.js');
 head_add_js('js/spin.js');