Skip to content

Commit cebe7ef

Browse files
committed
Update materialize.css to master, add perfect scrollbar to the admin
1 parent 30e4f1b commit cebe7ef

6 files changed

Lines changed: 863 additions & 483 deletions

File tree

gulpfile.babel.js

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import autoprefixer from 'autoprefixer'
2+
import concat from 'gulp-concat'
23
import gulp from 'gulp'
4+
import merge from 'merge-stream'
35
import postcss from 'gulp-postcss'
46
import sass from 'gulp-sass'
5-
import merge from 'merge-stream'
67

78
var supportedBrowsers = [
89
'Chrome >= 50',
@@ -28,7 +29,7 @@ gulp.task('3rdparty.js', () => {
2829
'node_modules/datatables.net-responsive/js/dataTables.responsive.js',
2930
'node_modules/datatables/media/js/jquery.dataTables.js',
3031
'node_modules/jquery-datetimepicker/build/jquery.datetimepicker.full.js',
31-
'node_modules/materialize-css/dist/js/materialize.js',
32+
// 'node_modules/materialize-css/dist/js/materialize.js',
3233
'node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.js',
3334
'node_modules/turbolinks/dist/turbolinks.js'
3435
]
@@ -48,6 +49,45 @@ gulp.task('3rdparty.css', () => {
4849
.pipe(gulp.dest('./material/static/material/css/'))
4950
})
5051

52+
53+
gulp.task('materialize.js', () => {
54+
var deps = [
55+
"node_modules/materialize-css/js/initial.js",
56+
"node_modules/materialize-css/js/jquery.easing.1.3.js",
57+
"node_modules/materialize-css/js/animation.js",
58+
"node_modules/materialize-css/js/velocity.min.js",
59+
"node_modules/materialize-css/js/hammer.min.js",
60+
"node_modules/materialize-css/js/jquery.hammer.js",
61+
"node_modules/materialize-css/js/global.js",
62+
"node_modules/materialize-css/js/collapsible.js",
63+
"node_modules/materialize-css/js/dropdown.js",
64+
"node_modules/materialize-css/js/modal.js",
65+
"node_modules/materialize-css/js/materialbox.js",
66+
"node_modules/materialize-css/js/parallax.js",
67+
"node_modules/materialize-css/js/tabs.js",
68+
"node_modules/materialize-css/js/tooltip.js",
69+
"node_modules/materialize-css/js/waves.js",
70+
"node_modules/materialize-css/js/toasts.js",
71+
"node_modules/materialize-css/js/sideNav.js",
72+
"node_modules/materialize-css/js/scrollspy.js",
73+
"node_modules/materialize-css/js/forms.js",
74+
"node_modules/materialize-css/js/slider.js",
75+
"node_modules/materialize-css/js/cards.js",
76+
"node_modules/materialize-css/js/chips.js",
77+
"node_modules/materialize-css/js/pushpin.js",
78+
"node_modules/materialize-css/js/buttons.js",
79+
"node_modules/materialize-css/js/transitions.js",
80+
"node_modules/materialize-css/js/scrollFire.js",
81+
"node_modules/materialize-css/js/date_picker/picker.js",
82+
"node_modules/materialize-css/js/date_picker/picker.date.js",
83+
"node_modules/materialize-css/js/character_counter.js",
84+
"node_modules/materialize-css/js/carousel.js",
85+
]
86+
return gulp.src(deps)
87+
.pipe(concat('materialize.js'))
88+
.pipe(gulp.dest('./material/static/material/js/'));
89+
})
90+
5191
gulp.task('materialize.scss', () => {
5292
return gulp.src('./material/static/material/sass/*.scss')
5393
.pipe(sass({
@@ -87,5 +127,6 @@ gulp.task('default', [
87127
'3rdparty.js',
88128
'3rdparty.css',
89129
'materialize.scss',
90-
'materialize.django.scss'
130+
'materialize.django.scss',
131+
'materialize.js'
91132
])

material/admin/templates/admin/includes/material_css.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<link href="{% static 'material/css/jquery.datetimepicker.css' %}" rel="stylesheet">
66
<link href="{% static 'material/css/responsive.dataTables.css' %}" rel="stylesheet">
77
<link href="{% static 'material/css/fixedHeader.dataTables.css' %}" rel="stylesheet">
8+
<link href="{% static 'material/css//perfect-scrollbar.css' %}" rel="stylesheet" />
89
<link href="{% block stylesheet %}{% static 'material/css/materialize.admin.css' %}{% endblock %}" rel="stylesheet" type="text/css" />
910
<link href="{% block extraicons %}{% static 'admin/css/icons.css' %}" rel="stylesheet" type="text/css" />{% endblock %}

material/admin/templates/admin/includes/material_js.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<script src="{% static 'material/js/jquery.dataTables.js' %}"></script>
55
<script src="{% static 'material/js/dataTables.responsive.js' %}"></script>
66
<script src="{% static 'material/js/dataTables.fixedHeader.js' %}"></script>
7+
<script src="{% static 'material/js/perfect-scrollbar.jquery.js' %}"></script>
78
<script src="{% static 'material/js/materialize.js' %}"></script>
89
<script src="{% static 'material/js/materialize.forms.js' %}"></script>
910
<script src="{% static 'material/js/materialize.admin.js' %}"></script>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
$(document).on('ready', function() {
2-
$(document).find('.button-collapse').sideNav();
2+
$('.button-collapse').sideNav()
3+
$('#slide-out').perfectScrollbar()
34
});

material/static/material/js/materialize.js

Lines changed: 814 additions & 479 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"datatables.net-responsive-dt": "^2.1.0",
1616
"gulp": "^3.9.1",
1717
"gulp-babel": "^6.1.2",
18+
"gulp-concat": "^2.6.0",
1819
"gulp-postcss": "^6.1.1",
1920
"gulp-sass": "^2.3.2",
2021
"jquery-datetimepicker": "^2.5.4",

0 commit comments

Comments
 (0)