From c2402b91d960dd10feb6845fc5f6d3d218f2ace2 Mon Sep 17 00:00:00 2001 From: Calinou Date: Fri, 25 Sep 2015 16:12:27 +0200 Subject: [PATCH] Switch to SCSS --- Gruntfile.js | 23 --------- README.md | 15 +++--- _config.yml | 4 +- _includes/header.html | 4 ++ _sass/_content.scss | 32 +++++++++++++ _sass/_fonts.scss | 31 ++++++++++++ _sass/_footer.scss | 26 ++++++++++ _sass/_jumbotron.scss | 49 +++++++++++++++++++ _sass/_navbar.scss | 14 ++++++ assets/css/main.min.css | 6 --- assets/css/main.scss | 82 ++++++++++++++++++++++++++++++++ assets/css/stylus/content.styl | 29 ----------- assets/css/stylus/fonts.styl | 27 ----------- assets/css/stylus/footer.styl | 22 --------- assets/css/stylus/jumbotron.styl | 40 ---------------- assets/css/stylus/main.styl | 66 ------------------------- assets/css/stylus/navbar.styl | 11 ----- package.json | 11 ----- 18 files changed, 246 insertions(+), 246 deletions(-) delete mode 100644 Gruntfile.js create mode 100644 _sass/_content.scss create mode 100644 _sass/_fonts.scss create mode 100644 _sass/_footer.scss create mode 100644 _sass/_jumbotron.scss create mode 100644 _sass/_navbar.scss delete mode 100644 assets/css/main.min.css create mode 100644 assets/css/main.scss delete mode 100644 assets/css/stylus/content.styl delete mode 100644 assets/css/stylus/fonts.styl delete mode 100644 assets/css/stylus/footer.styl delete mode 100644 assets/css/stylus/jumbotron.styl delete mode 100644 assets/css/stylus/main.styl delete mode 100644 assets/css/stylus/navbar.styl delete mode 100644 package.json diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 9620ec1..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = function(grunt) { - - grunt.initConfig({ - watch: { - files: ["assets/css/stylus/*.styl"], - tasks: ["stylus"] - }, - stylus: { - "assets/css/main.min.css": ["assets/css/stylus/*.styl"], - options: { - globals: { - compress: true - } - } - }, - }); - - grunt.loadNpmTasks("grunt-contrib-stylus"); - grunt.loadNpmTasks("grunt-contrib-watch"); - - grunt.registerTask("default", ["stylus"]); - -}; diff --git a/README.md b/README.md index 846fff9..5ff0528 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# minetest.github.io +# www.minetest.net -The official Minetest website, living at [minetest.net](http://minetest.net). +The official Minetest website, living at [www.minetest.net](http://www.minetest.net). # Features @@ -13,15 +13,12 @@ The official Minetest website, living at [minetest.net](http://minetest.net). # Workflow -This site uses the [Jekyll](http://jekyllrb.com) static site generator as well -as the [Stylus](http://learnboost.github.io/stylus/) CSS preprocessor. - -* Use `jekyll serve` to automatically build the Jekyll site and serve it locally. -* Use `grunt watch` to compile Stylus files automatically. The Stylus files are - located in `css/stylus`. +This site uses the [Jekyll](http://jekyllrb.com) static site generator. +Use `jekyll serve` to automatically build the Jekyll site and serve it locally. # License -Copyright (c) 2015 Calinou and contributors +Copyright © 2015 Calinou and contributors Code is under the MIT license, media and content under [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/). + diff --git a/_config.yml b/_config.yml index b102e8d..849da56 100644 --- a/_config.yml +++ b/_config.yml @@ -1,9 +1,9 @@ permalink: pretty gems: - jekyll-redirect-from +sass: + style: compressed exclude: - - Gruntfile.js - CNAME - README.md - LICENSE.md - - package.json diff --git a/_includes/header.html b/_includes/header.html index efaef1f..8e82ddf 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,6 +6,7 @@ {{ page.title }} - Minetest +<<<<<<< HEAD +======= + +>>>>>>> 49032e690f88e53d7524c41ca39396a9aced953c diff --git a/_sass/_content.scss b/_sass/_content.scss new file mode 100644 index 0000000..d7599b5 --- /dev/null +++ b/_sass/_content.scss @@ -0,0 +1,32 @@ +// Content margins and link styling + +.content { + margin: 0 20%; + + a { + color: hsl(100, 40%, 40%); + text-decoration: none; + transition: .15s; + + &:hover, + &:focus { + color: hsl(100, 30%, 30%); + text-decoration: underline; + } + &:active { + color: hsl(0, 0, 0); + } + } +} + +@media (max-width 992px) { + .content { margin: 0 10%; } +} + +@media (max-width 768px) { + .content { margin: 0 5%; } +} + +@media (max-width 480px) { + .content { margin: 0 2%; } +} diff --git a/_sass/_fonts.scss b/_sass/_fonts.scss new file mode 100644 index 0000000..318bae9 --- /dev/null +++ b/_sass/_fonts.scss @@ -0,0 +1,31 @@ +// Fonts + +@font-face { + font-family: "Titillium Web Regular"; + font-weight: 500; + src: local("Titillium Web Regular"), + url("../fonts/titilliumweb/TitilliumWeb-Regular.ttf"); +} + +@font-face { + font-family: "Titillium Web Italic"; + font-style: "italic"; + font-weight: 500; + src: local("Titillium Web Italic"), + url("../fonts/titilliumweb/TitilliumWeb-Italic.ttf"); +} + +@font-face { + font-family: "Titillium Web Bold"; + font-weight: 700; + src: local("Titillium Web Bold"), + url("../fonts/titilliumweb/TitilliumWeb-Bold.ttf"); +} + +@font-face { + font-family: "Titillium Web Bold Italic"; + font-style: "italic"; + font-weight: 700; + src: local("Titillium Web Bold Italic"), + url("../fonts/titilliumweb/TitilliumWeb-BoldItalic.ttf"); +} diff --git a/_sass/_footer.scss b/_sass/_footer.scss new file mode 100644 index 0000000..cb01a94 --- /dev/null +++ b/_sass/_footer.scss @@ -0,0 +1,26 @@ +// Footer + +footer { + background-color: hsl(0, 0, 18%); + color: hsl(0, 0, 60%); + text-align: center; + padding: 3rem 0; + margin-top: 3rem; + + a { + color: hsl(0, 0, 90%); + text-decoration: none; + transition: .15s; + + &:hover, + &:focus { + color: hsl(0, 0, 80%); + text-decoration: underline; + } + + &:active { + color: hsl(0, 0, 50%); + text-decoration: underline; + } + } +} diff --git a/_sass/_jumbotron.scss b/_sass/_jumbotron.scss new file mode 100644 index 0000000..54118b6 --- /dev/null +++ b/_sass/_jumbotron.scss @@ -0,0 +1,49 @@ +// jumbotron.styl: Jumbotron + +.jumbotron { + background-image: url("../../media/background-home.jpg"); + background-size: cover; + border-radius: 0 !important; + color: #fff; + padding-top: 25vh; + margin: 0 -15px !important; + height: 100vh; + min-height: 60rem; + text-shadow: 0 0 .5rem #000; + + .btn { + margin: 4rem 4rem 0 4rem; + font-size: 2rem; + transition: .15s; + } + + &.reduced { + padding-top: 5rem; + height: 25vh; + min-height: 30rem; + } + + &.downloads { + background-image: url("../../media/background-downloads.jpg"); + } + + &.community { + background-image: url("../../media/gallery/1.jpg"); + } + + &.credits { + background-image: url("../../media/gallery/2.jpg"); + } + + &.customize { + background-image: url("../../media/gallery/3.jpg"); + } + + &.irc { + background-image: url("../../media/gallery/4.jpg"); + } + + &.development { + background-image: url("../../media/gallery/5.jpg"); + } +} diff --git a/_sass/_navbar.scss b/_sass/_navbar.scss new file mode 100644 index 0000000..0aa71f7 --- /dev/null +++ b/_sass/_navbar.scss @@ -0,0 +1,14 @@ +// Navigation bar + +.navbar { + box-shadow: 0 0 1rem #000; +} + +.navbar-brand { + font-weight: 700; + color: hsl(100, 35%, 45%) !important; + + img { + margin-top: -1.7rem; + } +} diff --git a/assets/css/main.min.css b/assets/css/main.min.css deleted file mode 100644 index 3b15f45..0000000 --- a/assets/css/main.min.css +++ /dev/null @@ -1,6 +0,0 @@ -.content{margin:0 20%;}.content a{color:#588f3d;text-decoration:none;transition:.15s;}.content a:hover,.content a:focus{color:#456336;text-decoration:underline}.content a:active{color:#000}@media (max-width:992px){.content{margin:0 10%}}@media (max-width:768px){.content{margin:0 5%}}@media (max-width:480px){.content{margin:0 2%}} -@font-face{font-family:"Titillium Web Regular";font-weight:500;src:local("Titillium Web Regular"),url("../fonts/titilliumweb/TitilliumWeb-Regular.ttf")}@font-face{font-family:"Titillium Web Italic";font-style:"italic";font-weight:500;src:local("Titillium Web Italic"),url("../fonts/titilliumweb/TitilliumWeb-Italic.ttf")}@font-face{font-family:"Titillium Web Bold";font-weight:700;src:local("Titillium Web Bold"),url("../fonts/titilliumweb/TitilliumWeb-Bold.ttf")}@font-face{font-family:"Titillium Web Bold Italic";font-style:"italic";font-weight:700;src:local("Titillium Web Bold Italic"),url("../fonts/titilliumweb/TitilliumWeb-BoldItalic.ttf")} -footer{background-color:#2e2e2e;color:#999;text-align:center;padding:3rem 0;margin-top:3rem;}footer a{color:#e6e6e6;text-decoration:none;transition:.15s;}footer a:hover,footer a:focus{color:#ccc;text-decoration:underline}footer a:active{color:#808080;text-decoration:underline} -.jumbotron{background-image:url("../../media/background-home.jpg");background-size:cover;border-radius:0 !important;color:#fff;padding-top:25vh;margin:0 -15px !important;height:100vh;min-height:60rem;text-shadow:0 0 .5rem #000;}.jumbotron .btn{margin:4rem 4rem 0 4rem;font-size:2rem;transition:.15s}.jumbotron.reduced{padding-top:5rem;height:25vh;min-height:30rem}.jumbotron.downloads{background-image:url("../../media/background-downloads.jpg")}.jumbotron.community{background-image:url("../../media/gallery/1.jpg")}.jumbotron.credits{background-image:url("../../media/gallery/2.jpg")}.jumbotron.customize{background-image:url("../../media/gallery/3.jpg")}.jumbotron.irc{background-image:url("../../media/gallery/4.jpg")}.jumbotron.development{background-image:url("../../media/gallery/5.jpg")} -@font-face{font-family:"Titillium Web Regular";font-weight:500;src:local("Titillium Web Regular"),url("../fonts/titilliumweb/TitilliumWeb-Regular.ttf")}@font-face{font-family:"Titillium Web Italic";font-style:"italic";font-weight:500;src:local("Titillium Web Italic"),url("../fonts/titilliumweb/TitilliumWeb-Italic.ttf")}@font-face{font-family:"Titillium Web Bold";font-weight:700;src:local("Titillium Web Bold"),url("../fonts/titilliumweb/TitilliumWeb-Bold.ttf")}@font-face{font-family:"Titillium Web Bold Italic";font-style:"italic";font-weight:700;src:local("Titillium Web Bold Italic"),url("../fonts/titilliumweb/TitilliumWeb-BoldItalic.ttf")}.navbar{box-shadow:0 0 1rem #000}.navbar-brand{font-weight:700;color:#659b4b !important;}.navbar-brand img{margin-top:-1.7rem}.content{margin:0 20%;}.content a{color:#588f3d;text-decoration:none;transition:.15s;}.content a:hover,.content a:focus{color:#456336;text-decoration:underline}.content a:active{color:#000}@media (max-width:992px){.content{margin:0 10%}}@media (max-width:768px){.content{margin:0 5%}}@media (max-width:480px){.content{margin:0 2%}}.jumbotron{background-image:url("../../media/background-home.jpg");background-size:cover;border-radius:0 !important;color:#fff;padding-top:25vh;margin:0 -15px !important;height:100vh;min-height:60rem;text-shadow:0 0 .5rem #000;}.jumbotron .btn{margin:4rem 4rem 0 4rem;font-size:2rem;transition:.15s}.jumbotron.reduced{padding-top:5rem;height:25vh;min-height:30rem}.jumbotron.downloads{background-image:url("../../media/background-downloads.jpg")}.jumbotron.community{background-image:url("../../media/gallery/1.jpg")}.jumbotron.credits{background-image:url("../../media/gallery/2.jpg")}.jumbotron.customize{background-image:url("../../media/gallery/3.jpg")}.jumbotron.irc{background-image:url("../../media/gallery/4.jpg")}.jumbotron.development{background-image:url("../../media/gallery/5.jpg")}footer{background-color:#2e2e2e;color:#999;text-align:center;padding:3rem 0;margin-top:3rem;}footer a{color:#e6e6e6;text-decoration:none;transition:.15s;}footer a:hover,footer a:focus{color:#ccc;text-decoration:underline}footer a:active{color:#808080;text-decoration:underline}::-moz-selection{background-color:#659b4b;color:#fff}::selection{background-color:#659b4b;color:#fff}body{background-color:#f2f2f2;color:#333;cursor:default;font-family:"Titillium Web Regular",sans-serif}p,li{font-size:1.7rem}h1{font-weight:bold;font-size:5rem;margin:9rem 0 4.5rem 0;text-align:center}h2{font-weight:bold;font-size:3rem;margin:6rem 0 3rem 0}h3{font-size:2.6rem;margin:5rem 0 2.5rem 0}h4{margin:3rem 0 1.5rem 0;font-size:2.2rem}pre,code{background-color:#e2e2e2;border:1px solid #ccc;color:#333}.intro{margin-top:5rem;font-size:1.8rem;text-align:center}.center{text-align:center}.line{background-color:#bbb;height:1px;margin:4rem 0;width:100%}.inline{display:inline} -.navbar{box-shadow:0 0 1rem #000}.navbar-brand{font-weight:700;color:#659b4b !important;}.navbar-brand img{margin-top:-1.7rem} \ No newline at end of file diff --git a/assets/css/main.scss b/assets/css/main.scss new file mode 100644 index 0000000..d134715 --- /dev/null +++ b/assets/css/main.scss @@ -0,0 +1,82 @@ +--- +# This ensures thet Jekyll reads this file +--- +// Global stytes + +@import "fonts"; // Fonts (currently Titillium Web) +@import "navbar"; // Navigation bar +@import "content"; // Content margins +@import "jumbotron"; // Jumbotron +@import "footer"; // Footer (copyright information, link to GitHub) + +::-moz-selection { + background-color: hsl(100, 35%, 45%); + color: hsl(0, 0%, 100%); +} + +::selection { + background-color: hsl(100, 35%, 45%); + color: hsl(0, 0%, 100%); +} + +body { + background-color: #f2f2f2; + color: #333; + cursor: default; + font-family: "Titillium Web Regular", sans-serif; +} + +p, li { + font-size: 1.7rem; +} + +h1 { + font-weight: bold; + font-size: 5rem; + margin: 9rem 0 4.5rem 0; + text-align: center; +} + +h2 { + font-weight: bold; + font-size: 3rem; + margin: 6rem 0 3rem 0; +} + +h3 { + font-size: 2.6rem; + margin: 5rem 0 2.5rem 0; +} + +h4 { + margin: 3rem 0 1.5rem 0; + font-size: 2.2rem; +} + +pre, +code { + background-color: #e2e2e2; + border: 1px solid #ccc; + color: #333; +} + +.intro { + margin-top: 5rem; + font-size: 1.8rem; + text-align: center; +} + +.center { + text-align: center; +} + +.line { + background-color: #bbb; + height: 1px; + margin: 4rem 0; + width: 100%; +} + +.inline { + display: inline; +} diff --git a/assets/css/stylus/content.styl b/assets/css/stylus/content.styl deleted file mode 100644 index b8c35e1..0000000 --- a/assets/css/stylus/content.styl +++ /dev/null @@ -1,29 +0,0 @@ -// content.styl: Content margins and link styling - -.content - margin 0 20% - - a - color hsl(100, 40%, 40%) - text-decoration none - transition .15s - - &:hover, - &:focus - color hsl(100, 30%, 30%) - text-decoration underline - - &:active - color hsl(0, 0, 0) - -@media (max-width 992px) - .content - margin 0 10% - -@media (max-width 768px) - .content - margin 0 5% - -@media (max-width 480px) - .content - margin 0 2% diff --git a/assets/css/stylus/fonts.styl b/assets/css/stylus/fonts.styl deleted file mode 100644 index aabadec..0000000 --- a/assets/css/stylus/fonts.styl +++ /dev/null @@ -1,27 +0,0 @@ -// fonts.styl: Fonts - -@font-face - font-family "Titillium Web Regular" - font-weight 500 - src local("Titillium Web Regular"), - url("../fonts/titilliumweb/TitilliumWeb-Regular.ttf") - -@font-face - font-family "Titillium Web Italic" - font-style "italic" - font-weight 500 - src local("Titillium Web Italic"), - url("../fonts/titilliumweb/TitilliumWeb-Italic.ttf") - -@font-face - font-family "Titillium Web Bold" - font-weight 700 - src local("Titillium Web Bold"), - url("../fonts/titilliumweb/TitilliumWeb-Bold.ttf") - -@font-face - font-family "Titillium Web Bold Italic" - font-style "italic" - font-weight 700 - src local("Titillium Web Bold Italic"), - url("../fonts/titilliumweb/TitilliumWeb-BoldItalic.ttf") diff --git a/assets/css/stylus/footer.styl b/assets/css/stylus/footer.styl deleted file mode 100644 index 11b43c4..0000000 --- a/assets/css/stylus/footer.styl +++ /dev/null @@ -1,22 +0,0 @@ -// footer.styl: Footer - -footer - background-color hsl(0, 0, 18%) - color hsl(0, 0, 60%) - text-align center - padding 3rem 0 - margin-top 3rem - - a - color hsl(0, 0, 90%) - text-decoration none - transition .15s - - &:hover, - &:focus - color hsl(0, 0, 80%) - text-decoration underline - - &:active - color hsl(0, 0, 50%) - text-decoration underline diff --git a/assets/css/stylus/jumbotron.styl b/assets/css/stylus/jumbotron.styl deleted file mode 100644 index 757cbab..0000000 --- a/assets/css/stylus/jumbotron.styl +++ /dev/null @@ -1,40 +0,0 @@ -// jumbotron.styl: Jumbotron - -.jumbotron - background-image url("../../media/background-home.jpg") - background-size cover - border-radius 0 !important - color #fff - padding-top 25vh - margin 0 -15px !important - height 100vh - min-height 60rem - text-shadow 0 0 .5rem #000 - - .btn - margin 4rem 4rem 0 4rem - font-size 2rem - transition .15s - - &.reduced - padding-top 5rem - height 25vh - min-height 30rem - - &.downloads - background-image url("../../media/background-downloads.jpg") - - &.community - background-image url("../../media/gallery/1.jpg") - - &.credits - background-image url("../../media/gallery/2.jpg") - - &.customize - background-image url("../../media/gallery/3.jpg") - - &.irc - background-image url("../../media/gallery/4.jpg") - - &.development - background-image url("../../media/gallery/5.jpg") diff --git a/assets/css/stylus/main.styl b/assets/css/stylus/main.styl deleted file mode 100644 index d83df19..0000000 --- a/assets/css/stylus/main.styl +++ /dev/null @@ -1,66 +0,0 @@ -// main.styl: Global styles - -@import "fonts" // Fonts (currently Titillium Web) -@import "navbar" // Navigation bar -@import "content" // Content margins -@import "jumbotron" // Jumbotron -@import "footer" // Footer (copyright information, link to GitHub) - -::-moz-selection - background-color hsl(100, 35%, 45%) - color hsl(0, 0%, 100%) - -::selection - background-color hsl(100, 35%, 45%) - color hsl(0, 0%, 100%) - -body - background-color #f2f2f2 - color #333 - cursor default - font-family "Titillium Web Regular", sans-serif - -p, li - font-size 1.7rem - -h1 - font-weight bold - font-size 5rem - margin 9rem 0 4.5rem 0 - text-align center - -h2 - font-weight bold - font-size 3rem - margin 6rem 0 3rem 0 - -h3 - font-size 2.6rem - margin 5rem 0 2.5rem 0 - -h4 - margin 3rem 0 1.5rem 0 - font-size 2.2rem - -pre, -code - background-color #e2e2e2 - border 1px solid #ccc - color #333 - -.intro - margin-top 5rem - font-size 1.8rem - text-align center - -.center - text-align center - -.line - background-color #bbb - height 1px - margin 4rem 0 - width 100% - -.inline - display inline diff --git a/assets/css/stylus/navbar.styl b/assets/css/stylus/navbar.styl deleted file mode 100644 index 7b05f73..0000000 --- a/assets/css/stylus/navbar.styl +++ /dev/null @@ -1,11 +0,0 @@ -// navbar.styl: Navigation bar - -.navbar - box-shadow 0 0 1rem #000 - -.navbar-brand - font-weight 700 - color hsl(100, 35%, 45%) !important - - img - margin-top -1.7rem diff --git a/package.json b/package.json deleted file mode 100644 index f028e7d..0000000 --- a/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Minetest", - "version": "0.2.0", - "author": "Calinou", - "license": "MIT", - "devDependencies": { - "grunt": "*", - "grunt-contrib-stylus": "*", - "grunt-contrib-watch": "*" - } -}