Skip to content

Commit b3cc34e

Browse files
lucianoratamerolucianoratamero
committed
Merge branch 'feature/homepage' into develop
2 parents 7614691 + 9e87b90 commit b3cc34e

111 files changed

Lines changed: 13726 additions & 9 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/settings.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
'django.contrib.auth.middleware.AuthenticationMiddleware',
3131
'django.contrib.messages.middleware.MessageMiddleware',
3232
'django.middleware.clickjacking.XFrameOptionsMiddleware',
33+
'django.middleware.gzip.GZipMiddleware',
34+
'pipeline.middleware.MinifyHTMLMiddleware',
3335
]
3436

3537
TEMPLATES = [
@@ -115,9 +117,20 @@
115117
'output_filename': 'css/main.css',
116118
},
117119
},
118-
}
120+
'JAVASCRIPT': {
121+
'main': {
122+
'source_filenames': (
123+
'js/jquery-3.3.1.min.js',
124+
'bootstrap/javascripts/bootstrap.min.js',
125+
),
126+
'output_filename': 'js/main.min.js',
127+
}
128+
}}
119129
PIPELINE['COMPILERS'] = ('libsasscompiler.LibSassCompiler',)
120130

131+
PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
132+
PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
133+
121134

122135
# Internationalization
123136
# https://docs.djangoproject.com/en/2.0/topics/i18n/

‎core/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.eot‎

19.7 KB
Binary file not shown.

‎core/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.svg‎

Lines changed: 288 additions & 0 deletions
Loading

‎core/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.ttf‎

44.3 KB
Binary file not shown.

‎core/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.woff‎

22.9 KB
Binary file not shown.

‎core/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.woff2‎

17.6 KB
Binary file not shown.

‎core/static/bootstrap/images/.keep‎

Whitespace-only changes.

‎core/static/bootstrap/javascripts/bootstrap-sprockets.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//= require ./bootstrap/transition
2+
//= require ./bootstrap/alert
3+
//= require ./bootstrap/button
4+
//= require ./bootstrap/carousel
5+
//= require ./bootstrap/collapse
6+
//= require ./bootstrap/dropdown
7+
//= require ./bootstrap/modal
8+
//= require ./bootstrap/tab
9+
//= require ./bootstrap/affix
10+
//= require ./bootstrap/scrollspy
11+
//= require ./bootstrap/tooltip
12+
//= require ./bootstrap/popover

0 commit comments

Comments
 (0)