Some small tweaks, bringing packages up to date, remove ads now Patreon went over
This commit is contained in:
parent
393a432323
commit
a8e2c3ac65
10 changed files with 34 additions and 22 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -6,4 +6,5 @@
|
|||
.project
|
||||
.settings
|
||||
/dist
|
||||
last_commit.html
|
||||
last_commit.html
|
||||
npm-debug.log
|
||||
|
|
|
@ -33,8 +33,8 @@ module.exports = (grunt) ->
|
|||
server:
|
||||
options:
|
||||
port: 8082
|
||||
base: "dist"
|
||||
#keepalive: true
|
||||
base: 'dist/'
|
||||
livereload: true
|
||||
|
||||
exec:
|
||||
githash:
|
||||
|
|
|
@ -6,6 +6,8 @@ Uses Grunt to compile UIkit/the website assets, and DocPad with Jade to generate
|
|||
|
||||
You need Node.js, NPM and DocPad to compile and preview the website. Run "npm install" in the top-level, uikit and docpad folders before running grunt, it will install the other dependencies for you.
|
||||
|
||||
You may need to run "npm install -g grunt-cli" to be able to run grunt, and "npm install -g docpad@<VERSION>" to use DocPad.
|
||||
|
||||
Run "grunt" in the main folder to start a preview server at localhost:8082. Whilst it's running, edit LESS/JS files in the uikit folder, or anything in docpad/src, and it will automatically attempt to compile the appropriate source files. The output is copied in to the dist folder. Check the associated Gruntfile's for other available tasks.
|
||||
|
||||
UIkit tests are available for the theme in uikit/tests.
|
||||
|
|
|
@ -18,8 +18,9 @@ docpadConfig = {
|
|||
|
||||
plugins:
|
||||
rss:
|
||||
collection: 'posts'
|
||||
url: '/rss.xml'
|
||||
default:
|
||||
collection: 'posts'
|
||||
url: '/rss.xml'
|
||||
}
|
||||
|
||||
# Export the DocPad Configuration
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
"npm": "1.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"docpad": "~6.64.0",
|
||||
"docpad": "~6.69.0",
|
||||
"docpad-plugin-coffeekup": "~2.2.0",
|
||||
"docpad-plugin-jade": "~2.6.2",
|
||||
"docpad-plugin-marked": "~2.2.0",
|
||||
"docpad-plugin-rss": "~2.1.3"
|
||||
"docpad-plugin-jade": "~2.8.0",
|
||||
"docpad-plugin-marked": "~2.2.1",
|
||||
"docpad-plugin-rss": "~2.1.4"
|
||||
},
|
||||
"main": "node_modules/docpad/bin/docpad-server",
|
||||
"scripts": {
|
||||
|
|
|
@ -8,12 +8,13 @@ h2.heading-margin-top(id="Overview") Overview
|
|||
p
|
||||
| MultiMC is a free, open source launcher for Minecraft, managed by
|
||||
a(href="https://twitter.com/forkk13", target="_blank") @Forkk13
|
||||
| and
|
||||
| ,
|
||||
a(href="https://twitter.com/peterixxx", target="_blank") @peterixxx
|
||||
| and
|
||||
a(href="https://twitter.com/drayshak", target="_blank") @drayshak
|
||||
| . It allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
|
||||
|
||||
p
|
||||
| MultiMC 5 is now officially released - download links are below!
|
||||
p Download links for the latest version, MultiMC 5, are below.
|
||||
|
||||
h2(id="Features") Features
|
||||
ul
|
||||
|
@ -100,5 +101,8 @@ ul.bxslider
|
|||
li: img(src="/images/screenshots/installforge.png" alt="Forge selection")
|
||||
li: img(src="/images/screenshots/settings.png" alt="Settings")
|
||||
|
||||
include ../files/assets/js/bxslider/bxslider_start.js
|
||||
include ../files/assets/js/stats.js
|
||||
script
|
||||
include ../files/assets/js/bxslider/bxslider_start.js
|
||||
|
||||
script
|
||||
include ../files/assets/js/stats.js
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
//- vim: set expandtab ts=4 sw=4 :
|
||||
doctype 5
|
||||
doctype html
|
||||
html(lang="en")
|
||||
head
|
||||
title= document.title
|
||||
|
@ -49,12 +49,12 @@ html(lang="en")
|
|||
li: a(href="http://www.minecraftforum.net/topic/1000645-", target="_blank") MCF Thread
|
||||
li: a(href="http://webchat.esper.net/?nick=&channels=MultiMC", target="_blank") IRC Channel
|
||||
.uk-width-medium-3-4
|
||||
include ads/top.html
|
||||
//include ads/top.html
|
||||
article.uk-article!= content
|
||||
hr
|
||||
.uk-text-center
|
||||
p
|
||||
| Copyright © 2013-2014 MultiMC Contributors
|
||||
| Copyright © 2013-2015 MultiMC Contributors
|
||||
br
|
||||
small
|
||||
| With
|
||||
|
|
10
package.json
10
package.json
|
@ -19,12 +19,12 @@
|
|||
}
|
||||
],
|
||||
"devDependencies": {
|
||||
"grunt-uncss": "0.3.3",
|
||||
"grunt-contrib-copy": "0.4.0",
|
||||
"grunt-contrib-watch": "0.5.3",
|
||||
"grunt-contrib-connect": "0.5.0",
|
||||
"grunt-uncss": "0.4.0",
|
||||
"grunt-contrib-copy": "0.7.0",
|
||||
"grunt-contrib-watch": "0.6.1",
|
||||
"grunt-contrib-connect": "0.9.0",
|
||||
"grunt-exec": "0.4.2",
|
||||
"grunt": "~0.4.0"
|
||||
"grunt": "0.4.5"
|
||||
},
|
||||
"keywords": [],
|
||||
"private": true
|
||||
|
|
2
uikit/dist/css/uikit.multimc.css
vendored
2
uikit/dist/css/uikit.multimc.css
vendored
|
@ -1,3 +1,5 @@
|
|||
/*! UIkit 2.2.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
|
||||
|
||||
/*! UIkit 1.2.0 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */
|
||||
|
||||
/* Default
|
||||
|
|
2
uikit/dist/css/uikit.multimc.min.css
vendored
2
uikit/dist/css/uikit.multimc.min.css
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue