mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-25 19:14:03 +03:00
Revert "Node.JS + docker-compose = ♥" (#1206)
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)" This reverts commitcabcc7b106. * Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)" This reverts commit83c8594203. * Revert "Fix index.rst sphinx warnings (#1166)" This reverts commit51dd0b5e73. * Revert "Pin mailhog Docker image to v1.0.0 (#1201)" This reverts commitd9f870461b. * Revert "Node.JS + docker-compose = ♥ (#1128)" This reverts commit4b06fe3958.
This commit is contained in:
Shupeyko Nikita
GitHub
parent
cabcc7b106
commit
1f7be4eb57
|
|
@ -6,8 +6,6 @@ Getting Up and Running Locally With Docker
|
|||
The steps below will get you up and running with a local development environment.
|
||||
All of these commands assume you are in the root of your generated project.
|
||||
|
||||
.. _devlocdocker-prereq:
|
||||
|
||||
Prerequisites
|
||||
-------------
|
||||
|
||||
|
|
@ -33,9 +31,6 @@ Currently PostgreSQL (``psycopg2`` python package) is not installed inside Docke
|
|||
|
||||
Doing this will prevent the project from being installed in an Windows-only environment (thus without usage of Docker). If you want to use this project without Docker, make sure to remove ``psycopg2`` from the requirements again.
|
||||
|
||||
|
||||
.. _devlocdocker-build-the-stack:
|
||||
|
||||
Build the Stack
|
||||
---------------
|
||||
|
||||
|
|
@ -46,9 +41,6 @@ on your development system::
|
|||
|
||||
If you want to build the production environment you don't have to pass an argument -f, it will automatically use docker-compose.yml.
|
||||
|
||||
|
||||
.. _devlocdocker-boot-the-system:
|
||||
|
||||
Boot the System
|
||||
---------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
Gulp with Docker
|
||||
================
|
||||
|
||||
.. index:: gulp, gulpjs, gulpfile, gulpfilejs, docker, docker-compose
|
||||
|
||||
`Gulp`_ support is provided out-of-the-box, ready for use as-is, or with any kind of customizations suiting the specific needs of the project.
|
||||
|
||||
.. _`Gulp`: http://gulpjs.com/
|
||||
|
||||
*All paths are relative to the generated project's root.*
|
||||
|
||||
|
||||
Prerequisites
|
||||
-------------
|
||||
|
||||
- These :ref:`nodewithdocker-prereq` are satisfied.
|
||||
|
||||
|
||||
Overview
|
||||
--------
|
||||
|
||||
:ref:`nodewithdocker-overview` Node.js integration details first to get the whole picture.
|
||||
|
||||
Essential aspects of Gulp integration are
|
||||
|
||||
- :code:`./gulpfile.js` with Gulp tasks defined;
|
||||
- :code:`./{{ cookiecutter.project_slug }}/static/build/` (build directory) with static assets built via Gulp.
|
||||
|
||||
Let us take a closer look at :code:`./gulpfile.js`:
|
||||
|
||||
- paths to static assets are provided by :code:`pathsConfig()`;
|
||||
- for clarity, related tasks are grouped by :code:`region`:
|
||||
- :code:`images`:
|
||||
- :code:`images`: run image-related tasks in parallel, namely:
|
||||
- :code:`favicons-images`: process favicon images only;
|
||||
- :code:`nonfavicons-images`: process all images except for favicons.
|
||||
- :code:`scripts`:
|
||||
- :code:`scripts`: run script-related tasks in sequence, namely:
|
||||
- :code:`js-scripts`: process js scripts.
|
||||
- :code:`styles`:
|
||||
- :code:`styles`: run script-related tasks in sequence, namely:
|
||||
- :code:`sass-styles`: process SCSS styles;
|
||||
- :code:`css-styles`: process CSS styles.
|
||||
- :code:`build`:
|
||||
- :code:`build`: run :code:`images`, :code:`scripts`, and :code:`styles` in parallel;
|
||||
- :code:`clean-build`: clean up build directory:
|
||||
- the :code:`default` task runs the following ones in sequence:
|
||||
- :code:`build`;
|
||||
- :code:`init-browserSync`: initialize `BrowserSync`_;
|
||||
- :code:`watch`: watch static asset files/directories changes, running BrowserSync on any changes.
|
||||
|
||||
.. _`BrowserSync`: https://www.browsersync.io/
|
||||
|
||||
|
||||
Workflow
|
||||
--------
|
||||
|
||||
#. [*skip if done*] :ref:`devlocdocker-build-the-stack`;
|
||||
#. :ref:`devlocdocker-boot-the-system`.
|
||||
|
||||
By default, :code:`gulp` command gets executed immediately after :code:`node`
|
||||
container startup (see :code:`./dev.yml` for details) which in turn invokes
|
||||
the :code:`default` task, so generally one would not need to run any
|
||||
of the aforementioned tasks manually. However, should the need arise,
|
||||
oftentimes just a few of the tasks listed above will be used to, for instance,
|
||||
straightforwardly :code:`build` all assets
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
$ docker-compose -f dev.yml exec node gulp build
|
||||
|
||||
or build :code:`scripts` selectively
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
$ docker-compose -f dev.yml exec node gulp scripts
|
||||
|
|
@ -17,8 +17,6 @@ Contents:
|
|||
developing-locally-docker
|
||||
settings
|
||||
linters
|
||||
nodejs-with-docker
|
||||
gulp-with-docker
|
||||
live-reloading-and-sass-compilation
|
||||
deployment-on-pythonanywhere
|
||||
deployment-on-heroku
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
Node.js with Docker
|
||||
===================
|
||||
|
||||
.. index:: node, nodejs, docker, docker-compose
|
||||
|
||||
`Node.js`_ support is provided out-of-the-box, ready for use as-is, or with any kind of customizations suiting the specific needs of the project.
|
||||
|
||||
.. _`Node.js`: https://nodejs.org/en/
|
||||
|
||||
*All paths are relative to the generated project's root.*
|
||||
|
||||
|
||||
.. _nodewithdocker-prereq:
|
||||
|
||||
Prerequisites
|
||||
-------------
|
||||
|
||||
- The project was generated with :code:`use_docker` set to :code:`y`.
|
||||
- These :ref:`devlocdocker-prereq` are met as well.
|
||||
|
||||
|
||||
.. _nodewithdocker-overview:
|
||||
|
||||
Overview
|
||||
--------
|
||||
|
||||
Essential aspects of Node.js integration are
|
||||
|
||||
- node docker-compose service (:code:`node`) definition in :code:`./dev.yml`;
|
||||
- :code:`./compose/node/Dockerfile-dev` defining the :code:`node` image;
|
||||
- :code:`./node_modules/` 'overlayed' with :code:`/app/node_modules/`, its counterpart from the running instance of :code:`node`.
|
||||
|
||||
|
||||
Workflow
|
||||
--------
|
||||
|
||||
#. [*skip if done*] :ref:`devlocdocker-build-the-stack`:
|
||||
- when building :code:`node` image from scratch, dependencies from :code:`package.json` are installed.
|
||||
#. :ref:`devlocdocker-boot-the-system`.
|
||||
|
||||
To log the running :code:`node` container's activity,
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
$ docker-compose -f dev.yml logs node
|
||||
|
|
@ -256,6 +256,7 @@ elif '{{ cookiecutter.js_task_runner}}'.lower() == 'grunt':
|
|||
else:
|
||||
remove_gulp_files()
|
||||
remove_grunt_files()
|
||||
remove_packageJSON_file()
|
||||
|
||||
# 7. Removes all certbot/letsencrypt files if it isn't going to be used
|
||||
if '{{ cookiecutter.use_lets_encrypt }}'.lower() != 'y':
|
||||
|
|
@ -263,10 +264,11 @@ if '{{ cookiecutter.use_lets_encrypt }}'.lower() != 'y':
|
|||
|
||||
# 8. Display a warning if use_docker and use_grunt are selected. Grunt isn't
|
||||
# supported by our docker config atm.
|
||||
if '{{ cookiecutter.js_task_runner }}'.lower() in ['grunt'] and '{{ cookiecutter.use_docker }}'.lower() == 'y':
|
||||
if '{{ cookiecutter.js_task_runner }}'.lower() in ['grunt', 'gulp'] and '{{ cookiecutter.use_docker }}'.lower() == 'y':
|
||||
print(
|
||||
"You selected to use Docker and Grunt task runner. This is NOT supported out of the box for now. You "
|
||||
"can continue to use the project like you normally would, but you will need to setup Grunt manually."
|
||||
"You selected to use docker and a JS task runner. This is NOT supported out of the box for now. You "
|
||||
"can continue to use the project like you normally would, but you will need to add a "
|
||||
"js task runner service to your docker configuration manually."
|
||||
)
|
||||
|
||||
# 9. Removes the certbot/letsencrypt files and display a warning if use_lets_encrypt is selected and use_docker isn't.
|
||||
|
|
|
|||
1
{{cookiecutter.project_slug}}/.gitignore
vendored
1
{{cookiecutter.project_slug}}/.gitignore
vendored
|
|
@ -79,4 +79,3 @@ staticfiles/
|
|||
|
||||
.cache/
|
||||
|
||||
{{ cookiecutter.project_slug }}/static/build/
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
FROM node:7.10-slim
|
||||
|
||||
RUN mkdir -p /app
|
||||
|
||||
COPY ./package.json /app
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN npm install && npm cache clean
|
||||
|
||||
ENV PATH ./node_modules/.bin/:$PATH
|
||||
|
|
@ -184,10 +184,9 @@ STATIC_ROOT = str(ROOT_DIR('staticfiles'))
|
|||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
_STATIC_BUILD_ROOT_DIR_NAME = 'build'
|
||||
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
|
||||
STATICFILES_DIRS = [
|
||||
(_STATIC_BUILD_ROOT_DIR_NAME, str(APPS_DIR.path('static').path(_STATIC_BUILD_ROOT_DIR_NAME))),
|
||||
str(APPS_DIR.path('static')),
|
||||
]
|
||||
|
||||
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ services:
|
|||
depends_on:
|
||||
- postgres{% if cookiecutter.use_mailhog == 'y' %}
|
||||
- mailhog{% endif %}
|
||||
- node
|
||||
environment:
|
||||
- POSTGRES_USER={{cookiecutter.project_slug}}
|
||||
- USE_DOCKER=yes
|
||||
|
|
@ -49,19 +48,3 @@ services:
|
|||
ports:
|
||||
- "8025:8025"
|
||||
{% endif %}
|
||||
|
||||
node:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./compose/node/Dockerfile-dev
|
||||
volumes:
|
||||
- .:/app
|
||||
# http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
|
||||
- /app/node_modules
|
||||
command: "gulp"
|
||||
ports:
|
||||
# BrowserSync port.
|
||||
- "3000:3000"
|
||||
# BrowserSync UI port.
|
||||
- "3001:3001"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,139 +1,105 @@
|
|||
const gulp = require('gulp')
|
||||
const pump = require('pump')
|
||||
const sass = require('gulp-sass')
|
||||
const pjson = require('./package.json')
|
||||
const autoprefixer = require('gulp-autoprefixer')
|
||||
const cleanCSS = require('gulp-clean-css')
|
||||
const rename = require('gulp-rename')
|
||||
const pixrem = require('gulp-pixrem')
|
||||
const concat = require('gulp-concat')
|
||||
const uglify = require('gulp-uglify')
|
||||
const imagemin = require('gulp-imagemin')
|
||||
const clean = require('gulp-clean')
|
||||
const spawn = require('child_process').spawn
|
||||
const runSequence = require('run-sequence')
|
||||
const browserSync = require('browser-sync').create()
|
||||
const pathsConfig = function (appName) {
|
||||
this.paths = {}
|
||||
|
||||
this.paths['app'] = './' + (appName || pjson.name)
|
||||
////////////////////////////////
|
||||
//Setup//
|
||||
////////////////////////////////
|
||||
|
||||
this.paths['static'] = this.paths['app'] + '/static'
|
||||
// Plugins
|
||||
var gulp = require('gulp'),
|
||||
pjson = require('./package.json'),
|
||||
gutil = require('gulp-util'),
|
||||
sass = require('gulp-sass'),
|
||||
autoprefixer = require('gulp-autoprefixer'),
|
||||
cssnano = require('gulp-cssnano'),
|
||||
rename = require('gulp-rename'),
|
||||
del = require('del'),
|
||||
plumber = require('gulp-plumber'),
|
||||
pixrem = require('gulp-pixrem'),
|
||||
uglify = require('gulp-uglify'),
|
||||
imagemin = require('gulp-imagemin'),
|
||||
spawn = require('child_process').spawn,
|
||||
runSequence = require('run-sequence'),
|
||||
browserSync = require('browser-sync').create(),
|
||||
reload = browserSync.reload;
|
||||
|
||||
this.paths['build'] = this.paths['static'] + '/build'
|
||||
|
||||
this.paths['buildImages'] = this.paths['build'] + '/images'
|
||||
this.paths['images'] = this.paths['static'] + '/images'
|
||||
this.paths['images_files'] = this.paths['images'] + '/*'
|
||||
this.paths['buildImagesFavicons'] = this.paths['buildImages'] + '/favicons'
|
||||
this.paths['imagesFavicons'] = this.paths['images'] + '/favicons'
|
||||
this.paths['imagesFavicons_files'] = this.paths['imagesFavicons'] + '/*'
|
||||
// Relative paths function
|
||||
var pathsConfig = function (appName) {
|
||||
this.app = "./" + (appName || pjson.name);
|
||||
|
||||
this.paths['build_scriptsFileName'] = 'scripts.js'
|
||||
this.paths['scripts'] = this.paths['static'] + '/scripts'
|
||||
this.paths['scripts_files'] = this.paths['scripts'] + '/**/*'
|
||||
this.paths['scriptsJs'] = this.paths['scripts'] + '/js'
|
||||
this.paths['scriptsJs_files'] = this.paths['scriptsJs'] + '/*.js'
|
||||
|
||||
this.paths['build_stylesFileName'] = 'styles.css'
|
||||
this.paths['styles'] = this.paths['static'] + '/styles'
|
||||
this.paths['styles_files'] = this.paths['styles'] + '/**/*'
|
||||
this.paths['stylesSass'] = this.paths['styles'] + '/sass'
|
||||
this.paths['stylesSass_files'] = this.paths['stylesSass'] + '/*.scss'
|
||||
this.paths['stylesCss'] = this.paths['styles'] + '/css'
|
||||
this.paths['stylesCss_files'] = this.paths['stylesCss'] + '/*.css'
|
||||
|
||||
this.paths['templates'] = this.paths['app'] + '/templates'
|
||||
this.paths['templates_files'] = this.paths['templates'] + '/**/*.html'
|
||||
|
||||
return this.paths
|
||||
return {
|
||||
app: this.app,
|
||||
templates: this.app + '/templates',
|
||||
css: this.app + '/static/css',
|
||||
sass: this.app + '/static/sass',
|
||||
fonts: this.app + '/static/fonts',
|
||||
images: this.app + '/static/images',
|
||||
js: this.app + '/static/js',
|
||||
}
|
||||
const paths = pathsConfig()
|
||||
};
|
||||
|
||||
// region images
|
||||
gulp.task('favicons-images', function (cb) {
|
||||
pump([gulp.src(paths.imagesFavicons_files),
|
||||
gulp.dest(paths.buildImagesFavicons)],
|
||||
cb)
|
||||
})
|
||||
var paths = pathsConfig();
|
||||
|
||||
gulp.task('nonfavicons-images', function (cb) {
|
||||
pump([gulp.src(paths.images_files),
|
||||
imagemin(),
|
||||
gulp.dest(paths.buildImages)],
|
||||
cb)
|
||||
})
|
||||
|
||||
gulp.task('images', function () {
|
||||
runSequence(['favicons-images', 'nonfavicons-images'])
|
||||
})
|
||||
// endregion
|
||||
|
||||
// region scripts
|
||||
gulp.task('js-scripts', function (cb) {
|
||||
pump([gulp.src(paths.scriptsJs_files),
|
||||
concat(paths.build_scriptsFileName),
|
||||
uglify(),
|
||||
rename({suffix: '.min'}),
|
||||
gulp.dest(paths.build)],
|
||||
cb)
|
||||
})
|
||||
|
||||
gulp.task('scripts', function () {
|
||||
runSequence('js-scripts')
|
||||
})
|
||||
// endregion
|
||||
|
||||
// region styles
|
||||
gulp.task('sass-styles', function (cb) {
|
||||
pump([gulp.src(paths.stylesSass_files),
|
||||
sass(),
|
||||
gulp.dest(paths.stylesCss)],
|
||||
cb
|
||||
)
|
||||
})
|
||||
|
||||
gulp.task('css-styles', function (cb) {
|
||||
pump([gulp.src(paths.stylesCss_files),
|
||||
concat(paths.build_stylesFileName),
|
||||
autoprefixer({browsers: ['last 2 versions']}),
|
||||
pixrem(),
|
||||
cleanCSS({rebaseTo: '../../'}),
|
||||
rename({suffix: '.min'}),
|
||||
gulp.dest(paths.build)],
|
||||
cb)
|
||||
})
|
||||
////////////////////////////////
|
||||
//Tasks//
|
||||
////////////////////////////////
|
||||
|
||||
// Styles autoprefixing and minification
|
||||
gulp.task('styles', function() {
|
||||
runSequence('sass-styles', 'css-styles')
|
||||
})
|
||||
// endregion
|
||||
return gulp.src(paths.sass + '/project.scss')
|
||||
.pipe(sass().on('error', sass.logError))
|
||||
.pipe(plumber()) // Checks for errors
|
||||
.pipe(autoprefixer({browsers: ['last 2 versions']})) // Adds vendor prefixes
|
||||
.pipe(pixrem()) // add fallbacks for rem units
|
||||
.pipe(gulp.dest(paths.css))
|
||||
.pipe(rename({ suffix: '.min' }))
|
||||
.pipe(cssnano()) // Minifies the result
|
||||
.pipe(gulp.dest(paths.css));
|
||||
});
|
||||
|
||||
// region build
|
||||
gulp.task('build', function () {
|
||||
runSequence(['images', 'scripts', 'styles'])
|
||||
})
|
||||
// Javascript minification
|
||||
gulp.task('scripts', function() {
|
||||
return gulp.src(paths.js + '/project.js')
|
||||
.pipe(plumber()) // Checks for errors
|
||||
.pipe(uglify()) // Minifies the js
|
||||
.pipe(rename({ suffix: '.min' }))
|
||||
.pipe(gulp.dest(paths.js));
|
||||
});
|
||||
|
||||
gulp.task('clean-build', function (cb) {
|
||||
pump([gulp.src(paths.build),
|
||||
clean()],
|
||||
cb)
|
||||
})
|
||||
// endregion
|
||||
// Image compression
|
||||
gulp.task('imgCompression', function(){
|
||||
return gulp.src(paths.images + '/*')
|
||||
.pipe(imagemin()) // Compresses PNG, JPEG, GIF and SVG images
|
||||
.pipe(gulp.dest(paths.images))
|
||||
});
|
||||
|
||||
gulp.task('init-browserSync', function () {
|
||||
browserSync.init({
|
||||
host: 'localhost:8000'
|
||||
})
|
||||
})
|
||||
// Run django server
|
||||
gulp.task('runServer', function(cb) {
|
||||
var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'});
|
||||
cmd.on('close', function(code) {
|
||||
console.log('runServer exited with code ' + code);
|
||||
cb(code);
|
||||
});
|
||||
});
|
||||
|
||||
// Browser sync server for live reload
|
||||
gulp.task('browserSync', function() {
|
||||
browserSync.init(
|
||||
[paths.css + "/*.css", paths.js + "*.js", paths.templates + '*.html'], {
|
||||
proxy: "localhost:8000"
|
||||
});
|
||||
});
|
||||
|
||||
// Watch
|
||||
gulp.task('watch', function() {
|
||||
gulp.watch(paths.images_files, ['images']).on('change', browserSync.reload)
|
||||
gulp.watch(paths.scripts_files, ['scripts']).on('change', browserSync.reload)
|
||||
gulp.watch(paths.styles_files, ['styles']).on('change', browserSync.reload)
|
||||
gulp.watch(paths.templates_files).on('change', browserSync.reload)
|
||||
})
|
||||
|
||||
gulp.watch(paths.sass + '/*.scss', ['styles']);
|
||||
gulp.watch(paths.js + '/*.js', ['scripts']).on("change", reload);
|
||||
gulp.watch(paths.images + '/*', ['imgCompression']);
|
||||
gulp.watch(paths.templates + '/**/*.html').on("change", reload);
|
||||
|
||||
});
|
||||
|
||||
// Default task
|
||||
gulp.task('default', function() {
|
||||
runSequence('build', 'init-browserSync', 'watch')
|
||||
})
|
||||
runSequence(['styles', 'scripts', 'imgCompression'], 'runServer', 'browserSync', 'watch');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,18 +16,18 @@
|
|||
"pixrem": "~1.3.1",
|
||||
"time-grunt": "~1.2.1"
|
||||
{% elif cookiecutter.js_task_runner == 'Gulp' %}
|
||||
"browser-sync": "^2.18.8",
|
||||
"browser-sync": "^2.14.0",
|
||||
"del": "^2.2.2",
|
||||
"gulp": "^3.9.1",
|
||||
"gulp-autoprefixer": "^3.1.1",
|
||||
"gulp-clean": "^0.3.2",
|
||||
"gulp-clean-css": "^3.0.4",
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-imagemin": "^3.1.1",
|
||||
"gulp-cssnano": "^2.1.2",
|
||||
"gulp-imagemin": "^3.0.3",
|
||||
"gulp-pixrem": "^1.0.0",
|
||||
"gulp-plumber": "^1.1.0",
|
||||
"gulp-rename": "^1.2.2",
|
||||
"gulp-sass": "^3.1.0",
|
||||
"gulp-uglify": "^2.1.2",
|
||||
"pump": "^1.0.2",
|
||||
"gulp-sass": "^2.3.2",
|
||||
"gulp-uglify": "^2.0.0",
|
||||
"gulp-util": "^3.0.7",
|
||||
"run-sequence": "^1.2.2"
|
||||
{% endif %}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
/* These styles are generated from project.scss. */
|
||||
|
||||
.alert-debug {
|
||||
color: black;
|
||||
background-color: white;
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.alert-error {
|
||||
color: #b94a48;
|
||||
background-color: #f2dede;
|
||||
border-color: #eed3d7;
|
||||
}
|
||||
|
||||
/* This is a fix for the bootstrap4 alpha release */
|
||||
@media (max-width: 47.9em) {
|
||||
.navbar-nav .nav-item {
|
||||
float: none;
|
||||
width: 100%;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.navbar-nav .nav-item + .nav-item {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.nav.navbar-nav.pull-xs-right {
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* Display django-debug-toolbar.
|
||||
See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742
|
||||
and https://github.com/pydanny/cookiecutter-django/issues/317
|
||||
*/
|
||||
[hidden][style="display: block;"] {
|
||||
display: block !important;
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
/* Project specific Javascript goes here. */
|
||||
|
||||
/*
|
||||
Formatting hack to get around crispy-forms unfortunate hardcoding
|
||||
in helpers.FormHelper:
|
||||
|
||||
if template_pack == 'bootstrap4':
|
||||
grid_colum_matcher = re.compile('\w*col-(xs|sm|md|lg|xl)-\d+\w*')
|
||||
using_grid_layout = (grid_colum_matcher.match(self.label_class) or
|
||||
grid_colum_matcher.match(self.field_class))
|
||||
if using_grid_layout:
|
||||
items['using_grid_layout'] = True
|
||||
|
||||
Issues with the above approach:
|
||||
|
||||
1. Fragile: Assumes Bootstrap 4's API doesn't change (it does)
|
||||
2. Unforgiving: Doesn't allow for any variation in template design
|
||||
3. Really Unforgiving: No way to override this behavior
|
||||
4. Undocumented: No mention in the documentation, or it's too hard for me to find
|
||||
*/
|
||||
$('.form-group').removeClass('row');
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* Project specific Javascript goes here. */
|
||||
|
||||
/*
|
||||
Formatting hack to get around crispy-forms unfortunate hardcoding
|
||||
in helpers.FormHelper:
|
||||
|
||||
if template_pack == 'bootstrap4':
|
||||
grid_colum_matcher = re.compile('\w*col-(xs|sm|md|lg|xl)-\d+\w*')
|
||||
using_grid_layout = (grid_colum_matcher.match(self.label_class) or
|
||||
grid_colum_matcher.match(self.field_class))
|
||||
if using_grid_layout:
|
||||
items['using_grid_layout'] = True
|
||||
|
||||
Issues with the above approach:
|
||||
|
||||
1. Fragile: Assumes Bootstrap 4's API doesn't change (it does)
|
||||
2. Unforgiving: Doesn't allow for any variation in template design
|
||||
3. Really Unforgiving: No way to override this behavior
|
||||
4. Undocumented: No mention in the documentation, or it's too hard for me to find
|
||||
*/
|
||||
$('.form-group').removeClass('row')
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
.alert-debug {
|
||||
background-color: #fff;
|
||||
border-color: #d6e9c6;
|
||||
color: #000; }
|
||||
|
||||
.alert-error {
|
||||
background-color: #f2dede;
|
||||
border-color: #eed3d7;
|
||||
color: #b94a48; }
|
||||
|
||||
.navbar {
|
||||
border-radius: 0px; }
|
||||
|
||||
@media (max-width: 47.9em) {
|
||||
.navbar-nav .nav-item {
|
||||
display: inline-block;
|
||||
float: none;
|
||||
width: 100%; }
|
||||
.navbar-nav .nav-item + .nav-item {
|
||||
margin-left: 0; }
|
||||
.nav.navbar-nav.pull-xs-right {
|
||||
float: none !important; } }
|
||||
|
||||
[hidden][style="display: block;"] {
|
||||
display: block !important; }
|
||||
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
// project specific CSS goes here
|
||||
|
||||
////////////////////////////////
|
||||
//Variables//
|
||||
////////////////////////////////
|
||||
|
||||
// Alert colors
|
||||
|
||||
$white: #fff;
|
||||
$mint-green: #d6e9c6;
|
||||
$black: #000;
|
||||
$pink: #f2dede;
|
||||
$dark-pink: #eed3d7;
|
||||
$red: #b94a48;
|
||||
|
||||
////////////////////////////////
|
||||
//Alerts//
|
||||
////////////////////////////////
|
||||
|
||||
// bootstrap alert CSS, translated to the django-standard levels of
|
||||
// debug, info, success, warning, error
|
||||
|
||||
.alert-debug {
|
||||
background-color: $white;
|
||||
border-color: $mint-green;
|
||||
color: $black;
|
||||
}
|
||||
|
||||
.alert-error {
|
||||
background-color: $pink;
|
||||
border-color: $dark-pink;
|
||||
color: $red;
|
||||
}
|
||||
|
||||
////////////////////////////////
|
||||
//Navbar//
|
||||
////////////////////////////////
|
||||
|
||||
// This is a fix for the bootstrap4 alpha release
|
||||
|
||||
.navbar {
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
@media (max-width: 47.9em) {
|
||||
.navbar-nav .nav-item {
|
||||
display: inline-block;
|
||||
float: none;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.navbar-nav .nav-item + .nav-item {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.nav.navbar-nav.pull-xs-right {
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////
|
||||
//Django Toolbar//
|
||||
////////////////////////////////
|
||||
|
||||
// Display django-debug-toolbar.
|
||||
// See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742
|
||||
// and https://github.com/pydanny/cookiecutter-django/issues/317
|
||||
|
||||
[hidden][style="display: block;"] {
|
||||
display: block !important;
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
<!-- Your stuff: Third-party CSS libraries go here -->
|
||||
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
|
||||
<!-- This file stores project-specific CSS -->
|
||||
<link href="{% static 'build/styles.min.css' %}" rel="stylesheet"/>
|
||||
<link href="{% static 'css/project.css' %}" rel="stylesheet">
|
||||
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -88,13 +88,6 @@
|
|||
================================================== -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
{% block javascript %}
|
||||
<!-- BrowserSync debug-only support -->
|
||||
{% if debug %}
|
||||
<script id="__bs_script__">//<![CDATA[
|
||||
document.write('<script async src=\'http://HOST:3000/browser-sync/browser-sync-client.js?v=2.18.8\'><\/script>'.replace('HOST', location.hostname))
|
||||
//]]></script>
|
||||
{% endif %}
|
||||
|
||||
<!-- Required by Bootstrap v4 Alpha 4 -->
|
||||
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
|
||||
|
|
@ -104,7 +97,7 @@
|
|||
|
||||
<!-- place project specific Javascript in this file -->
|
||||
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
|
||||
<script src="{% static 'build/scripts.min.js' %}"></script>
|
||||
<script src="{% static 'js/project.js' %}"></script>
|
||||
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
|
||||
|
||||
{% endblock javascript %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user