Skip to content

Commit

Permalink
moving asset pipeline to repo, improving contrast on pink links, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddeutsch committed Jun 1, 2016
1 parent 63aadfa commit 0c06ad6
Show file tree
Hide file tree
Showing 21 changed files with 467 additions and 107 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ Install dependencies and build:

Done!

### CSS Assets

In `static/source`, run:

$ npm install
$ bower install

to install all the source libraries locally (you need [nodejs](https://nodejs.org) installed). Then:

$ gulp css

to create a new CSS file (automatically creates a minified version as well).

## Running

It runs at: http://localhost:1990/
Expand Down
1 change: 0 additions & 1 deletion hl.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ data-files: static/css/*.css
static/fonts/glyphicons-halflings-regular.svg
static/fonts/glyphicons-halflings-regular.eot
static/fonts/glyphicons-halflings-regular.woff
static/css/haskell.font.css
static/img/*.ico
static/img/*.jpg
static/img/*.png
Expand Down
2 changes: 1 addition & 1 deletion src/HL/View/Template.hs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ skeleton ptitle innerhead innerbody bodyender mroute url =
link_ [rel_ "shortcut icon",href_ (url (StaticR img_favicon_ico))]
linkcss "https://fonts.googleapis.com/css?family=Source+Sans+Pro|Raleway:700,900|Ubuntu+Mono:400"
styles url
[StaticR css_hl_css]
[StaticR css_hl_min_css]
innerhead mroute url
bodyinner =
do div_ [class_ "wrap"] (innerbody mroute url)
Expand Down
7 changes: 0 additions & 7 deletions static/css/bootstrap-theme.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions static/css/bootstrap.min.css

This file was deleted.

18 changes: 0 additions & 18 deletions static/css/haskell.font.css

This file was deleted.

6 changes: 2 additions & 4 deletions static/css/hl.css
Original file line number Diff line number Diff line change
Expand Up @@ -4492,7 +4492,7 @@ pre .hs-keyglyph {
word-wrap: break-word; }

.jquery-console-prompt-label {
color: #b764b2;
color: #db83ed;
font-weight: bold; }

.jquery-console-prompt-box {
Expand Down Expand Up @@ -4553,7 +4553,7 @@ pre .hs-keyglyph {
-webkit-box-shadow: 0 0 4em rgba(0, 0, 0, 0.25) inset;
box-shadow: 0 0 4em rgba(0, 0, 0, 0.25) inset; }
.pattern-bg a {
color: #be6ece; }
color: #db83ed; }
.pattern-bg a:hover {
color: #b663b1; }
.pattern-bg code {
Expand Down Expand Up @@ -4612,5 +4612,3 @@ pre .hs-keyglyph {
flex: 0 1 auto; }
.row-flex > div[class*='col-'] .thumbnail {
width: 100%; }

/*# sourceMappingURL=hl.css.map */
1 change: 0 additions & 1 deletion static/css/hl.css.map

This file was deleted.

3 changes: 3 additions & 0 deletions static/css/hl.min.css

Large diffs are not rendered by default.

68 changes: 0 additions & 68 deletions static/css/hscolour.css

This file was deleted.

2 changes: 2 additions & 0 deletions static/source/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/*
bower_components/*
22 changes: 22 additions & 0 deletions static/source/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "hl-assets",
"description": "",
"main": "gulpfile.js",
"authors": [
"David Deutsch <[email protected]>"
],
"license": "BSD3",
"homepage": "https://github.com/daviddeutsch/hl-assets",
"moduleType": [],
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"bootstrap-sass": "~3.3.6"
}
}
38 changes: 38 additions & 0 deletions static/source/gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
var gulp = require('gulp'),
postcss = require('gulp-postcss'),
sass = require('gulp-sass'),
rename = require('gulp-rename'),
sourcemaps = require('gulp-sourcemaps'),
concat = require('gulp-concat'),
autoprefixer = require('autoprefixer'),
cssnano = require('gulp-cssnano');

gulp.task('css', function() {
return gulp.src('scss/hl.scss')
//.pipe(sourcemaps.init())
.pipe(sass({ precision: 10 }))
.pipe(postcss([ autoprefixer({ browsers: [
"Android 2.3",
"Android >= 4",
"Chrome >= 20",
"Firefox >= 24",
"Explorer >= 8",
"iOS >= 6",
"Opera >= 12",
"Safari >= 6"
] }) ]))
//.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('../css/'))
.pipe(cssnano())
.pipe(rename({ extname: '.min.css' }))
.pipe(gulp.dest('../css/'));
});


gulp.task('watch', function() {
var watcher = gulp.watch('scss/*', ['css']);

watcher.on('change', function (event) {
console.log('File ' + event.path + ' was ' + event.type + '. Now running css task...');
});
});
Loading

0 comments on commit 0c06ad6

Please sign in to comment.