From 5a44c2a576aff8543522e42c57a6c04748fbb347 Mon Sep 17 00:00:00 2001 From: Max Magorsch Date: Mon, 17 Feb 2020 18:47:07 +0100 Subject: Add Tyrian v2 which is rewritten and based on BS 4 Bootstrap 4 is a major rewrite of the Bootstrap project. The new Tyrian version v2 is now based on Bootstrap 4 instead of Bootstrap 3 as before. In line with this, Tyrian has been rewritten in scss instead of less (just as Bootstrap). Apart from minor changes, Tyrian v2 looks like Tyrian v1 for now. A fix for a sticky footer has been included. Apart from that its now possible to use flexbox (as it is supported by BS 4) For further information, please have a look at: https://getbootstrap.com/docs/4.0/migration/ Signed-off-by: Max Magorsch --- Gruntfile.js | 82 --- examples/tyrian.html | 132 +++-- package.json | 20 +- src/less/bootstrap-overrides.less | 5 - src/less/font-awesome/animated.less | 34 -- src/less/font-awesome/bordered-pulled.less | 25 - src/less/font-awesome/core.less | 12 - src/less/font-awesome/fixed-width.less | 6 - src/less/font-awesome/font-awesome.less | 18 - src/less/font-awesome/icons.less | 789 --------------------------- src/less/font-awesome/larger.less | 13 - src/less/font-awesome/list.less | 19 - src/less/font-awesome/mixins.less | 60 --- src/less/font-awesome/path.less | 15 - src/less/font-awesome/rotated-flipped.less | 20 - src/less/font-awesome/screen-reader.less | 5 - src/less/font-awesome/stacked.less | 20 - src/less/font-awesome/variables.less | 800 ---------------------------- src/less/fonts.less | 37 -- src/less/footer.less | 86 --- src/less/header.less | 76 --- src/less/misc.less | 8 - src/less/navbar.less | 31 -- src/less/social-buttons.less | 106 ---- src/less/typography.less | 28 - src/less/tyrian.less | 18 - src/less/variables-tyrian.less | 59 -- src/scss/_fonts.scss | 37 ++ src/scss/_footer.scss | 101 ++++ src/scss/_header.scss | 90 ++++ src/scss/_misc.scss | 4 + src/scss/_navbar.scss | 44 ++ src/scss/_typography.scss | 28 + src/scss/_variables.scss | 97 ++++ src/scss/compatibility/_fontawesome4.scss | 2 + src/scss/compatibility/_social-buttons.scss | 129 +++++ src/scss/compatibility/_tyrian-v1.scss | 37 ++ src/scss/tyrian.scss | 22 + 38 files changed, 666 insertions(+), 2449 deletions(-) delete mode 100644 Gruntfile.js delete mode 100644 src/less/bootstrap-overrides.less delete mode 100644 src/less/font-awesome/animated.less delete mode 100644 src/less/font-awesome/bordered-pulled.less delete mode 100644 src/less/font-awesome/core.less delete mode 100644 src/less/font-awesome/fixed-width.less delete mode 100644 src/less/font-awesome/font-awesome.less delete mode 100644 src/less/font-awesome/icons.less delete mode 100644 src/less/font-awesome/larger.less delete mode 100644 src/less/font-awesome/list.less delete mode 100644 src/less/font-awesome/mixins.less delete mode 100644 src/less/font-awesome/path.less delete mode 100644 src/less/font-awesome/rotated-flipped.less delete mode 100644 src/less/font-awesome/screen-reader.less delete mode 100644 src/less/font-awesome/stacked.less delete mode 100644 src/less/font-awesome/variables.less delete mode 100644 src/less/fonts.less delete mode 100644 src/less/footer.less delete mode 100644 src/less/header.less delete mode 100644 src/less/misc.less delete mode 100644 src/less/navbar.less delete mode 100644 src/less/social-buttons.less delete mode 100644 src/less/typography.less delete mode 100644 src/less/tyrian.less delete mode 100644 src/less/variables-tyrian.less create mode 100644 src/scss/_fonts.scss create mode 100644 src/scss/_footer.scss create mode 100644 src/scss/_header.scss create mode 100644 src/scss/_misc.scss create mode 100644 src/scss/_navbar.scss create mode 100644 src/scss/_typography.scss create mode 100644 src/scss/_variables.scss create mode 100644 src/scss/compatibility/_fontawesome4.scss create mode 100644 src/scss/compatibility/_social-buttons.scss create mode 100644 src/scss/compatibility/_tyrian-v1.scss create mode 100644 src/scss/tyrian.scss diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index ad70d68..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,82 +0,0 @@ -// Tyrian -- the new look of gentoo.org -// Alex Legler - -'use strict'; -module.exports = function(grunt) { - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - less: { - compile: { - options: { - strictMath: true, - paths: ["node_modules"] - }, - files: { - "dist/tyrian.css": "src/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", ["compile", "compress"]); - grunt.registerTask("default", ["dist"]); -}; - diff --git a/examples/tyrian.html b/examples/tyrian.html index 2c1df5d..1854b82 100644 --- a/examples/tyrian.html +++ b/examples/tyrian.html @@ -6,75 +6,69 @@ - - +
-
+
+
Get Gentoo!
- + gentoo.org sites - +
+ gentoo.org + Wiki + Bugs + Forums + Packages +
+ Planet + Archives + Sources +
+ Infra Status +
-
-