aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-12-08 18:49:48 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-12-08 18:49:48 +0100
commit2dfd65f90b23e92da692311f2c5b7c6503e0ce25 (patch)
tree0255a9d7a6a76687aead4dee5832773ab9d5235e /view
parent5aa6b69320c1e53e184361490cb13e3710fbe539 (diff)
downloadvolse-hubzilla-2dfd65f90b23e92da692311f2c5b7c6503e0ce25.tar.gz
volse-hubzilla-2dfd65f90b23e92da692311f2c5b7c6503e0ce25.tar.bz2
volse-hubzilla-2dfd65f90b23e92da692311f2c5b7c6503e0ce25.zip
override bootstrap in bootstrap-red
so theme developers are not forced to change anything
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css67
-rw-r--r--view/css/default.css69
-rw-r--r--view/php/theme_init.php1
3 files changed, 68 insertions, 69 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/default.css b/view/css/default.css
index eb39b31d5..27df38dee 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -30,72 +30,3 @@ section {
right: 15px;
padding-bottom: 350px;
}
-
-
-/* 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 e0992f0f0..e2c536812 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -12,6 +12,7 @@ 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');