aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2020-02-17 18:24:06 +0100
committerMax Magorsch <arzano@gentoo.org>2020-02-17 18:24:06 +0100
commit3df5f6291e56ebc50831e8e8c1bf5fa0aecd7b20 (patch)
tree8dae648790510fb91406573f2ee0fe67af22dee1
parentUpdate Bootstrap to 3.4.1 (diff)
downloadtyrian-theme-3df5f6291e56ebc50831e8e8c1bf5fa0aecd7b20.tar.gz
tyrian-theme-3df5f6291e56ebc50831e8e8c1bf5fa0aecd7b20.tar.bz2
tyrian-theme-3df5f6291e56ebc50831e8e8c1bf5fa0aecd7b20.zip
Restructure the project for usage with npm/yarnv1.0.0tyrian-v1
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--.gitignore12
-rw-r--r--.gitmodules3
-rw-r--r--Dockerfile (renamed from docker/Dockerfile)2
-rw-r--r--Gruntfile.js129
-rw-r--r--Makefile2
-rw-r--r--README.md17
-rwxr-xr-xbin/run.sh13
-rwxr-xr-xdocker/run.sh22
-rw-r--r--examples/tyrian.html (renamed from index.html)16
-rw-r--r--package.json36
m---------sources/css/bootstrap0
-rw-r--r--sources/css/tyrian/.gitignore2
-rw-r--r--sources/css/tyrian/Gruntfile.js81
-rw-r--r--sources/css/tyrian/dist/.gitignore1
-rw-r--r--sources/css/tyrian/package.json12
-rw-r--r--src/fonts/Bitter-Regular.woff (renamed from sources/fonts/Bitter-Regular.woff)bin32460 -> 32460 bytes
-rw-r--r--src/fonts/FontAwesome.otf (renamed from sources/fonts/FontAwesome.otf)bin134808 -> 134808 bytes
-rw-r--r--src/fonts/OpenSans-Bold.woff (renamed from sources/fonts/OpenSans-Bold.woff)bin25516 -> 25516 bytes
-rw-r--r--src/fonts/OpenSans-BoldItalic.woff (renamed from sources/fonts/OpenSans-BoldItalic.woff)bin26196 -> 26196 bytes
-rw-r--r--src/fonts/OpenSans-Italic.woff (renamed from sources/fonts/OpenSans-Italic.woff)bin26640 -> 26640 bytes
-rw-r--r--src/fonts/OpenSans-Regular.woff (renamed from sources/fonts/OpenSans-Regular.woff)bin25680 -> 25680 bytes
-rw-r--r--src/fonts/fontawesome-webfont.eot (renamed from sources/fonts/fontawesome-webfont.eot)bin165742 -> 165742 bytes
-rw-r--r--src/fonts/fontawesome-webfont.svg (renamed from sources/fonts/fontawesome-webfont.svg)0
-rw-r--r--src/fonts/fontawesome-webfont.ttf (renamed from sources/fonts/fontawesome-webfont.ttf)bin165548 -> 165548 bytes
-rw-r--r--src/fonts/fontawesome-webfont.woff (renamed from sources/fonts/fontawesome-webfont.woff)bin98024 -> 98024 bytes
-rw-r--r--src/fonts/fontawesome-webfont.woff2 (renamed from sources/fonts/fontawesome-webfont.woff2)bin77160 -> 77160 bytes
-rw-r--r--src/img/ad1.png (renamed from sources/img/ad1.png)bin4828 -> 4828 bytes
-rw-r--r--src/img/ad2.png (renamed from sources/img/ad2.png)bin26120 -> 26120 bytes
-rw-r--r--src/img/ad3.png (renamed from sources/img/ad3.png)bin8939 -> 8939 bytes
-rw-r--r--src/img/black-thing.png (renamed from sources/img/black-thing.png)bin1069 -> 1069 bytes
-rw-r--r--src/img/black-thing.svg (renamed from sources/img/black-thing.svg)0
-rw-r--r--src/img/black-thing@2x.png (renamed from sources/img/black-thing@2x.png)bin2877 -> 2877 bytes
-rw-r--r--src/img/site-logo-green.png (renamed from sources/img/site-logo-green.png)bin12306 -> 12306 bytes
-rw-r--r--src/img/site-logo.png (renamed from sources/img/site-logo.png)bin14200 -> 14200 bytes
-rw-r--r--src/img/site-logo.svg (renamed from sources/img/site-logo.svg)0
-rw-r--r--src/img/site-logo@2x.png (renamed from sources/img/site-logo@2x.png)bin48003 -> 48003 bytes
-rw-r--r--src/img/src/black-thing.ai (renamed from sources/img/src/black-thing.ai)0
-rw-r--r--src/img/src/site-logo.ai (renamed from sources/img/src/site-logo.ai)0
-rw-r--r--src/img/src/znurt.ai (renamed from sources/img/src/znurt.ai)0
-rw-r--r--src/img/znurt.png (renamed from sources/img/znurt.png)bin3606 -> 3606 bytes
-rw-r--r--src/img/znurt.svg (renamed from sources/img/znurt.svg)0
-rw-r--r--src/img/znurt@2x.png (renamed from sources/img/znurt@2x.png)bin7983 -> 7983 bytes
-rw-r--r--src/js/retina.min.js (renamed from sources/js/retina.min.js)0
-rw-r--r--src/less/bootstrap-overrides.less (renamed from sources/css/tyrian/less/bootstrap-overrides.less)0
-rw-r--r--src/less/font-awesome/animated.less (renamed from sources/css/tyrian/less/font-awesome/animated.less)0
-rw-r--r--src/less/font-awesome/bordered-pulled.less (renamed from sources/css/tyrian/less/font-awesome/bordered-pulled.less)0
-rw-r--r--src/less/font-awesome/core.less (renamed from sources/css/tyrian/less/font-awesome/core.less)0
-rw-r--r--src/less/font-awesome/fixed-width.less (renamed from sources/css/tyrian/less/font-awesome/fixed-width.less)0
-rw-r--r--src/less/font-awesome/font-awesome.less (renamed from sources/css/tyrian/less/font-awesome/font-awesome.less)0
-rw-r--r--src/less/font-awesome/icons.less (renamed from sources/css/tyrian/less/font-awesome/icons.less)0
-rw-r--r--src/less/font-awesome/larger.less (renamed from sources/css/tyrian/less/font-awesome/larger.less)0
-rw-r--r--src/less/font-awesome/list.less (renamed from sources/css/tyrian/less/font-awesome/list.less)0
-rw-r--r--src/less/font-awesome/mixins.less (renamed from sources/css/tyrian/less/font-awesome/mixins.less)0
-rw-r--r--src/less/font-awesome/path.less (renamed from sources/css/tyrian/less/font-awesome/path.less)0
-rw-r--r--src/less/font-awesome/rotated-flipped.less (renamed from sources/css/tyrian/less/font-awesome/rotated-flipped.less)0
-rw-r--r--src/less/font-awesome/screen-reader.less (renamed from sources/css/tyrian/less/font-awesome/screen-reader.less)0
-rw-r--r--src/less/font-awesome/stacked.less (renamed from sources/css/tyrian/less/font-awesome/stacked.less)0
-rw-r--r--src/less/font-awesome/variables.less (renamed from sources/css/tyrian/less/font-awesome/variables.less)2
-rw-r--r--src/less/fonts.less (renamed from sources/css/tyrian/less/fonts.less)0
-rw-r--r--src/less/footer.less (renamed from sources/css/tyrian/less/footer.less)0
-rw-r--r--src/less/header.less (renamed from sources/css/tyrian/less/header.less)0
-rw-r--r--src/less/misc.less (renamed from sources/css/tyrian/less/misc.less)0
-rw-r--r--src/less/navbar.less (renamed from sources/css/tyrian/less/navbar.less)0
-rw-r--r--src/less/social-buttons.less (renamed from sources/css/tyrian/less/social-buttons.less)0
-rw-r--r--src/less/typography.less (renamed from sources/css/tyrian/less/typography.less)0
-rw-r--r--src/less/tyrian.less (renamed from sources/css/tyrian/less/tyrian.less)4
-rw-r--r--src/less/variables-tyrian.less (renamed from sources/css/tyrian/bootstrap/variables-tyrian.less)0
67 files changed, 131 insertions, 223 deletions
diff --git a/.gitignore b/.gitignore
index 810725f..b26fbe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-/.DS_Store
-/node_modules
-/assets/*
+.DS_Store
+node_modules
+assets
+dist
# Ignore these due to dynamic build process
-/package-lock.json
-/sources/css/tyrian/package-lock.json
+package-lock.json
# ignore npm cache
-/npm-cacache
+npm-cacache \ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4ac8439..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "sources/css/bootstrap"]
- path = sources/css/bootstrap
- url = https://github.com/twbs/bootstrap.git
diff --git a/docker/Dockerfile b/Dockerfile
index 146af73..1238b37 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
FROM node:alpine
ENTRYPOINT ["/run.sh"]
-COPY /run.sh /run.sh
+COPY bin/run.sh /run.sh
RUN mkdir -p /repo
VOLUME /repo
diff --git a/Gruntfile.js b/Gruntfile.js
index f2a6931..ad70d68 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,94 +2,81 @@
// Alex Legler <a3li@gentoo.org>
'use strict';
-
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
- shell: {
- update_bootstrap: {
- command: ['git submodule update --init --checkout', 'npm i'].join('&&'),
+ less: {
+ compile: {
options: {
- execOptions: {
- cwd: 'sources/css/bootstrap/'
- }
+ strictMath: true,
+ paths: ["node_modules"]
+ },
+ files: {
+ "dist/tyrian.css": "src/less/tyrian.less"
}
},
- build_tyrian_css: {
- command: 'grunt dist',
+ minify: {
options: {
- stdout: true,
- execOptions: {
- cwd: './sources/css/tyrian/'
- }
+ compress: true,
+ yuicompress: true,
+ optimization: 2
+ },
+ files: {
+ "dist/tyrian.min.css": "dist/tyrian.css"
}
}
},
- copy: {
- copy_assets: {
+ replace: {
+ compile: {
+ options: {
+ patterns: [
+ {
+ match: /^(.*\r?\n)*\/\* tyrian-start \*\/\r?\n/gm,
+ replacement: ""
+ }
+ ]
+ },
+ files: [
+ {expand: true, flatten: true, src: ['dist/tyrian.css'], dest: 'dist/'}
+ ]
+ },
+ inject_variables: {
+ options: {
+ patterns: [
+ {
+ match: /@import "variables\.less";$/m,
+ replacement: '@import "variables.less"; @import "../../tyrian/bootstrap/variables-tyrian.less";'
+ }
+ ],
+ silent: true
+ },
files: [
- {
- cwd: 'sources/css/bootstrap/dist/',
- src: [
- 'js/bootstrap.js',
- 'js/bootstrap.min.js',
- 'css/bootstrap.css',
- 'css/bootstrap.css.map',
- 'css/bootstrap.min.css',
- 'fonts/*'
- ],
- dest: 'assets/',
- expand: true,
- flatten: true
- },
- {
- cwd: 'sources/css/tyrian/dist/',
- src: [
- '*.css'
- ],
- dest: 'assets/',
- expand: true,
- flatten: true
- },
- {
- cwd: 'sources/fonts/',
- src: [
- '*.*'
- ],
- dest: 'assets/',
- expand: true,
- flatten: true
- },
- {
- cwd: 'sources/img/',
- src: [
- '*.*'
- ],
- dest: 'assets/',
- expand: true,
- flatten: true
- },
- {
- cwd: 'sources/js/',
- src: [
- '*.*'
- ],
- dest: 'assets/',
- expand: true,
- flatten: true
- },
+ {expand: true, flatten: true, src: ['../bootstrap/less/bootstrap.less'], dest: '../bootstrap/less/'}
]
}
+ },
+ shell: {
+ build_bootstrap: {
+ command: 'grunt dist',
+ options: {
+ stdout: true,
+ execOptions: {
+ cwd: '../bootstrap/'
+ }
+ }
+ }
}
});
- grunt.loadNpmTasks("grunt-contrib-copy");
+ grunt.loadNpmTasks("grunt-contrib-less");
+ grunt.loadNpmTasks("grunt-replace-regex");
grunt.loadNpmTasks("grunt-shell");
- grunt.registerTask("compile", ["shell:build_tyrian_css"]);
- grunt.registerTask("copy_assets", ["copy:copy_assets"]);
+ grunt.registerTask("compile", ["less:compile", "replace:compile"]);
+ grunt.registerTask("compress", ["less:minify"]);
+ grunt.registerTask("bootstrap", ["replace:inject_variables", "shell:build_bootstrap"]);
- grunt.registerTask("default", ["compile", "copy_assets"]);
-
- grunt.registerTask("update_bootstrap", ["shell:update_bootstrap"]);
+ grunt.registerTask("dist", ["compile", "compress"]);
+ grunt.registerTask("default", ["dist"]);
};
+
diff --git a/Makefile b/Makefile
index 074e3ee..1dfd820 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ docker-build:
docker build \
-t $(TAG_LATEST) \
-t $(TAG_TS) \
- docker/
+ .
docker-run: docker-build
@mkdir -p $(CACHEDIR_EXT)
diff --git a/README.md b/README.md
index d2f6a69..062460f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
tyrian
======
-Tyrian – The new look of gentoo.org
+Tyrian - The new look of gentoo.org
### Deployment
@@ -10,14 +10,13 @@ See assets-cdn.txt for the URLs.
### Development (local)
-* `emerge net-libs/nodejs` to get node.js up and running
-* `sudo npm install -g grunt-cli` to get grunt(1)
-* clone this repository (don't forget to `init` and `update` the git submodules)
-* run `npm install` in the repository root as well as in `sources/css/{bootstrap,tyrian}`
-* run `grunt`
-* Output appears in `assets/`
+* `emerge net-libs/nodejs` to get node.js up and running (you will need at least npm v6.9.0)
+* clone this repository
+* run `npm install` in the repository root
+* run `npm run dist` in the repository root
+* Output appears in `dist/`
### Development (containerized)
-* clone this repository (don't forget to `init` and `update` the git submodules)
+* clone this repository
* run `make docker-run`
-* Output appears in `assets/`
+* Output appears in `dist/`
diff --git a/bin/run.sh b/bin/run.sh
new file mode 100755
index 0000000..82e720a
--- /dev/null
+++ b/bin/run.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# POSIX sh, not bash!
+die() {
+ set +x
+ echo "$*" 1>&2
+ exit 1
+}
+# export for debugging
+[ "$DEBUG" == "1" ] && set -x
+# go to volume
+cd /repo
+npm install || die "FAIL:${PWD}: npm install failed"
+npm run dist || die "FAIL:${PWD}: npm run dist failed" \ No newline at end of file
diff --git a/docker/run.sh b/docker/run.sh
deleted file mode 100755
index b9c9a3f..0000000
--- a/docker/run.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# POSIX sh, not bash!
-die() {
- set +x
- echo "$*" 1>&2
- exit 1
-}
-# export for debugging
-[ "$DEBUG" == "1" ] && set -x
-# go to volume
-cd /repo
-basedir=$PWD
-# create output directory:
-mkdir -p assets
-# install grunt
-npm install -g grunt-cli || die "FAIL:${PWD}: npm install -g grunt-cli"
-# setup
-for d in sources/css/bootstrap sources/css/tyrian . ; do
- cd $basedir/$d && npm install || die "FAIL:${PWD}: npm install failed"
-done
-# do the build
-cd $basedir && grunt || die "FAIL:${PWD}: grunt"
diff --git a/index.html b/examples/tyrian.html
index ef65036..2c1df5d 100644
--- a/index.html
+++ b/examples/tyrian.html
@@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#54487a">
<meta name="description" content="">
- <link href="assets/bootstrap.css" rel="stylesheet" media="screen">
- <link href="assets/tyrian.css" rel="stylesheet" media="screen">
+ <link href="../dist/bootstrap.css" rel="stylesheet" media="screen">
+ <link href="../dist/tyrian.css" rel="stylesheet" media="screen">
</head>
<body>
<header>
@@ -39,8 +39,8 @@
</div>
<div class="logo">
<a href="/" title="Back to the homepage" class="site-logo">
- <object data="assets/site-logo.svg" type="image/svg+xml">
- <img src="assets/site-logo.png" alt="Gentoo Linux Logo">
+ <object data="../dist/site-logo.svg" type="image/svg+xml">
+ <img src="../dist/site-logo.png" alt="Gentoo Linux Logo">
</object>
</a>
<span class="site-label">Site Title</span>
@@ -156,9 +156,9 @@
<h2>Sponsors</h2>
<p>Gentoo is proudly sponsored by:</p>
<p style="text-align: center;">
- <img src="assets/ad1.png" alt="ad" style="margin-right: 1em;">
- <img src="assets/ad2.png" alt="ad" style="margin-right: 1em;">
- <img src="assets/ad3.png" alt="ad">
+ <img src="../dist/ad1.png" alt="ad" style="margin-right: 1em;">
+ <img src="../dist/ad2.png" alt="ad" style="margin-right: 1em;">
+ <img src="../dist/ad3.png" alt="ad">
</p>
</div>
</div>
@@ -242,6 +242,6 @@
</footer>
<script src="http://code.jquery.com/jquery.js"></script>
- <script src="assets/bootstrap.js"></script>
+ <script src="../dist/bootstrap.js"></script>
</body>
</html>
diff --git a/package.json b/package.json
index aa9d859..22e1411 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,39 @@
{
- "name": "gentoo-tyrian",
- "version": "0.0.1",
+ "name": "@gentoo/tyrian",
+ "version": "1.0.0",
"description": "Gentoo Tyrian theme",
- "repository": "https://anongit.gentoo.org/git/sites/tyrian-theme.git",
+ "repository": {
+ "type": "git",
+ "url": "https://anongit.gentoo.org/git/sites/tyrian-theme.git"
+ },
+ "files": [
+ "dist",
+ "src"
+ ],
"devDependencies": {
+ "npm-run-all": "^4.1.2",
"grunt": "~1.0.4",
"grunt-contrib-copy": "~1.0.0",
- "grunt-shell": "~3.0.1"
+ "grunt-shell": "~3.0.1",
+ "grunt-contrib-less": "~2.0.0",
+ "grunt-replace-regex": "~1.0.3"
+ },
+ "scripts": {
+ "prepare": "npm run dist",
+ "dist": "npm-run-all clean:dist css:tyrian:dist copy:assets",
+ "clean:dist": "rm -rf dist && mkdir -p dist",
+ "css:tyrian:dist": "grunt",
+ "copy:assets": "npm-run-all copy:js copy:img copy:fonts copy:tyrian:assets",
+ "copy:js": "cp src/js/*.js dist",
+ "copy:img": "cp src/img/*.* dist",
+ "copy:fonts": "cp src/fonts/*.* dist",
+ "copy:tyrian:assets": "cp node_modules/bootstrap/dist/fonts/* dist && cp node_modules/bootstrap/dist/js/bootstrap.js dist && cp node_modules/bootstrap/dist/js/bootstrap.min.js dist && cp node_modules/bootstrap/dist/css/bootstrap.css dist && cp node_modules/bootstrap/dist/css/bootstrap.css.map dist && cp node_modules/bootstrap/dist/css/bootstrap.min.css dist"
+ },
+ "dependencies": {
+ "jquery": "^3.3.1",
+ "popper.js": "1.14.7",
+ "bootstrap": "3.4.1",
+ "font-awesome": "4.7.0",
+ "autoprefixer": "^7.2.4"
}
}
diff --git a/sources/css/bootstrap b/sources/css/bootstrap
deleted file mode 160000
-Subproject 68b0d231a13201eb14acd3dc84e51543d16e5f7
diff --git a/sources/css/tyrian/.gitignore b/sources/css/tyrian/.gitignore
deleted file mode 100644
index a088b6f..0000000
--- a/sources/css/tyrian/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-bower_components
diff --git a/sources/css/tyrian/Gruntfile.js b/sources/css/tyrian/Gruntfile.js
deleted file mode 100644
index 1d3be90..0000000
--- a/sources/css/tyrian/Gruntfile.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Tyrian -- the new look of gentoo.org
-// Alex Legler <a3li@gentoo.org>
-
-'use strict';
-module.exports = function(grunt) {
- grunt.initConfig({
- pkg: grunt.file.readJSON('package.json'),
- less: {
- compile: {
- options: {
- strictMath: true,
- },
- files: {
- "dist/tyrian.css": "less/tyrian.less"
- }
- },
- minify: {
- options: {
- compress: true,
- yuicompress: true,
- optimization: 2
- },
- files: {
- "dist/tyrian.min.css": "dist/tyrian.css"
- }
- }
- },
- replace: {
- compile: {
- options: {
- patterns: [
- {
- match: /^(.*\r?\n)*\/\* tyrian-start \*\/\r?\n/gm,
- replacement: ""
- }
- ]
- },
- files: [
- {expand: true, flatten: true, src: ['dist/tyrian.css'], dest: 'dist/'}
- ]
- },
- inject_variables: {
- options: {
- patterns: [
- {
- match: /@import "variables\.less";$/m,
- replacement: '@import "variables.less"; @import "../../tyrian/bootstrap/variables-tyrian.less";'
- }
- ],
- silent: true
- },
- files: [
- {expand: true, flatten: true, src: ['../bootstrap/less/bootstrap.less'], dest: '../bootstrap/less/'}
- ]
- }
- },
- shell: {
- build_bootstrap: {
- command: 'grunt dist',
- options: {
- stdout: true,
- execOptions: {
- cwd: '../bootstrap/'
- }
- }
- }
- }
- });
-
- grunt.loadNpmTasks("grunt-contrib-less");
- grunt.loadNpmTasks("grunt-replace-regex");
- grunt.loadNpmTasks("grunt-shell");
-
- grunt.registerTask("compile", ["less:compile", "replace:compile"]);
- grunt.registerTask("compress", ["less:minify"]);
- grunt.registerTask("bootstrap", ["replace:inject_variables", "shell:build_bootstrap"]);
-
- grunt.registerTask("dist", ["bootstrap", "compile", "compress"]);
- grunt.registerTask("default", ["dist"]);
-};
-
diff --git a/sources/css/tyrian/dist/.gitignore b/sources/css/tyrian/dist/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/sources/css/tyrian/dist/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/sources/css/tyrian/package.json b/sources/css/tyrian/package.json
deleted file mode 100644
index 84881db..0000000
--- a/sources/css/tyrian/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "gentoo-tyrian-css",
- "description": "CSS base for Gentoo Tyrian theme",
- "repository": "https://anongit.gentoo.org/git/sites/tyrian-theme.git",
- "version": "0.0.1",
- "devDependencies": {
- "grunt": "~1.0.4",
- "grunt-contrib-less": "~2.0.0",
- "grunt-replace-regex": "~1.0.3",
- "grunt-shell": "~3.0.1"
- }
-}
diff --git a/sources/fonts/Bitter-Regular.woff b/src/fonts/Bitter-Regular.woff
index 8060e0a..8060e0a 100644
--- a/sources/fonts/Bitter-Regular.woff
+++ b/src/fonts/Bitter-Regular.woff
Binary files differ
diff --git a/sources/fonts/FontAwesome.otf b/src/fonts/FontAwesome.otf
index 401ec0f..401ec0f 100644
--- a/sources/fonts/FontAwesome.otf
+++ b/src/fonts/FontAwesome.otf
Binary files differ
diff --git a/sources/fonts/OpenSans-Bold.woff b/src/fonts/OpenSans-Bold.woff
index f1d1a88..f1d1a88 100644
--- a/sources/fonts/OpenSans-Bold.woff
+++ b/src/fonts/OpenSans-Bold.woff
Binary files differ
diff --git a/sources/fonts/OpenSans-BoldItalic.woff b/src/fonts/OpenSans-BoldItalic.woff
index baafce8..baafce8 100644
--- a/sources/fonts/OpenSans-BoldItalic.woff
+++ b/src/fonts/OpenSans-BoldItalic.woff
Binary files differ
diff --git a/sources/fonts/OpenSans-Italic.woff b/src/fonts/OpenSans-Italic.woff
index 1e86f12..1e86f12 100644
--- a/sources/fonts/OpenSans-Italic.woff
+++ b/src/fonts/OpenSans-Italic.woff
Binary files differ
diff --git a/sources/fonts/OpenSans-Regular.woff b/src/fonts/OpenSans-Regular.woff
index a5ba4b5..a5ba4b5 100644
--- a/sources/fonts/OpenSans-Regular.woff
+++ b/src/fonts/OpenSans-Regular.woff
Binary files differ
diff --git a/sources/fonts/fontawesome-webfont.eot b/src/fonts/fontawesome-webfont.eot
index e9f60ca..e9f60ca 100644
--- a/sources/fonts/fontawesome-webfont.eot
+++ b/src/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/sources/fonts/fontawesome-webfont.svg b/src/fonts/fontawesome-webfont.svg
index 855c845..855c845 100644
--- a/sources/fonts/fontawesome-webfont.svg
+++ b/src/fonts/fontawesome-webfont.svg
diff --git a/sources/fonts/fontawesome-webfont.ttf b/src/fonts/fontawesome-webfont.ttf
index 35acda2..35acda2 100644
--- a/sources/fonts/fontawesome-webfont.ttf
+++ b/src/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/sources/fonts/fontawesome-webfont.woff b/src/fonts/fontawesome-webfont.woff
index 400014a..400014a 100644
--- a/sources/fonts/fontawesome-webfont.woff
+++ b/src/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/sources/fonts/fontawesome-webfont.woff2 b/src/fonts/fontawesome-webfont.woff2
index 4d13fc6..4d13fc6 100644
--- a/sources/fonts/fontawesome-webfont.woff2
+++ b/src/fonts/fontawesome-webfont.woff2
Binary files differ
diff --git a/sources/img/ad1.png b/src/img/ad1.png
index f8e5e6e..f8e5e6e 100644
--- a/sources/img/ad1.png
+++ b/src/img/ad1.png
Binary files differ
diff --git a/sources/img/ad2.png b/src/img/ad2.png
index b4ee87b..b4ee87b 100644
--- a/sources/img/ad2.png
+++ b/src/img/ad2.png
Binary files differ
diff --git a/sources/img/ad3.png b/src/img/ad3.png
index a2d007b..a2d007b 100644
--- a/sources/img/ad3.png
+++ b/src/img/ad3.png
Binary files differ
diff --git a/sources/img/black-thing.png b/src/img/black-thing.png
index 9f3d248..9f3d248 100644
--- a/sources/img/black-thing.png
+++ b/src/img/black-thing.png
Binary files differ
diff --git a/sources/img/black-thing.svg b/src/img/black-thing.svg
index 09f9b3c..09f9b3c 100644
--- a/sources/img/black-thing.svg
+++ b/src/img/black-thing.svg
diff --git a/sources/img/black-thing@2x.png b/src/img/black-thing@2x.png
index 39feb9d..39feb9d 100644
--- a/sources/img/black-thing@2x.png
+++ b/src/img/black-thing@2x.png
Binary files differ
diff --git a/sources/img/site-logo-green.png b/src/img/site-logo-green.png
index 9118ce7..9118ce7 100644
--- a/sources/img/site-logo-green.png
+++ b/src/img/site-logo-green.png
Binary files differ
diff --git a/sources/img/site-logo.png b/src/img/site-logo.png
index 27bc851..27bc851 100644
--- a/sources/img/site-logo.png
+++ b/src/img/site-logo.png
Binary files differ
diff --git a/sources/img/site-logo.svg b/src/img/site-logo.svg
index fd9cf14..fd9cf14 100644
--- a/sources/img/site-logo.svg
+++ b/src/img/site-logo.svg
diff --git a/sources/img/site-logo@2x.png b/src/img/site-logo@2x.png
index cf8e20c..cf8e20c 100644
--- a/sources/img/site-logo@2x.png
+++ b/src/img/site-logo@2x.png
Binary files differ
diff --git a/sources/img/src/black-thing.ai b/src/img/src/black-thing.ai
index 2df2b48..2df2b48 100644
--- a/sources/img/src/black-thing.ai
+++ b/src/img/src/black-thing.ai
diff --git a/sources/img/src/site-logo.ai b/src/img/src/site-logo.ai
index 5a3da51..5a3da51 100644
--- a/sources/img/src/site-logo.ai
+++ b/src/img/src/site-logo.ai
diff --git a/sources/img/src/znurt.ai b/src/img/src/znurt.ai
index 8814961..8814961 100644
--- a/sources/img/src/znurt.ai
+++ b/src/img/src/znurt.ai
diff --git a/sources/img/znurt.png b/src/img/znurt.png
index e877664..e877664 100644
--- a/sources/img/znurt.png
+++ b/src/img/znurt.png
Binary files differ
diff --git a/sources/img/znurt.svg b/src/img/znurt.svg
index 5d1495c..5d1495c 100644
--- a/sources/img/znurt.svg
+++ b/src/img/znurt.svg
diff --git a/sources/img/znurt@2x.png b/src/img/znurt@2x.png
index 6999d85..6999d85 100644
--- a/sources/img/znurt@2x.png
+++ b/src/img/znurt@2x.png
Binary files differ
diff --git a/sources/js/retina.min.js b/src/js/retina.min.js
index 1a10527..1a10527 100644
--- a/sources/js/retina.min.js
+++ b/src/js/retina.min.js
diff --git a/sources/css/tyrian/less/bootstrap-overrides.less b/src/less/bootstrap-overrides.less
index ead9dc8..ead9dc8 100644
--- a/sources/css/tyrian/less/bootstrap-overrides.less
+++ b/src/less/bootstrap-overrides.less
diff --git a/sources/css/tyrian/less/font-awesome/animated.less b/src/less/font-awesome/animated.less
index 66ad52a..66ad52a 100644
--- a/sources/css/tyrian/less/font-awesome/animated.less
+++ b/src/less/font-awesome/animated.less
diff --git a/sources/css/tyrian/less/font-awesome/bordered-pulled.less b/src/less/font-awesome/bordered-pulled.less
index f1c8ad7..f1c8ad7 100644
--- a/sources/css/tyrian/less/font-awesome/bordered-pulled.less
+++ b/src/less/font-awesome/bordered-pulled.less
diff --git a/sources/css/tyrian/less/font-awesome/core.less b/src/less/font-awesome/core.less
index c577ac8..c577ac8 100644
--- a/sources/css/tyrian/less/font-awesome/core.less
+++ b/src/less/font-awesome/core.less
diff --git a/sources/css/tyrian/less/font-awesome/fixed-width.less b/src/less/font-awesome/fixed-width.less
index 110289f..110289f 100644
--- a/sources/css/tyrian/less/font-awesome/fixed-width.less
+++ b/src/less/font-awesome/fixed-width.less
diff --git a/sources/css/tyrian/less/font-awesome/font-awesome.less b/src/less/font-awesome/font-awesome.less
index c3677de..c3677de 100644
--- a/sources/css/tyrian/less/font-awesome/font-awesome.less
+++ b/src/less/font-awesome/font-awesome.less
diff --git a/sources/css/tyrian/less/font-awesome/icons.less b/src/less/font-awesome/icons.less
index 159d600..159d600 100644
--- a/sources/css/tyrian/less/font-awesome/icons.less
+++ b/src/less/font-awesome/icons.less
diff --git a/sources/css/tyrian/less/font-awesome/larger.less b/src/less/font-awesome/larger.less
index c9d6467..c9d6467 100644
--- a/sources/css/tyrian/less/font-awesome/larger.less
+++ b/src/less/font-awesome/larger.less
diff --git a/sources/css/tyrian/less/font-awesome/list.less b/src/less/font-awesome/list.less
index 0b44038..0b44038 100644
--- a/sources/css/tyrian/less/font-awesome/list.less
+++ b/src/less/font-awesome/list.less
diff --git a/sources/css/tyrian/less/font-awesome/mixins.less b/src/less/font-awesome/mixins.less
index beef231..beef231 100644
--- a/sources/css/tyrian/less/font-awesome/mixins.less
+++ b/src/less/font-awesome/mixins.less
diff --git a/sources/css/tyrian/less/font-awesome/path.less b/src/less/font-awesome/path.less
index 835be41..835be41 100644
--- a/sources/css/tyrian/less/font-awesome/path.less
+++ b/src/less/font-awesome/path.less
diff --git a/sources/css/tyrian/less/font-awesome/rotated-flipped.less b/src/less/font-awesome/rotated-flipped.less
index f6ba814..f6ba814 100644
--- a/sources/css/tyrian/less/font-awesome/rotated-flipped.less
+++ b/src/less/font-awesome/rotated-flipped.less
diff --git a/sources/css/tyrian/less/font-awesome/screen-reader.less b/src/less/font-awesome/screen-reader.less
index 11c1881..11c1881 100644
--- a/sources/css/tyrian/less/font-awesome/screen-reader.less
+++ b/src/less/font-awesome/screen-reader.less
diff --git a/sources/css/tyrian/less/font-awesome/stacked.less b/src/less/font-awesome/stacked.less
index fc53fb0..fc53fb0 100644
--- a/sources/css/tyrian/less/font-awesome/stacked.less
+++ b/src/less/font-awesome/stacked.less
diff --git a/sources/css/tyrian/less/font-awesome/variables.less b/src/less/font-awesome/variables.less
index 7ddbbc0..c7f00a1 100644
--- a/sources/css/tyrian/less/font-awesome/variables.less
+++ b/src/less/font-awesome/variables.less
@@ -1,7 +1,7 @@
// Variables
// --------------------------
-@fa-font-path: "../fonts";
+@fa-font-path: ".";
@fa-font-size-base: 14px;
@fa-line-height-base: 1;
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly
diff --git a/sources/css/tyrian/less/fonts.less b/src/less/fonts.less
index c084b0d..c084b0d 100644
--- a/sources/css/tyrian/less/fonts.less
+++ b/src/less/fonts.less
diff --git a/sources/css/tyrian/less/footer.less b/src/less/footer.less
index 8ec0ec9..8ec0ec9 100644
--- a/sources/css/tyrian/less/footer.less
+++ b/src/less/footer.less
diff --git a/sources/css/tyrian/less/header.less b/src/less/header.less
index 15a42d7..15a42d7 100644
--- a/sources/css/tyrian/less/header.less
+++ b/src/less/header.less
diff --git a/sources/css/tyrian/less/misc.less b/src/less/misc.less
index 6ed0b70..6ed0b70 100644
--- a/sources/css/tyrian/less/misc.less
+++ b/src/less/misc.less
diff --git a/sources/css/tyrian/less/navbar.less b/src/less/navbar.less
index bcc0075..bcc0075 100644
--- a/sources/css/tyrian/less/navbar.less
+++ b/src/less/navbar.less
diff --git a/sources/css/tyrian/less/social-buttons.less b/src/less/social-buttons.less
index f7e2ba4..f7e2ba4 100644
--- a/sources/css/tyrian/less/social-buttons.less
+++ b/src/less/social-buttons.less
diff --git a/sources/css/tyrian/less/typography.less b/src/less/typography.less
index 0e7c037..0e7c037 100644
--- a/sources/css/tyrian/less/typography.less
+++ b/src/less/typography.less
diff --git a/sources/css/tyrian/less/tyrian.less b/src/less/tyrian.less
index c229032..f4734d1 100644
--- a/sources/css/tyrian/less/tyrian.less
+++ b/src/less/tyrian.less
@@ -1,4 +1,6 @@
-@import (reference) '../bootstrap/less/bootstrap.less';
+@import (reference) "bootstrap/less/bootstrap.less";
+
+@import "variables-tyrian";
/* Work around a bug in the import reference mechanism */
/* tyrian-start */
diff --git a/sources/css/tyrian/bootstrap/variables-tyrian.less b/src/less/variables-tyrian.less
index ca75b1a..ca75b1a 100644
--- a/sources/css/tyrian/bootstrap/variables-tyrian.less
+++ b/src/less/variables-tyrian.less