Skip to content

Commit 9758c24

Browse files
bechiratierant
authored andcommitted
Upgraded to bootswatch 4.5.3
1 parent 821812d commit 9758c24

22 files changed

+319
-162
lines changed

assets/admin.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
import './styles/admin.scss';
2-
import 'eonasdan-bootstrap-datetimepicker';
32
import 'typeahead.js';
43
import Bloodhound from "bloodhound-js";
54
import 'bootstrap-tagsinput';
65

76
$(function() {
87
// Datetime picker initialization.
98
// See https://eonasdan.github.io/bootstrap-datetimepicker/
10-
$('[data-toggle="datetimepicker"]').datetimepicker({
11-
icons: {
12-
time: 'fa fa-clock-o',
13-
date: 'fa fa-calendar',
14-
up: 'fa fa-chevron-up',
15-
down: 'fa fa-chevron-down',
16-
previous: 'fa fa-chevron-left',
17-
next: 'fa fa-chevron-right',
18-
today: 'fa fa-check-circle-o',
19-
clear: 'fa fa-trash',
20-
close: 'fa fa-remove'
21-
}
22-
});
9+
// $('[data-toggle="datetimepicker"]').datetimepicker({
10+
// icons: {
11+
// time: 'fa fa-clock-o',
12+
// date: 'fa fa-calendar',
13+
// up: 'fa fa-chevron-up',
14+
// down: 'fa fa-chevron-down',
15+
// previous: 'fa fa-chevron-left',
16+
// next: 'fa fa-chevron-right',
17+
// today: 'fa fa-check-circle-o',
18+
// clear: 'fa fa-trash',
19+
// close: 'fa fa-remove'
20+
// }
21+
// });
2322

2423
// Bootstrap-tagsinput initialization
2524
// https://bootstrap-tagsinput.github.io/bootstrap-tagsinput/examples/
@@ -57,7 +56,7 @@ $(document).on('submit', 'form[data-confirmation]', function (event) {
5756
.on('click', '#btnYes', function () {
5857
$confirm.data('result', 'yes');
5958
$form.find('input[type="submit"]').attr('disabled', 'disabled');
60-
$form.submit();
59+
$form.trigger('submit');
6160
})
6261
.modal('show');
6362
}

assets/app.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import './styles/app.scss';
22

33
// loads the Bootstrap jQuery plugins
4-
import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
5-
import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
6-
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
7-
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
8-
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
4+
// import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
5+
import 'bootstrap/js/dist/alert';
6+
import 'bootstrap/js/dist/alert';
7+
import 'bootstrap/js/dist/collapse';
8+
import 'bootstrap/js/dist/dropdown';
9+
import 'bootstrap/js/dist/modal';
910
import 'jquery'
1011

1112
// loads the code syntax highlighting library

assets/styles/admin.scss

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "~bootswatch/flatly/variables";
2-
@import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
1+
@import "variables";
2+
// @import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
33
@import "bootstrap-tagsinput.scss";
44

55
/* Page: 'Backend post index'
@@ -24,3 +24,12 @@ body#admin_post_show .post-tags .label-default {
2424
body#admin_post_show .post-tags .label-default i {
2525
color: #95A6A7;
2626
}
27+
28+
.form-control {
29+
border-width: .125rem;
30+
31+
&:focus {
32+
color: $blue;
33+
box-shadow: none;
34+
}
35+
}

0 commit comments

Comments
 (0)