Pulled in updates and removed gulpfile.

This commit is contained in:
jordanbrauer 2016-12-13 21:58:10 -06:00
parent 968979b5df
commit 1b1858a7c7
5 changed files with 62 additions and 438 deletions

131
.gitignore vendored
View File

@ -1,129 +1,4 @@
### Custom ### .DS_Store
node_modules/
npm-debug.log
push_instructions.txt push_instructions.txt
cache
dist
test
### macOS ###
*.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msm
*.msp
# Windows shortcuts
*.lnk
### Sass ###
.sass-cache/
*.css.map
### Linux ###
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
### Node ###
# Logs
logs
*.log
npm-debug.log*
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
# nyc test coverage
.nyc_output
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules
jspm_packages
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
### Bower ###
bower_components
.bower-cache
.bower-registry
.bower-tmp

View File

@ -1,8 +1,4 @@
# Keyrune v1.7.2 # Keyrune v1.8.0
__Note:__
This is the SASS (`.scss`) version of Keyrune. If you are looking for the LESS version, please got to the [master branch](https://github.com/andrewgioia/Keyrune/tree/master).
## The Magic: the Gathering set symbol font! ## The Magic: the Gathering set symbol font!
@ -38,38 +34,35 @@ Attribution is **greatly appreciated** but not required!
## Changelog ## Changelog
* v0.1 - initial font creation and CSS/LESS files for all sets up to Fate Reforged * v1.8.0 - Amonkhet icon added; re-organized Readme with new updates at top
* v0.2 - all fonts are fluid width now so they will scale correctly without scaled padding; fixed width class added
* v1.0 - public launch via /r/magicTCG! added Dragons of Tarkir (DTK)
* v1.0.1 - Tempest Remastered added (non major set version)
* v1.0.2 - Modern Masters 2015 added
* v1.1.0 - Woff2 support added; Vintage Masters icon added
* v1.2.0 - Cheatsheet added to documentation site; variables changed in LESS files to be Keyrune specific
* v1.3.0 - Magic Origins icon added
* v1.3.1 - Duel Decks: Zendikar v. Eldrazi added
* v1.4.0 - Battle for Zendikar added
* v1.4.1 - Zendikar Expeditions added
* v1.4.2 - Commander 2015 added
* v1.4.3 - Beginning of white border add-on with .ss-border class; renamed font to Keyrune for desktop
* v1.5.0 - Oath of the Gatewatch and Shadows Over Innistrad added
* v1.5.1 - Eternal Masters added
* v1.5.2 - Conspiracy 2: Take the Crown added
* v1.5.3 - FTV: Angels and FTV: Lore
* v1.5.4 - Welcome Deck 2016
* v1.5.5 - Duel Deck: Blessed vs. Cursed added
* v1.5.6 - Added forgotten Salvat 2005 and 2011 (inserts into MTG Encyclopedias)
* v1.6.0 - Eldritch Moon icon added (based on low-res WOTC graphic)
* v1.6.1 - Updated EMN with the official high-res source image
* v1.6.2 - Added Legendary Cube icon; unfortunately there's no official set code
* v1.7.0 - Lots of new sets! Kaladesh, Aether Revolt, Modern Masters 2017, Plancechase Anthology, Commander 2016, and Duel Decks: Nissa v. Ob Nixilis added
* v1.7.1 - Cleaned up icon files to remove any with multiple paths; fixed UNH icon
* v1.7.2 - Added Kaladesh Inventions icon (labeled as MP1) * v1.7.2 - Added Kaladesh Inventions icon (labeled as MP1)
* v1.7.1 - Cleaned up icon files to remove any with multiple paths; fixed UNH icon
* v1.7.0 - Lots of new sets! Kaladesh, Aether Revolt, Modern Masters 2017, Planechase Anthology, Commander 2016, and Duel Decks: Nissa v. Ob Nixilis added
* v1.6.2 - Added Legendary Cube icon; unfortunately there's no official set code
* v1.6.1 - Updated EMN with the official high-res source image
* v1.6.0 - Eldritch Moon icon added (based on low-res WOTC graphic)
* v1.5.6 - Added forgotten Salvat 2005 and 2011 (inserts into MTG Encyclopedias)
* v1.5.5 - Duel Deck: Blessed vs. Cursed added
* v1.5.4 - Welcome Deck 2016
* v1.5.3 - FTV: Angels and FTV: Lore
* v1.5.2 - Conspiracy 2: Take the Crown added
* v1.5.1 - Eternal Masters added
* v1.5.0 - Oath of the Gatewatch and Shadows Over Innistrad added
* v1.4.3 - Beginning of white border add-on with .ss-border class; renamed font to Keyrune for desktop
* v1.4.2 - Commander 2015 added
* v1.4.1 - Zendikar Expeditions added
* v1.4.0 - Battle for Zendikar added
* v1.3.1 - Duel Decks: Zendikar v. Eldrazi added
* v1.3.0 - Magic Origins icon added
* v1.2.0 - Cheatsheet added to documentation site; variables changed in LESS files to be Keyrune specific
* v1.1.0 - Woff2 support added; Vintage Masters icon added
* v1.0.2 - Modern Masters 2015 added
* v1.0.1 - Tempest Remastered added (non major set version)
* v1.0.0 - public launch via /r/magicTCG! added Dragons of Tarkir (DTK)
* v0.2.0 - all fonts are fluid width now so they will scale correctly without scaled padding; fixed width class added
* v0.1.0 - initial font creation and CSS/LESS files for all sets up to Fate Reforged
## Todo ## Todo
* New [Coming Soon](http://magic.wizards.com/en/game-info/products/coming-soon) product page has symbols but not the necessary higher res versions * New [Coming Soon](http://magic.wizards.com/en/game-info/products/coming-soon) product page has symbols but not the necessary higher res versions
* Figure out what the Legendary Cube official set code is; currently using `xLCU` * Figure out what the Legendary Cube official set code is; currently using `xLCU`
* Look into tying a universal `.json` (modified version of mtg.json perhaps) file into the project to allow SASS and JavaScript to share variables.
* This will be useful for programmatically generating a complete glossary page (gh-pages) of icons. (similar to other font-package documentation pages [font-awesome, glyph-icons, google-md, etc]).
* Add a changelog generator to the project(?), reducing the amount of maintenance required to add new sets/features. :)
* Integrate with Mana symbol font project(?) into a singular MtG font package (LESS, and SASS versions).

View File

@ -1,7 +1,7 @@
{ {
"name": "keyrune", "name": "keyrune",
"homepage": "http://andrewgioia.github.io/Keyrune", "homepage": "http://andrewgioia.github.io/Keyrune",
"version": "1.7.2", "version": "1.8.0",
"authors": [ "authors": [
"Andrew Gioia <andrewgioia@gmail.com>" "Andrew Gioia <andrewgioia@gmail.com>"
], ],

View File

@ -1,124 +0,0 @@
// gulpfile.js
/*
* Dependencies =================================
* | uses/functions of each are provided indiviudally.
*/
var gulp = require('gulp'), // task runner/manager (even tho this is a small project, it's still nice to have)
sass = require('gulp-sass'), // compiles sass for us
notify = require('gulp-notify'), // notifies us when a gulp task is completed through a system notifcation
rename = require('gulp-rename'), // allows us to rename files (adding prefixes and suffixes is the main use here).
autoprefixer = require('gulp-autoprefixer'), // great for catching those annoying vendor prefixes on css attributets and values.
minify = require('gulp-cssnano'), // minify our compiled css. sass can do this natively (kind of), but this is used instead.
del = require('del'), // del is used to cleanup cache and build files.
runseq = require('run-sequence'), // quick and dirty way to run a sequence of tasks AS a task itself. gulp.run is deprecated
merge = require('merge'); // "merge multiple objects into one, optionally creating a new cloned object." -npm repo
/*
* Variables ====================================
* | silly, long, reused paths/dirs go here if needed.
*/
var $supported = [
'last 2 versions',
'safari >= 8',
'ie >= 10',
'ff >= 20',
'ios 6',
'android 4'
];
/*
* Gulp Tasks ===================================
* | All gulp tasks will be written/explained here.
*/
/*
* Build CSS Task -------------------------------
* | $ gulp build:css
* |
* | 1. compiles scss into css,
* | 2. autoprefix necessary css attributes/values,
* | 3. place compiled file into ./css directory
* | 4. minify prefixed css,
* | 5. rename minified file with a '.min' suffix,
* | 6. place minified file into ./css directory
* | 7. notify on task completion
*/
gulp.task('build:css', function() {
return gulp.src('./sass/**/*.scss')
.pipe(sass({ /* 1. */
outputStyle: 'expanded'
}).on('error', sass.logError))
.pipe(autoprefixer({ /* 2. */
browsers: $supported,
add: true,
cascade: false
}))
.pipe(gulp.dest('./css')) /* 3. */
.pipe(minify({ /* 4. */
discardUnused: { fontFace: false }
}))
.pipe(rename({ /* 5. */
suffix: '.min'
}))
.pipe(gulp.dest('./css')) /* 6. */
.pipe(notify({ /* 7. */
onLast: true,
message: 'build task complete!'
}));
});
/** Create Config -------------------------------
* | $ gulp gen:configFile
*/
gulp.task('gen:config', function() {
return gulp.src('./sass/config/_variables.scss')
.pipe(rename('_settings.scss'))
.pipe(gulp.dest('./sass/config'))
.pipe(notify({
onLast: true,
message: 'generated config file successfully!'
}));
});
/** Clean Task ----------------------------------
* | $ gulp clean
* |
* | Ensures that all artifacts/remnants of previous build are gone.
*/
gulp.task('clean', function() {
var stream1 = del(['./css/**/*.*']);
var stream2 = del(['./sass/config/_settings.scss']);
return merge(stream1, stream2);
});
/** Build Task -------------------------------
* | $ gulp build
*/
gulp.task('build', function(){
return runseq(
'clean',
'build:css',
'gen:config'
);
});
/*
* Watch Task -----------------------------------
* | $ gulp watch
* |
* | Great for automating compilation during develpoment.
*/
gulp.task('watch', function() {
gulp.watch('./sass/**/*.scss', ['build']);
});
/*
* Default Task ---------------------------------
* | $ gulp
* | $ gulp default
* |
* | Runs the watch task as a task dependency by default.
*/
gulp.task('default', ['watch']);

View File

@ -2,12 +2,10 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="chrome=1" />
<title>Keyrune</title> <title>Keyrune</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.2.3/foundation.css" /> <link rel="stylesheet" href="css/keyrune.css" />
<link rel="stylesheet" href="css/keyrune.min.css" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<!-- <link rel="stylesheet" href="css/keyrune.css" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css"> <style type="text/css">
body { body {
background: #fff; background: #fff;
@ -20,9 +18,6 @@
margin: 0; margin: 0;
padding: 0 100px; padding: 0 100px;
} }
h1 > small > code { /* i know this is lazy solution lol, but its a quick fix for now. */
font-size: 14px;
}
h3 { h3 {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
@ -39,123 +34,13 @@
</style> </style>
</head> </head>
<body> <body>
<!-- header --> <h1>Keyrune</h1>
<div class="row column"> <h2>Set Symbol Demos</h2>
<header>
<h1>Keyrune <small><code>ver 1.7.2_sass</code></small></h1>
<h2 class="subheader">Set Symbol Demos</h2>
<p> <p>
This HTML file is for demo purposes and is not necessary for Keyrune installation or use. This HTML file is for demo purposes and is not necessary for Keyrune installation or use.
You can view a few of the set symbol font icons and the available examples below You can view a few of the set symbol font icons and the available examples below
(some may only be available for specific browsers). (some may only be available for specific browsers).
</p> </p>
</header>
</div> <!-- /.row -->
<!-- common examples -->
<div class="row text-center">
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Common <small>(w/out gradient)</small></h3>
<p>
<i class="ss ss-default ss-common ss-6x"></i> &nbsp;
<i class="ss ss-default ss-common ss-5x"></i> &nbsp;
<i class="ss ss-default ss-common ss-4x"></i> &nbsp;
<i class="ss ss-default ss-common ss-3x"></i> &nbsp;
<i class="ss ss-default ss-common ss-2x"></i> &nbsp;
<i class="ss ss-default ss-common ss-1x"></i> &nbsp;
</p>
</div>
<h3>Default Setsymbol, Common <small>(w/ gradient)</small></h3>
<p>
<i class="ss ss-default ss-common ss-grad ss-6x"></i> &nbsp;
<i class="ss ss-default ss-common ss-grad ss-5x"></i> &nbsp;
<i class="ss ss-default ss-common ss-grad ss-4x"></i> &nbsp;
<i class="ss ss-default ss-common ss-grad ss-3x"></i> &nbsp;
<i class="ss ss-default ss-common ss-grad ss-2x"></i> &nbsp;
<i class="ss ss-default ss-common ss-grad ss-1x"></i> &nbsp;
</p>
</div> <!-- /.row -->
<!-- uncommon examples -->
<div class="row text-center">
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Uncommon <small>(w/out gradient)</small></h3>
<p>
<i class="ss ss-default ss-uncommon ss-6x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-5x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-4x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-3x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-2x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-1x"></i> &nbsp;
</p>
</div>
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Uncommon <small>(w/ gradient)</small></h3>
<p>
<i class="ss ss-default ss-uncommon ss-grad ss-6x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-grad ss-5x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-grad ss-4x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-grad ss-3x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-grad ss-2x"></i> &nbsp;
<i class="ss ss-default ss-uncommon ss-grad ss-1x"></i> &nbsp;
</p>
</div>
</div> <!-- /.row -->
<!-- rare examples -->
<div class="row text-center">
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Rare <small>(w/out gradient)</small></h3>
<p>
<i class="ss ss-default ss-rare ss-6x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-5x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-4x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-3x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-2x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-1x"></i> &nbsp;
</p>
</div>
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Rare <small>(w/ gradient)</small></h3>
<p>
<i class="ss ss-default ss-rare ss-grad ss-6x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-grad ss-5x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-grad ss-4x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-grad ss-3x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-grad ss-2x"></i> &nbsp;
<i class="ss ss-default ss-rare ss-grad ss-1x"></i> &nbsp;
</p>
</div>
</div> <!-- /.row -->
<!-- mythic examples -->
<div class="row text-center">
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Mythic <small>(w/out gradient)</small></h3>
<p>
<i class="ss ss-default ss-mythic ss-6x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-5x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-4x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-3x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-2x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-1x"></i> &nbsp;
</p>
</div>
<div class="columns small-12 medium-12 large-6">
<h3>Default Setsymbol, Mythic <small>(w/ gradient)</small></h3>
<p>
<i class="ss ss-default ss-mythic ss-grad ss-6x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-grad ss-5x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-grad ss-4x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-grad ss-3x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-grad ss-2x"></i> &nbsp;
<i class="ss ss-default ss-mythic ss-grad ss-1x"></i> &nbsp;
</p>
</div>
</div> <!-- /.row -->
<!-- old set symbol examples -->
<!--
<p> <p>
<i class="ss ss-leg ss-3x ss-common"></i>&nbsp; <i class="ss ss-leg ss-3x ss-common"></i>&nbsp;
<i class="ss ss-leg ss-2x ss-common"></i>&nbsp; <i class="ss ss-leg ss-2x ss-common"></i>&nbsp;
@ -175,18 +60,13 @@
Rare (Future Sight) Rare (Future Sight)
</p> </p>
<p> <p>
<i class="ss ss-wwk ss-3x ss-mythic ss-grad"></i>&nbsp; <i class="ss ss-zen ss-3x ss-mythic ss-grad"></i>&nbsp;
<i class="ss ss-wwk ss-2x ss-mythic"></i>&nbsp; <i class="ss ss-zen ss-2x ss-mythic"></i>&nbsp;
<i class="ss ss-wwk ss-mythic"></i>&nbsp; <i class="ss ss-zen ss-mythic"></i>&nbsp;
Mythic Rare (Worldwake) Mythic Rare (Worldwake)
</p> </p>
-->
<!-- footer -->
<div class="row column">
<footer> <footer>
Made with &hearts; by <a href="http://andrewgioia.com">Andrew Gioia</a> Made with &hearts; by <a href="http://andrewgioia.com">Andrew Gioia</a>
</footer> </footer>
</div> <!-- /.row -->
</body> </body>
</html> </html>