Skip to content

Upgrade bootswatch to version 4 #1183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Upgrade bootswatch to version 4 #1183

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ee98fd
Upgraded to bootswatch 4.5.3
bechir Dec 23, 2020
5ff6c5a
Production build
bechir Dec 24, 2020
598ca78
Remove horizontal scroller in source code modal
bechir Dec 24, 2020
133a714
Fix typos & remove commented code
bechir Dec 30, 2020
5570a2a
Fix & integrate flatpickr
bechir Feb 5, 2021
3c712bc
Localize flatpickr globally
bechir Feb 5, 2021
7375e61
Use button instead of span
bechir Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions assets/js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import '../scss/admin.scss';
import 'eonasdan-bootstrap-datetimepicker';
import 'typeahead.js';
import Bloodhound from "bloodhound-js";
import 'bootstrap-tagsinput';

$(function() {
// Datetime picker initialization.
// See https://eonasdan.github.io/bootstrap-datetimepicker/
$('[data-toggle="datetimepicker"]').datetimepicker({
icons: {
time: 'fa fa-clock-o',
date: 'fa fa-calendar',
up: 'fa fa-chevron-up',
down: 'fa fa-chevron-down',
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-check-circle-o',
clear: 'fa fa-trash',
close: 'fa fa-remove'
}
});
// $('[data-toggle="datetimepicker"]').datetimepicker({
// icons: {
// time: 'fa fa-clock-o',
// date: 'fa fa-calendar',
// up: 'fa fa-chevron-up',
// down: 'fa fa-chevron-down',
// previous: 'fa fa-chevron-left',
// next: 'fa fa-chevron-right',
// today: 'fa fa-check-circle-o',
// clear: 'fa fa-trash',
// close: 'fa fa-remove'
// }
// });

// Bootstrap-tagsinput initialization
// https://bootstrap-tagsinput.github.io/bootstrap-tagsinput/examples/
Expand Down Expand Up @@ -57,7 +56,7 @@ $(document).on('submit', 'form[data-confirmation]', function (event) {
.on('click', '#btnYes', function () {
$confirm.data('result', 'yes');
$form.find('input[type="submit"]').attr('disabled', 'disabled');
$form.submit();
$form.trigger('submit');
})
.modal('show');
}
Expand Down
11 changes: 6 additions & 5 deletions assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import '../scss/app.scss';

// loads the Bootstrap jQuery plugins
import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
// import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
import 'bootstrap/js/dist/alert';
import 'bootstrap/js/dist/alert';
import 'bootstrap/js/dist/collapse';
import 'bootstrap/js/dist/dropdown';
import 'bootstrap/js/dist/modal';
import 'jquery'

// loads the code syntax highlighting library
Expand Down
8 changes: 4 additions & 4 deletions assets/js/highlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import hljs from 'highlight.js/lib/highlight';
import highlight from 'highlight.js/lib/core';
import php from 'highlight.js/lib/languages/php';
import twig from 'highlight.js/lib/languages/twig';

hljs.registerLanguage('php', php);
hljs.registerLanguage('twig', twig);
highlight.registerLanguage('php', php);
highlight.registerLanguage('twig', twig);

hljs.initHighlightingOnLoad();
highlight.initHighlightingOnLoad();
16 changes: 16 additions & 0 deletions assets/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// setting the value of this variable to an empty data URL is the only working solution
// to load the Bootswatch web fonts locally and avoid loading them from Google servers
// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
$web-font-path: 'data:text/css;base64,';

// Make sure the lato font is resolved correctly
$lato-font-path: '~lato-font/fonts';

$font-default: 17px;
$font-heading: 2.5rem;
$font-title: 1.85rem;

$secondary-color: #ecf0f1;
$gray-7500: #e9ecec;

@import "~bootswatch/dist/flatly/variables";
13 changes: 11 additions & 2 deletions assets/scss/admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~bootswatch/flatly/variables";
@import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
@import "variables";
// @import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
@import "bootstrap-tagsinput.scss";

/* Page: 'Backend post index'
Expand All @@ -24,3 +24,12 @@ body#admin_post_show .post-tags .label-default {
body#admin_post_show .post-tags .label-default i {
color: #95A6A7;
}

.form-control {
border-width: .125rem;

&:focus {
color: $blue;
box-shadow: none;
}
}
Loading