harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup.

Browse Source
This commit is contained in:
Mario Vavti
2015-03-27 11:52:59 +01:00
parent 1bf93916db
commit b59e2870ab
9 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
view/theme/redbasic/css/style.css
View File

@@ -2214,15 +2214,19 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
}
/* Modified original CSS to match input in Redbasic */
.bootstrap-tagsinput {
.jothidden .bootstrap-tagsinput {
border-color:#fff;
background-color: #fff;
box-shadow: none;
display: inline-block;
border-radius: $radiuspx;
cursor: text;
padding: 0 6px;
width: 70% !important;
padding: 0px 8px;
width: 100%;
}
.bootstrap-tagsinput .label {
font-size: 100%;
}
.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
@@ -2305,9 +2309,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
right: 0px;
background-color: #337AB7;
}
.label-info {
background-color: #337AB7;
}
.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important;

6
view/theme/redbasic/js/redbasic.js
View File

@@ -34,6 +34,10 @@ $(document).ready(function() {
if($('#tabs-collapse-1').length === 0) {
$('#expand-tabs').hide();
}
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary'
});
});
$(document).ready(function(){
@@ -48,4 +52,4 @@ $(document).ready(function(){
}
}
setInterval(function () {checkNotify();}, 10 * 1000);
});
});

4
view/theme/redbasic/php/theme_init.php
View File

@@ -1,7 +1,8 @@
<?php
head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('library/datetimepicker/jquery.datetimepicker.css');
//head_add_css('library/colorpicker/css/colorpicker.css');
@@ -10,6 +11,7 @@ require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootbox/bootbox.min.js');
head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('library/datetimepicker/jquery.datetimepicker.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');