Skip to content

Commit

Permalink
New site layout by @fahad19
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 94f7fee
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 25 00:29:17 2015 +0100

    protocol: remove grey background from toc.

commit 003f312
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Tue Mar 24 09:25:34 2015 +0100

    Don't trim away lines at every make build-protocol

commit 1a4fca3
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 24 01:18:11 2015 +0100

    build.

commit a0fa724
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 24 01:17:34 2015 +0100

    clean up.

commit 320781f
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 24 01:10:26 2015 +0100

    protocol: justified alignment of toc list.

commit a7d8e85
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 24 01:02:25 2015 +0100

    protocol: list numbering as css content for styling.

commit 91b48e1
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 24 00:36:12 2015 +0100

    protocol: toc list with decimal/alpha/roman numbering.

commit 4d1bcf3
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 23 23:44:00 2015 +0100

    about: spacing among avatars.

commit bc7735a
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:21:09 2015 +0100

    Change twitter copy

commit c48ac89
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:18:06 2015 +0100

    Rebuild

commit 4257244
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:16:39 2015 +0100

    Only build community & protocol if > 10 days old, or not exists

commit d8d5027
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:03:43 2015 +0100

    Rebuild

commit 1553f5e
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:03:39 2015 +0100

    Source cached community in about page

commit f7005c5
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:03:24 2015 +0100

    Smaller avatars in community section

commit a26cd23
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 10:03:10 2015 +0100

    Cache community in _includes, just like protocol

commit d2c972a
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Mar 23 09:55:31 2015 +0100

    Build assets before site

commit beca742
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 23 01:51:14 2015 +0100

    build.

commit 4b5dded
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 23 01:50:07 2015 +0100

    implementations: alignment fixed with refreshed markup/css.

commit 876c0e4
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 23 00:55:04 2015 +0100

    layout: shield logo in all pages except homepage.

commit 16f08e1
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 23 00:22:33 2015 +0100

    demo: progress bar.

commit 17341c0
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sun Mar 22 23:54:38 2015 +0100

    demo: show download button only after successful upload.

commit 4e9ba57
Merge: cf3450f 2731666
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Sun Mar 22 11:10:51 2015 +0100

    Merge branch 'master' into develop

    Conflicts:
    	protocol.md

commit cf3450f
Merge: be9e7d5 0182c68
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Sun Mar 22 10:55:36 2015 +0100

    Merge remote-tracking branch 'origin/develop' into develop

    Conflicts:
    	assets/build/app.css
    	assets/build/app.js

commit be9e7d5
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Sun Mar 22 10:54:35 2015 +0100

    Add asset building to the makefile

commit 0182c68
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 21 23:38:23 2015 +0100

    build.

commit f6827ec
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 21 23:38:13 2015 +0100

    layout: fix for nav toggler.

commit e6f901f
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 21 03:33:03 2015 +0100

    build.

commit c1cf1f2
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 21 03:32:43 2015 +0100

    layout: toggle hamburger/cross icons in smaller devices.

commit 26cd747
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 21 02:50:23 2015 +0100

    layout: hide github ribbon in smaller devices.

commit aaf062c
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 18 00:24:56 2015 +0100

    layout: responsive navigation.

commit d0cf536
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 16 01:09:08 2015 +0100

    homepage: no bottom border for last post in the list.

commit fc43282
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 16 01:07:29 2015 +0100

    homepage: load jQuery.timeago for github activities.

commit 7a5e0d2
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 16 00:48:15 2015 +0100

    homepage: recent blog posts.

commit a2c6519
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sun Mar 15 23:47:54 2015 +0100

    layout: make favicon bigger to support retina display as touch icons.

commit ecb9da8
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sun Mar 15 23:41:38 2015 +0100

    layout: favicon and apple touch icon.

commit 67a249b
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sun Mar 15 23:34:12 2015 +0100

    homepage: animate the logo in.

commit 7684029
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 14 22:28:56 2015 +0100

    protocol: table of contents.

commit 058a7ea
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 14 22:18:36 2015 +0100

    layout: focused input elements should follow colour scheme.

commit dbecd75
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Mar 14 20:34:38 2015 +0100

    layout: primary button to have the same colour as default scheme.

commit 74f8967
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 11 09:59:06 2015 +0100

    Switch from gray to orange ribbon(?)

commit 2b54788
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 11 09:48:25 2015 +0100

    Always use full cli arguments in scripts. Less verbose wget output tho

commit 750cafb
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 11 09:48:02 2015 +0100

    Fix Makefile issue, stripping first 2 lines from protocl /cc @fahad19

commit b5ce8cd
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 11 01:23:52 2015 +0100

    protocol: page to have its own custom title.

commit 6b6fab2
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 11 00:44:01 2015 +0100

    protocol: move CSS out of markdown file.

commit 018c1bc
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 11 00:38:57 2015 +0100

    layout: subtle borders to separate the sections.

commit 20f54c9
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 11 00:33:50 2015 +0100

    build.

commit 74628e0
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Mar 11 00:33:27 2015 +0100

    layout: images.

commit cf8751b
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Mar 10 01:07:50 2015 +0100

    layout: go green like the logo.

commit a064d4a
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 9 23:56:25 2015 +0100

    jekyll: do not render post info as markdown, which would result in unnecessary paragraphs.

commit 2e58b9f
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Mar 9 23:46:00 2015 +0100

    readme: updated to make sure protocol info exists which will be required by jekyll.

commit d03b8d5
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 4 16:35:37 2015 +0100

    Markdown fixes in dev branch

commit 9dfe686
Merge: 5f82560 8b994ad
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 4 16:20:57 2015 +0100

    Merge branch 'master' into develop

    Conflicts:
    	.gitignore
    	blog.html

commit 5f82560
Merge: 00f7d02 3fc479d
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 4 15:58:04 2015 +0100

    Merge branch 'master' into develop

commit 00f7d02
Merge: 060ab5f aa8824f
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Wed Mar 4 15:41:50 2015 +0100

    Merge branch 'master' into develop

    Conflicts:
    	Gemfile
    	Makefile

commit 060ab5f
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Fri Feb 27 01:58:56 2015 +0100

    homepage: subscription form as footer.

commit ad002de
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 25 00:54:59 2015 +0100

    homepage: lists.

commit ed2bb48
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 24 01:18:06 2015 +0100

    blog: remove unnecessary line breaks.

commit b086f83
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 24 01:15:35 2015 +0100

    less: styling for blog posts and pages.

commit b6bb4b9
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 24 00:35:52 2015 +0100

    assets: css autoprefixer.

commit fea79bf
Merge: 5f80e37 d097825
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Feb 23 16:41:00 2015 +0100

    Merge branch 'master' into develop

    Conflicts:
    	.gitignore
    	Makefile
    	README.md

commit 5f80e37
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Feb 23 09:31:36 2015 +0100

    Update assets

commit 590de7c
Author: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date:   Mon Feb 23 09:31:26 2015 +0100

    Make shortcuts for asset building

commit a196d09
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 23 01:09:27 2015 +0100

    header: branding and mission text.

commit 3d92f22
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 23 00:45:20 2015 +0100

    jekyll: layout option for rendering some pages without containers.

commit d562f61
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 23 00:29:30 2015 +0100

    header: nav with soft colour background, and updated typography via typekit.

commit 60c0deb
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Feb 21 00:31:29 2015 +0100

    homepage: use primary button for subscription form.

commit c527ad3
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Feb 21 00:28:58 2015 +0100

    less: consistent styling between posts and github activities list.

commit dbda707
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Sat Feb 21 00:09:52 2015 +0100

    npm: watcher for build.

commit 6cf3a98
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Thu Feb 19 00:38:29 2015 +0100

    less: posts list.

commit 596482a
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Thu Feb 19 00:30:01 2015 +0100

    less: top nav.

commit 743d174
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 18 00:30:50 2015 +0100

    assets: use skeleton.

commit 2cd2faf
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 18 00:05:09 2015 +0100

    assets: jshint.

commit e5004cf
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 17 23:36:20 2015 +0100

    jekyll: remove `jekyll-less` as a dependency.

commit 4fd9e13
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 17 00:16:52 2015 +0100

    assets: `empty` file removed since directory will never be empty now.

commit 19fa9ad
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 17 00:07:56 2015 +0100

    assets: minified build files.

commit 7b2bc5d
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Tue Feb 17 00:07:26 2015 +0100

    assets: minification as part of the build process.

commit ed5654d
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 16 23:54:16 2015 +0100

    assets: remove third-party packages from repo.

commit 713decb
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 16 23:52:34 2015 +0100

    readme: updated for assets.

commit 6a24991
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 16 23:49:34 2015 +0100

    assets: LESS compiling, and source files moved to `_assets` directory.

commit 4a22027
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 16 23:16:23 2015 +0100

    assets: concat JS files to build directory.

commit 5d229e8
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Mon Feb 16 23:02:24 2015 +0100

    empty build directory for storing compiled assets.

commit 3613a12
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Thu Feb 12 00:04:00 2015 +0100

    bower: download packages outside of jekyll's domain.

commit d3091e1
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 11 22:34:40 2015 +0100

    bower: base setup.

commit 69ff284
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 11 22:31:01 2015 +0100

    npm: package.son with basic info.

commit 7f2c206
Author: Fahad Ibnay Heylaal <fahad19@gmail.com>
Date:   Wed Feb 11 22:22:28 2015 +0100

    editorconfig
  • Loading branch information
@kvz
kvz committed Mar 30, 2015
1 parent 2731666 commit 08eb1ae
Show file tree
Hide file tree
Showing 42 changed files with 1,875 additions and 10,140 deletions.
4 changes: 4 additions & 0 deletions .bowerrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"directory": "_vendors",
"json": "bower.json"
}
15 changes: 15 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org

root = true

[*]
charset = utf-8
indent_style = tab
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{html,md,js,json,xml}]
indent_style = space
indent_size = 2
9 changes: 5 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/_site
/_vendors
/assets/build
_site
_vendors
assets/build

# Built by `make build`:
protocols/*.html
assets/json/*.json
_includes/tus.md
node_modules/

npm-debug.log
.DS_Store
20 changes: 20 additions & 0 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"browser": true,
"esnext": true,
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 4,
"latedef": true,
"newcap": true,
"noarg": true,
"quotmark": "single",
"regexp": true,
"undef": true,
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true
}
42 changes: 28 additions & 14 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ all: install build deploy
install:
@echo "--> Installing dependencies.."
@npm install
@bower install
@jekyll --version || sudo gem install jekyll -v '2.5.2'

.PHONY: build-assets
build-assets:
@echo "--> Building assets.."
@npm run build

.PHONY: build-site
build-site:
@echo "--> Building site.."
Expand All @@ -19,31 +25,39 @@ build-site:
.PHONY: build-protocol
build-protocol:
@echo "--> Fetching latest protocol.."
@wget \
@find _includes/tus.md -mtime +10 -exec rm -rf {} \; || true
@[ -f _includes/tus.md ] || (wget \
https://raw.githubusercontent.com/tus/tus-resumable-upload-protocol/master/protocol.md \
--quiet \
--output-document=_includes/tus.md
# Removing first two lines to allow our own h2 header
@echo "$$(tail -n +3 ./_includes/tus.md)" > ./_includes/tus.md
--output-document=_includes/tus.md \
&& echo "$$(tail -n +3 ./_includes/tus.md)" > ./_includes/tus.md)
@# Removes first two lines to allow our own h2 header

.PHONY: build-community
build-community:
@echo "--> Building community.."
@$(onthegithubs_dir)/bin/in-the-githubs \
--user tus \
--repo tus.io,tusd,tus-jquery-client,TUSKit,tus-android-client,tus-resumable-upload-protocol \
--format html \
--concurrency 1 \
--input _site/about.html \
--tag '<p>replaced-by-in-the-githubs</p>' \
--output _site/about.html \
--debug
@find _includes/community.html -mtime +10 -exec rm -rf {} \; || true
@[ -f _includes/community.html ] || (echo "<p>replaced-by-in-the-githubs</p>" > _includes/community.html \
&& $(onthegithubs_dir)/bin/in-the-githubs \
--user tus \
--repo tus.io,tusd,tus-jquery-client,TUSKit,tus-android-client,tus-resumable-upload-protocol \
--format html \
--concurrency 1 \
--input _includes/community.html \
--tag '<p>replaced-by-in-the-githubs</p>' \
--output _includes/community.html \
--debug)

.PHONY: build
build: build-protocol build-site build-community
build: build-protocol build-assets build-site build-community
@echo "--> Building all.."
@echo "Done :)"

.PHONY: preview-quick
preview-quick: build-assets build-site
@echo "--> Running preview-quick.."
jekyll serve --watch --unpublished --skip-initial-build

.PHONY: preview
preview: install build
@echo "--> Running preview.."
Expand Down
17 changes: 16 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,23 @@ The tus.io website.

Install the required ruby gems:

```bash
$ gem install jekyll therubyracer redcarpet
```

Build assets:

```bash
$ npm install
$ bower install
$ npm run build
```
gem install jekyll jekyll-less therubyracer redcarpet

You would also be required to run this command
to fetch some info from original [Tus protocol](https://github.com/tus/tus-resumable-upload-protocol) repository:

```bash
$ make build-protocol
```

After this you can run the local development server like this:
Expand Down
15 changes: 15 additions & 0 deletions _assets/app.cson
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
##
# Files listed here will be concatenated to
# ./build/app.js
#
[
'../_vendors/jquery/jquery.js'
'../_vendors/jquery-timeago/jquery.timeago.js'
'../node_modules/on-the-githubs/js/jquery.on-the-githubs.js'
'../_vendors/jquery-file-upload/js/vendor/jquery.ui.widget.js'
'../_vendors/jquery-file-upload/js/jquery.fileupload.js'
'../_vendors/jquery-tus/js/jquery.tus.js'

'./js/main.js'
'./js/upload-demo.js'
]
Loading

0 comments on commit 08eb1ae

Please sign in to comment.