override bootstrap in bootstrap-red

so theme developers are not forced to change anything
This commit is contained in:
Christian Vogeley 2013-12-08 18:49:48 +01:00
parent 5aa6b69320
commit 2dfd65f90b
3 changed files with 68 additions and 69 deletions

67
view/css/bootstrap-red.css vendored Normal file
View File

@ -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;
}

View File

@ -30,72 +30,3 @@ section {
right: 15px; right: 15px;
padding-bottom: 350px; 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;
}

View File

@ -12,6 +12,7 @@ head_add_css('library/prettyphoto/css/prettyPhoto.css');
head_add_css('library/colorbox/colorbox.css'); head_add_css('library/colorbox/colorbox.css');
// head_add_css('library/font_awesome/css/font-awesome.min.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('view/css/conversation.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('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js'); head_add_js('library/bootstrap/js/bootstrap.min.js');