Permalink
Browse files

added cname, include, and styling'

  • Loading branch information...
1 parent f11ff59 commit c3d4fa7da1fbc9e07d13aecd0cb85259a43a6450 @leogdion leogdion committed Jan 2, 2015
Showing with 40 additions and 13 deletions.
  1. +1 −1 CNAME
  2. +15 −3 gulpfile.js
  3. +2 −1 package.json
  4. +7 −3 static/html/index.html
  5. +7 −4 static/js/main.js
  6. +8 −1 static/scss/style.scss
View
@@ -1 +1 @@
-www.speculid.com
+speculid.com
View
@@ -14,8 +14,12 @@ var gulp = require('gulp'),
yaml = require('js-yaml'),
uglify = require('gulp-uglify')
uglifycss = require('gulp-uglifycss')
- htmlmin = require('gulp-htmlmin');
+ htmlmin = require('gulp-htmlmin'),
+ htmlreplace = require('gulp-html-replace');
+var getPackageJson = function () {
+ return JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+};
var httpServer;
gulp.task('default', ['build', 'bump']);
gulp.task('build', ['clean', 'browserify', 'sass', 'htmlminify', 'copy']);
@@ -105,11 +109,19 @@ gulp.task('clean', function (cb) {
});
gulp.task('copy', ['clean'], function () {
- return es.merge(gulp.src('static/fonts/**/*.*').pipe(gulp.dest('public/fonts')), gulp.src('static/images/**/*.*').pipe(gulp.dest('public/images')));
+ return es.merge(
+ gulp.src('static/fonts/**/*.*').pipe(gulp.dest('public/fonts')),
+ gulp.src('static/images/**/*.*').pipe(gulp.dest('public/images')),
+ gulp.src('CNAME').pipe(gulp.dest('public')));
});
-gulp.task('htmlminify', ['clean'], function() {
+gulp.task('htmlminify', ['clean', 'bump'], function() {
+
gulp.src('static/html/**/*.html')
+ .pipe(htmlreplace({version: {
+ src: getPackageJson().version
+ //tpl: '<img src="%s" align="left" />'
+ }}))
.pipe(htmlmin({collapseWhitespace: true, removeComments: true, removeEmptyAttributes: true}))
.pipe(gulp.dest('public'))
});
View
@@ -1,6 +1,6 @@
{
"name": "speculid",
- "version": "0.1.22",
+ "version": "0.1.51",
"description": "Specifications for Mobile Application Development",
"main": "gulp",
"repository": {
@@ -22,6 +22,7 @@
"gulp": "^3.8.7",
"gulp-beautify": "^1.1.0",
"gulp-bump": "^0.1.11",
+ "gulp-html-replace": "^1.4.1",
"gulp-htmlmin": "^0.2.0",
"gulp-jshint": "^1.8.4",
"gulp-rename": "^1.2.0",
@@ -48,15 +48,19 @@
<header>
<img class="speculid logo" src="images/logo.svg">
<div>
- <h1>Speculid<a class="tiny-button minimize" href="#">&oline;</a></h1>
+ <h1>Speculid<span id="version">
+ <!-- build:version -->
+
+ <!-- endbuild -->
+ </span><a class="tiny-button minimize" title="Minimize the header bar." href="#">&oline;</a></h1>
<div class="tag">Specifications for Mobile Application Development</div>
<div id="social">
<a href="https://twitter.com/share" class="twitter-share-button" data-via="brightdigit" data-hashtags="ios">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
<div class="g-plusone" data-size="medium"></div>
<div class="fb-share-button" data-href="http://brightdigit.github.io/speculid/" data-layout="button_count">
</div>
- <button id="filter-expand">&#8615;</button>
+ <button id="filter-expand" title="Scroll down to display device and os filters.">&#8615;</button>
</div></div>
<a href="http://www.brightdigit.com"><img class="bd logo" src="images/brightdigit-logo.svg"></a>
@@ -94,7 +98,7 @@
</ol>
</div>
<div id="data">
- <h2>Graphic Element Sizes/Heights</h2><a class="tiny-button expand" href="#">+</a>
+ <h2>Graphic Element Sizes/Heights</h2><a class="tiny-button expand" title="Minimize the header bar" href="#">+</a>
<!--
<table>
<thead>
View
@@ -121,12 +121,15 @@ updateUI();
$('.minimize,.expand').empty().on('click', function () {
var $this = $(this);
- var inHeader = !!$this.parents('header').length;inHeader
- $('header').toggleClass('minimized', ($this.hasClass('minimize') ? inHeader : !inHeader));
+ var inHeader = !!$this.parents('header').length;
+ var minimized = ($this.hasClass('minimize') ? inHeader : !inHeader);
+ $('header').toggleClass('minimized',minimized );
var expandButton = $('.expand');
var minimizeButton = $('.minimize');
- minimizeButton.addClass('expand').removeClass('minimize');
- expandButton.addClass('minimize').removeClass('expand');
+ minimizeButton.addClass('expand').removeClass('minimize').attr('title', minimized ?
+ 'Expand the header bar.' : 'Minimize the header bar');
+ expandButton.addClass('minimize').removeClass('expand').attr('title',minimized ?
+ 'Expand the header bar.' : 'Minimize the header bar');
});
$('#menu').on('mouseover mouseleave', 'label', function (e) {
@@ -53,6 +53,13 @@ html, body {
width: 100%;
position: fixed;
border-bottom: transparentize(darken($oil, 20%), 0.66) solid 2px;
+ #version {
+ font-size: 0.25em;
+ vertical-align: top;
+ color: transparentize(darken($oil, 20%), 0.66);
+ margin-top: 5px;
+ display: inline-block;
+ }
#filter-expand {
position: relative;
top: -5px;
@@ -134,7 +141,7 @@ html, body {
#social {
position: absolute;
top: 5px;
- left: 150px;
+ left: 175px;
}
.tiny-button {
margin: 0px 5px;

0 comments on commit c3d4fa7

Please sign in to comment.