From 59c91103c6436d61b87f48e6d62943a992367b86 Mon Sep 17 00:00:00 2001 From: Sarah Etter Date: Thu, 17 Sep 2015 16:43:02 -0600 Subject: [PATCH] Working theme in master --- .ftppass | 6 - .gitignore | 53 ++++++++- Gruntfile.js | 214 +++++++++++++++++------------------ assets/css/ascribe.css | 7 ++ assets/css/less/ascribe.less | 7 ++ humans.txt | 2 +- languages/wptheme.pot | 4 +- phpunit.xml.dist | 21 ---- sftpCache.json | 2 +- 9 files changed, 177 insertions(+), 139 deletions(-) delete mode 100644 .ftppass delete mode 100644 phpunit.xml.dist diff --git a/.ftppass b/.ftppass deleted file mode 100644 index 9a30947..0000000 --- a/.ftppass +++ /dev/null @@ -1,6 +0,0 @@ -{ - "key1": { - "username": "ascribe", - "password": "zS!wfsBm9FK$" - } -} \ No newline at end of file diff --git a/.gitignore b/.gitignore index ed0ef5d..07101fb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,55 @@ release vendor composer.lock phpunit.xml -.idea \ No newline at end of file +.idea +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + + +.ftppass \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 82f552b..4c64d59 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,48 +1,48 @@ module.exports = function( grunt ) { - // Project configuration - grunt.initConfig( { - pkg: grunt.file.readJSON( 'package.json' ), - concat: { - options: { - stripBanners: true, - banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + - ' * <%= pkg.homepage %>\n' + - ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + - ' * Licensed GPLv2+' + - ' */\n' - }, - main: { - src: [ - 'assets/js/src/ascribe.js' - ], - dest: 'assets/js/ascribe.js' - } - }, - jshint: { - all: [ - 'Gruntfile.js', - 'assets/js/src/**/*.js', - 'assets/js/test/**/*.js' - ] - }, - uglify: { - all: { - files: { - 'assets/js/ascribe.min.js': ['assets/js/ascribe.js'] - }, - options: { - banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + - ' * <%= pkg.homepage %>\n' + - ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + - ' * Licensed GPLv2+' + - ' */\n', - mangle: { - except: ['jQuery'] - } - } - } - }, + // Project configuration + grunt.initConfig( { + pkg: grunt.file.readJSON( 'package.json' ), + concat: { + options: { + stripBanners: true, + banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + + ' * <%= pkg.homepage %>\n' + + ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + + ' * Licensed GPLv2+' + + ' */\n' + }, + main: { + src: [ + 'assets/js/src/ascribe.js' + ], + dest: 'assets/js/ascribe.js' + } + }, + jshint: { + all: [ + 'Gruntfile.js', + 'assets/js/src/**/*.js', + 'assets/js/test/**/*.js' + ] + }, + uglify: { + all: { + files: { + 'assets/js/ascribe.min.js': ['assets/js/ascribe.js'] + }, + options: { + banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + + ' * <%= pkg.homepage %>\n' + + ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + + ' * Licensed GPLv2+' + + ' */\n', + mangle: { + except: ['jQuery'] + } + } + } + }, less: { all: { @@ -54,61 +54,61 @@ module.exports = function( grunt ) { } } }, - - - postcss: { - dist: { - options: { - processors: [ - require('autoprefixer-core')({browsers: 'last 2 versions'}) - ] - }, - files: { - 'assets/css/ascribe.css': [ 'assets/css/ascribe.css' ] - } - } - }, - - cssmin: { - options: { - banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + - ' * <%=pkg.homepage %>\n' + - ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + - ' * Licensed GPLv2+' + - ' */\n' - }, - minify: { - expand: true, - cwd: 'assets/css/', - src: ['ascribe.css'], - dest: 'assets/css/', - ext: '.min.css' - } - }, - watch: { - livereload: { - files: ['assets/css/*.css'], - options: { - livereload: true - } - }, - styles: { - files: ['assets/css/less/**/*.less'], - tasks: ['less', 'autoprefixer', 'cssmin'], - options: { - debounceDelay: 500 - } - }, - scripts: { - files: ['assets/js/src/**/*.js', 'assets/js/vendor/**/*.js'], - tasks: ['jshint', 'concat', 'uglify'], - options: { - debounceDelay: 500 - } - } - }, + postcss: { + dist: { + options: { + processors: [ + require('autoprefixer-core')({browsers: 'last 2 versions'}) + ] + }, + files: { + 'assets/css/ascribe.css': [ 'assets/css/ascribe.css' ] + } + } + }, + + cssmin: { + options: { + banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' + + ' * <%=pkg.homepage %>\n' + + ' * Copyright (c) <%= grunt.template.today("yyyy") %>;' + + ' * Licensed GPLv2+' + + ' */\n' + }, + minify: { + expand: true, + + cwd: 'assets/css/', + src: ['ascribe.css'], + + dest: 'assets/css/', + ext: '.min.css' + } + }, + watch: { + livereload: { + files: ['assets/css/*.css'], + options: { + livereload: true + } + }, + styles: { + files: ['assets/css/less/**/*.less'], + tasks: ['less', 'autoprefixer', 'cssmin'], + options: { + debounceDelay: 500 + } + }, + scripts: { + files: ['assets/js/src/**/*.js', 'assets/js/vendor/**/*.js'], + tasks: ['jshint', 'concat', 'uglify'], + options: { + debounceDelay: 500 + } + } + }, 'sftp-deploy': { css: { auth: { @@ -168,20 +168,20 @@ module.exports = function( grunt ) { progress: true } } - } ); + } ); - // Load tasks - require('load-grunt-tasks')(grunt); + // Load tasks + require('load-grunt-tasks')(grunt); - // Register tasks - - grunt.registerTask( 'css', ['less', 'postcss', 'cssmin', 'sftp-deploy:css'] ); + // Register tasks - grunt.registerTask( 'js', ['jshint', 'concat', 'uglify', 'sftp-deploy:js'] ); + grunt.registerTask( 'css', ['less', 'postcss', 'cssmin', 'sftp-deploy:css'] ); - grunt.registerTask( 'controller', ['sftp-deploy:controller'] ); + grunt.registerTask( 'js', ['jshint', 'concat', 'uglify', 'sftp-deploy:js'] ); - grunt.registerTask( 'default', ['css', 'js', 'controller'] ); + grunt.registerTask( 'controller', ['sftp-deploy:controller'] ); - grunt.util.linefeed = '\n'; -}; + grunt.registerTask( 'default', ['css', 'js', 'controller'] ); + + grunt.util.linefeed = '\n'; +}; \ No newline at end of file diff --git a/assets/css/ascribe.css b/assets/css/ascribe.css index e69de29..4ebfe77 100644 --- a/assets/css/ascribe.css +++ b/assets/css/ascribe.css @@ -0,0 +1,7 @@ +/** + * ascribe + * http://wordpress.org/themes + * + * Copyright (c) 2015 Territorial + * Licensed under the GPLv2+ license. + */ diff --git a/assets/css/less/ascribe.less b/assets/css/less/ascribe.less index e69de29..4ebfe77 100644 --- a/assets/css/less/ascribe.less +++ b/assets/css/less/ascribe.less @@ -0,0 +1,7 @@ +/** + * ascribe + * http://wordpress.org/themes + * + * Copyright (c) 2015 Territorial + * Licensed under the GPLv2+ license. + */ diff --git a/humans.txt b/humans.txt index 2502fdb..63813ec 100644 --- a/humans.txt +++ b/humans.txt @@ -17,5 +17,5 @@ Twitter: @lkwdwrd /* SITE */ - Created: Wed Sep 16 2015 + Created: Thu Sep 17 2015 Template: https://github.com/10up/generator-wp-make \ No newline at end of file diff --git a/languages/wptheme.pot b/languages/wptheme.pot index fb2fd30..d9b1888 100644 --- a/languages/wptheme.pot +++ b/languages/wptheme.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ascribe\n" -"POT-Creation-Date: 2015-09-16T23:52:34.272Z\n" -"PO-Revision-Date: 2015-09-16T23:52:34.274Z\n" +"POT-Creation-Date: 2015-09-17T22:31:35.013Z\n" +"PO-Revision-Date: 2015-09-17T22:31:35.014Z\n" "Last-Translator: 10up \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/phpunit.xml.dist b/phpunit.xml.dist deleted file mode 100644 index a444c41..0000000 --- a/phpunit.xml.dist +++ /dev/null @@ -1,21 +0,0 @@ - - - - ./tests/phpunit - - - - - ./includes - - - - - - - - diff --git a/sftpCache.json b/sftpCache.json index 888b39a..d19e5e9 100644 --- a/sftpCache.json +++ b/sftpCache.json @@ -1 +1 @@ -{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-09-17T22:20:29.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-09-17T22:20:29.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-16T23:52:34.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-09-17T22:05:05.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-09-17T22:20:36.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-09-17T22:20:36.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-09-16T23:52:34.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-16T23:52:34.000Z"} \ No newline at end of file +{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-09-17T22:37:02.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-09-17T22:37:02.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-09-17T22:37:29.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-09-17T22:37:29.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-17T22:31:35.000Z"} \ No newline at end of file