Merge pull request #231 from cvogeley/master

Add bootstrap framework to red

4 files changed, 73 insertions, 3 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
new file mode 100644
index 000000000..73c06fd4b
--- /dev/null
+++ b/view/css/bootstrap-red.css
@@ -0,0 +1,67 @@
+/* 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/css/conversation.css b/view/css/conversation.css
index bf8e0236e..5bf6a3607 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -37,7 +37,7 @@
 }
 
 #profile-jot-submit {
-	height: 30px;
+	height: 22px;
 	width: 70px;
 	float: right;
 }
diff --git a/view/css/default.css b/view/css/default.css
index deb39fbe2..27df38dee 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -30,5 +30,3 @@ section {
 	right: 15px;
 	padding-bottom: 350px;
 }
-
-
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 42badc01d..ffbc02e48 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.min.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');
@@ -10,8 +12,11 @@ head_add_css('library/prettyphoto/css/prettyPhoto.css');
 head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 head_add_css('view/css/conversation.css');
+head_add_css('view/css/bootstrap-red.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');