diff options
author | Mario Vavti <mario@mariovavti.com> | 2015-03-27 11:52:59 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2015-03-27 11:52:59 +0100 |
commit | b59e2870ab47dab424d043dd51f70d427d92d7a5 (patch) | |
tree | 8b35bb51d3f6132750a20a70289006b121840c01 /view/theme/redbasic | |
parent | 1bf93916dbf22ba8e51261c5f364781ee3c9bcc2 (diff) | |
download | volse-hubzilla-b59e2870ab47dab424d043dd51f70d427d92d7a5.tar.gz volse-hubzilla-b59e2870ab47dab424d043dd51f70d427d92d7a5.tar.bz2 volse-hubzilla-b59e2870ab47dab424d043dd51f70d427d92d7a5.zip |
Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup.
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
-rw-r--r-- | view/theme/redbasic/js/redbasic.js | 6 | ||||
-rw-r--r-- | view/theme/redbasic/php/theme_init.php | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ca324a89e..647fcda34 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c825b0485..68190778c 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -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); -});
\ No newline at end of file +}); diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 498d1ee15..3179c7078 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -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'); |