From bb7525186411b2462d2aec8c01d24cbf1f548a2e Mon Sep 17 00:00:00 2001 From: Mazdak Badakhshan Date: Sat, 2 Jul 2016 02:00:40 +0430 Subject: [PATCH] Removed compressor, gulp, grunt and webpack --- hooks/post_gen_project.py | 82 +---------- {{cookiecutter.project_slug}}/Gruntfile.js | 138 ------------------ .../config/settings/common.py | 24 --- .../config/settings/production.py | 15 +- {{cookiecutter.project_slug}}/config/urls.py | 3 - {{cookiecutter.project_slug}}/env.example | 3 - {{cookiecutter.project_slug}}/gulpfile.js | 107 -------------- {{cookiecutter.project_slug}}/package.json | 38 ----- .../requirements/base.txt | 15 -- .../static/css/project.css | 38 ----- .../static/fonts/.gitkeep | 0 .../static/images/favicon.ico | Bin 8348 -> 0 bytes .../static/js/project.js | 1 - .../static/sass/project.scss | 72 --------- .../templates/pages/about.html | 1 - .../templates/pages/home.html | 1 - 16 files changed, 4 insertions(+), 534 deletions(-) delete mode 100644 {{cookiecutter.project_slug}}/Gruntfile.js delete mode 100644 {{cookiecutter.project_slug}}/gulpfile.js delete mode 100644 {{cookiecutter.project_slug}}/package.json delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/fonts/.gitkeep delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/images/favicon.ico delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 8a89c1d68..818bcf846 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -134,58 +134,6 @@ def remove_docker_files(): PROJECT_DIRECTORY, "compose" )) - -def remove_grunt_files(): - """ - Removes files needed for grunt if it isn't going to be used - """ - for filename in ["Gruntfile.js"]: - os.remove(os.path.join( - PROJECT_DIRECTORY, filename - )) - -def remove_gulp_files(): - """ - Removes files needed for grunt if it isn't going to be used - """ - for filename in ["gulpfile.js"]: - os.remove(os.path.join( - PROJECT_DIRECTORY, filename - )) - -def remove_packageJSON_file(): - """ - Removes files needed for grunt if it isn't going to be used - """ - for filename in ["package.json"]: - os.remove(os.path.join( - PROJECT_DIRECTORY, filename - )) - - -def add_webpack(): - """ - Adds webpack configuration using cookiecutter to install hzdg/cookiecutter-webpack - """ - cookiecutter( - 'https://github.com/hzdg/cookiecutter-webpack.git', - replay=False, overwrite_if_exists=True, output_dir='../', - checkout='pydanny-django', no_input=True, extra_context={ - 'project_name': '{{ cookiecutter.project_name }}', - 'repo_name': '{{ cookiecutter.project_slug }}', - 'repo_owner': '', - 'project_dir': '{{ cookiecutter.project_slug }}', - 'static_root': '{{ cookiecutter.project_slug }}/static/{{ cookiecutter.project_slug }}', - 'production_output_path': '{{ cookiecutter.project_slug }}/static/{{ cookiecutter.project_slug }}/dist/', - 'author_name': '{{ cookiecutter.author_name }}', - 'description': '{{ cookiecutter.description }}', - 'version': '{{ cookiecutter.version }}', - 'existing_project': 'y', - 'css_extension': 'sass', - 'use_ejs': 'n', - 'open_source_license': '{{ cookiecutter.open_source_license }}' - }) - def remove_certbot_files(): """ Removes files needed for certbot if it isn't going to be used @@ -241,35 +189,11 @@ if '{{ cookiecutter.use_heroku }}'.lower() != 'y': if '{{ cookiecutter.use_docker }}'.lower() != 'y': remove_docker_files() -# 6. Removes all JS task manager files if it isn't going to be used -if '{{ cookiecutter.js_task_runner}}'.lower() == 'gulp': - remove_grunt_files() -elif '{{ cookiecutter.js_task_runner}}'.lower() == 'grunt': - remove_gulp_files() -elif '{{ cookiecutter.js_task_runner }}'.lower() == 'webpack': - remove_gulp_files() - remove_grunt_files() - remove_packageJSON_file() - add_webpack() -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': remove_certbot_files() -# 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', 'gulp'] and '{{ cookiecutter.use_docker }}'.lower() == 'y': - print( - "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. +# 8. Removes the certbot/letsencrypt files and display a warning if use_lets_encrypt is selected and use_docker isn't. if '{{ cookiecutter.use_lets_encrypt }}'.lower() == 'y' and '{{ cookiecutter.use_docker }}'.lower() != 'y': remove_certbot_files() print( @@ -277,14 +201,14 @@ if '{{ cookiecutter.use_lets_encrypt }}'.lower() == 'y' and '{{ cookiecutter.use "can continue to use the project like you normally would, but Let's Encrypt files have been included." ) -# 10. Directs the user to the documentation if certbot and docker are selected. +# 9. Directs the user to the documentation if certbot and docker are selected. if '{{ cookiecutter.use_lets_encrypt }}'.lower() == 'y' and '{{ cookiecutter.use_docker }}'.lower() == 'y': print( "You selected to use Let's Encrypt, please see the documentation for instructions on how to use this in production. " "You must generate a dhparams.pem file before running docker-compose in a production environment." ) -# 11. Removes files needed for the GPLv3 licence if it isn't going to be used. +# 10. Removes files needed for the GPLv3 licence if it isn't going to be used. if '{{ cookiecutter.open_source_license}}' != 'GPLv3': remove_copying_files() diff --git a/{{cookiecutter.project_slug}}/Gruntfile.js b/{{cookiecutter.project_slug}}/Gruntfile.js deleted file mode 100644 index e5fbcceed..000000000 --- a/{{cookiecutter.project_slug}}/Gruntfile.js +++ /dev/null @@ -1,138 +0,0 @@ -module.exports = function (grunt) { - - var appConfig = grunt.file.readJSON('package.json'); - - // Load grunt tasks automatically - // see: https://github.com/sindresorhus/load-grunt-tasks - require('load-grunt-tasks')(grunt); - - // Time how long tasks take. Can help when optimizing build times - // see: https://npmjs.org/package/time-grunt - require('time-grunt')(grunt); - - var pathsConfig = function (appName) { - this.app = appName || appConfig.name; - - 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', - manageScript: 'manage.py', - } - }; - - grunt.initConfig({ - - paths: pathsConfig(), - pkg: appConfig, - - // see: https://github.com/gruntjs/grunt-contrib-watch - watch: { - gruntfile: { - files: ['Gruntfile.js'] - }, - sass: { - files: ['<%= paths.sass %>/**/*.{scss,sass}'], - tasks: ['sass:dev'], - options: { - atBegin: true - } - }, - livereload: { - files: [ - '<%= paths.js %>/**/*.js', - '<%= paths.sass %>/**/*.{scss,sass}', - '<%= paths.app %>/**/*.html' - ], - options: { - spawn: false, - livereload: true, - }, - }, - }, - - // see: https://github.com/sindresorhus/grunt-sass - sass: { - dev: { - options: { - outputStyle: 'nested', - sourceMap: false, - precision: 10 - }, - files: { - '<%= paths.css %>/project.css': '<%= paths.sass %>/project.scss' - }, - }, - dist: { - options: { - outputStyle: 'compressed', - sourceMap: false, - precision: 10 - }, - files: { - '<%= paths.css %>/project.css': '<%= paths.sass %>/project.scss' - }, - } - }, - - //see https://github.com/nDmitry/grunt-postcss - postcss: { - options: { - map: true, // inline sourcemaps - - processors: [ - require('pixrem')(), // add fallbacks for rem units - require('autoprefixer-core')({browsers: [ - 'Android 2.3', - 'Android >= 4', - 'Chrome >= 20', - 'Firefox >= 24', - 'Explorer >= 8', - 'iOS >= 6', - 'Opera >= 12', - 'Safari >= 6' - ]}), // add vendor prefixes - require('cssnano')() // minify the result - ] - }, - dist: { - src: '<%= paths.css %>/*.css' - } - }, - - // see: https://npmjs.org/package/grunt-bg-shell - bgShell: { - _defaults: { - bg: true - }, - runDjango: { - cmd: 'python <%= paths.manageScript %> runserver' - }, - {% if cookiecutter.use_mailhog == "y" and cookiecutter.use_docker == 'n' -%}runMailHog: { - cmd: './mailhog' - },{%- endif %} - } - }); - - grunt.registerTask('serve', [ - {% if cookiecutter.use_mailhog == "y" and cookiecutter.use_docker == 'n' -%} - 'bgShell:runMailHog', - {%- endif %} - 'bgShell:runDjango', - 'watch' - ]); - - grunt.registerTask('build', [ - 'sass:dist', - 'postcss' - ]); - - grunt.registerTask('default', [ - 'build' - ]); - -}; diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 898e60ef9..2461af9e3 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -35,7 +35,6 @@ DJANGO_APPS = ( 'django.contrib.admin', ) THIRD_PARTY_APPS = ( - 'crispy_forms', # Form layouts 'allauth', # registration 'allauth.account', # registration 'allauth.socialaccount', # registration @@ -164,9 +163,6 @@ TEMPLATES = [ }, ] -# See: http://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs -CRISPY_TEMPLATE_PACK = 'bootstrap3' - # STATIC FILE CONFIGURATION # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-root @@ -234,27 +230,7 @@ BROKER_URL = env('CELERY_BROKER_URL', default='django://') ########## END CELERY {% endif %} -# django-compressor -# ------------------------------------------------------------------------------ -{% if cookiecutter.use_compressor == 'y'-%} -INSTALLED_APPS += ("compressor", ) -STATICFILES_FINDERS += ("compressor.finders.CompressorFinder", ) -{%- endif %} - # Location of root django.contrib.admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %} ADMIN_URL = r'^admin/' -{% if cookiecutter.js_task_runner == 'Webpack' %} -# WEBPACK -# ------------------------------------------------------------------------------ -INSTALLED_APPS += ('webpack_loader',) -# Webpack Local Stats file -STATS_FILE = ROOT_DIR('webpack-stats.json') -# Webpack config -WEBPACK_LOADER = { - 'DEFAULT': { - 'STATS_FILE': STATS_FILE - } -} -{% endif %} # Your common stuff: Below this line define 3rd party library settings diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index e4a919128..3d183e03e 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -301,21 +301,8 @@ LOGGING = { } } {% endif %} + # Custom Admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %} ADMIN_URL = env('DJANGO_ADMIN_URL') -{% if cookiecutter.js_task_runner == 'Webpack' %} - -# WEBPACK -# ------------------------------------------------------------------------------ -# Webpack Production Stats file -STATS_FILE = ROOT_DIR('webpack-stats-production.json') -# Webpack config -WEBPACK_LOADER = { - 'DEFAULT': { - 'BUNDLE_DIR_NAME': '{{ cookiecutter.project_slug }}/static/{{ cookiecutter.project_slug }}/dist/', - 'STATS_FILE': STATS_FILE - } -} -{% endif %} # Your production stuff: Below this line define 3rd party library settings diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index f3a621127..c10b089ca 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -9,9 +9,6 @@ from django.views.generic import TemplateView from django.views import defaults as default_views urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name='home'), - url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name='about'), - # Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %} url(settings.ADMIN_URL, include(admin.site.urls)), diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example index 95a6a1d96..cc636aa3b 100644 --- a/{{cookiecutter.project_slug}}/env.example +++ b/{{cookiecutter.project_slug}}/env.example @@ -30,7 +30,4 @@ DJANGO_SENTRY_DSN= DJANGO_OPBEAT_ORGANIZATION_ID DJANGO_OPBEAT_APP_ID DJANGO_OPBEAT_SECRET_TOKEN -{% endif %} -{% if cookiecutter.use_compressor == 'y' -%} -COMPRESS_ENABLED= {% endif %} \ No newline at end of file diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js deleted file mode 100644 index e5b0df9dc..000000000 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ /dev/null @@ -1,107 +0,0 @@ - -//////////////////////////////// - //Setup// -//////////////////////////////// - -// 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'), - exec = require('gulp-exec'), - runSequence = require('run-sequence'), - browserSync = require('browser-sync'); - - -// Relative paths function -var pathsConfig = function (appName) { - this.app = "./" + (appName || pjson.name); - - 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', - } -}; - -var paths = pathsConfig(); - -//////////////////////////////// - //Tasks// -//////////////////////////////// - -// Styles autoprefixing and minification -gulp.task('styles', function() { - return gulp.src(paths.sass + '/project.scss') - .pipe(sass().on('error', sass.logError)) - .pipe(plumber()) // Checks for errors - .pipe(autoprefixer({browsers: ['last 2 version']})) // 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)); -}); - -// 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)); -}); - -// 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)) -}); - -// Run django server -gulp.task('runServer', function() { - exec('python manage.py runserver', function (err, stdout, stderr) { - console.log(stdout); - console.log(stderr); - }); -}); - -// Browser sync server for live reload -gulp.task('browserSync', function() { - browserSync.init( - [paths.css + "/*.css", paths.js + "*.js", paths.templates + '*.html'], { - proxy: "localhost:8000" - }); -}); - -// Default task -gulp.task('default', function() { - runSequence(['styles', 'scripts', 'imgCompression'], 'runServer', 'browserSync'); -}); - -//////////////////////////////// - //Watch// -//////////////////////////////// - -// Watch -gulp.task('watch', ['default'], function() { - - gulp.watch(paths.sass + '/*.scss', ['styles']); - gulp.watch(paths.js + '/*.js', ['scripts']); - gulp.watch(paths.images + '/*', ['imgCompression']); - gulp.watch('templates/*.html'); - -}); diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json deleted file mode 100644 index 2be4b50c8..000000000 --- a/{{cookiecutter.project_slug}}/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "{{cookiecutter.project_slug}}", - "version": "{{ cookiecutter.version }}", - "dependencies": {}, - "devDependencies": { - {% if cookiecutter.js_task_runner == 'Grunt' %} - "autoprefixer-core": "~5.2.1", - "connect-livereload": "~0.3.2", - "cssnano": "~2.1.0", - "grunt": "~0.4.5", - "grunt-bg-shell": "~2.3.1", - "grunt-contrib-watch": "~0.6.1", - "grunt-postcss": "~0.5.5", - "grunt-sass": "~1.0.0", - "load-grunt-tasks": "~3.2.0", - "pixrem": "~1.3.1", - "time-grunt": "~1.2.1" - {% elif cookiecutter.js_task_runner == 'Gulp' %} - "browser-sync": "^2.12.10", - "del": "^2.2.0", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^3.1.0", - "gulp-cssnano": "^2.1.2", - "gulp-exec": "^2.1.2", - "gulp-imagemin": "^3.0.1", - "gulp-pixrem": "^1.0.0", - "gulp-plumber": "^1.1.0", - "gulp-rename": "^1.2.2", - "gulp-sass": "^2.3.1", - "gulp-uglify": "^1.5.3", - "gulp-util": "^3.0.7", - "run-sequence": "^1.2.1" - {% endif %} - }, - "engines": { - "node": ">=0.8.0" - } -} diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 4b4b14209..0e272ef71 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -15,12 +15,6 @@ django-environ==0.4.0 whitenoise==3.2 {%- endif %} - -# Forms -django-braces==1.9.0 -django-crispy-forms==1.6.0 -django-floppyforms==1.6.2 - # Models django-model-utils==2.5 @@ -54,13 +48,4 @@ redis>=2.10.0 celery==3.1.23 {% endif %} -{% if cookiecutter.use_compressor == "y" %} -django_compressor==2.0 -{% endif %} - -{% if cookiecutter.js_task_runner == 'Webpack' -%} -# Webpack -django-webpack-loader==0.3.0 -{%- endif %} - # Your custom requirements go here diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css deleted file mode 100644 index 5f23c427a..000000000 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css +++ /dev/null @@ -1,38 +0,0 @@ -/* 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; -} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/fonts/.gitkeep b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/fonts/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/images/favicon.ico b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/images/favicon.ico deleted file mode 100644 index e1c1dd1a32a3a077c41a21e52bc7fb5ac90d3afb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8348 zcmeHLX-gGh6rQ3V&`92%;lcmGu`Jl^WK@OV`^XKh08PZoaH%l?rdiiWq>kJ2@6vM zhAH8L6=kTRD1!xR`-2o^hS&}loN!U1#gF+=YxEq~uqf5#iBw%p0;w;5ehm+6a!sSu zh;X+$+}oF$X1Q6DwS~>Y_Hpw^(&QvJO<5ZCPrn5laNp%s{B3x1hf%*?eW>oS{<{4s^u_yG zpDyG!_iV#~G=q<~slG@0Sx47XXQ%O;HY7ILVf}B-)R$6GV^A78)t0tN9`tu3r9Z+xM?NgUd8geu=c`0?r;-KR&IQjKs zSB#VCpg8CPW&M}$sth@H=VS%t;23!!j};F)bb;W3EkA!4QmCsY_p81^TK0{;$g>e1Hl998^0M+r0-7ZSN+l_cMSRuEALTE@|d6+3{GMP^;_|<yhubb{FF1IPgH|0>SH%pC!c)uFI)H z?jv4y0uO{P5WE>~I<$r!RFo0lN4r{xm;Jy4p$h~b3S*a#)$Z*nI}&Kc_C+*zZHz1v zIR8TBVH7Y?Mp~ zofpsr+SP@>EX4e*bQ{nAUYtKrQ&-5d4j;FF{^-^Dt2^5I`HSb!|22PN26n3>hKPOy zW2D*A*v+c{bFKCwozbB{dObp~e&1Nxrj<4Ih4~w)M`nl08o}Wq2 z#Jt(k+M>+}JY(=2gm(gdUq)^@e%tX(F)RBtotnB2^y>YKz-5eg_qO&n%lJ1nuQmTY zxmyE1NWjl1EGvD?Z|n;neT;sa?Q;Ef-#%$BYxXAhD4xF+@M>*qrR!x^sPN98|BX4; z!$NJcKF`^C7f(<_vlp%b>`pxL^8Y<&?KFx{n_!5C9VqLA*CP@zhXs2t#dmrAKu?d_ y^&_r5_e@uesG}CO*g!3o?-kB+I^cA`>44J#rvpw0oDMi0a5~_0!0Eu>4*Uj$LD0AW diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js deleted file mode 100644 index d26d23b9b..000000000 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js +++ /dev/null @@ -1 +0,0 @@ -/* Project specific Javascript goes here. */ diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss deleted file mode 100644 index 54632b2d6..000000000 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss +++ /dev/null @@ -1,72 +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; -} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html deleted file mode 100644 index 94beff9c8..000000000 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html +++ /dev/null @@ -1 +0,0 @@ -{% raw %}{% extends "base.html" %}{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html deleted file mode 100644 index 94beff9c8..000000000 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html +++ /dev/null @@ -1 +0,0 @@ -{% raw %}{% extends "base.html" %}{% endraw %} \ No newline at end of file