From eab1bbcf8a1fe15f812c94d88021b579cabf231a Mon Sep 17 00:00:00 2001 From: patrikx3 Date: Fri, 11 May 2018 16:00:25 +0200 Subject: [PATCH] p3x-robot sunday release 2018-5-11 16:00:25 --- Gruntfile.js | 32 ++++++++++++++++++++-- INSTALL.md | 2 +- README.md | 6 ++-- artifacts/php-7.2-ubuntu.md | 2 +- bower.json | 3 +- changelog.md | 5 +++- package.json | 2 +- themes/default/css/bootstrap-cerulean.css | 6 ++++ themes/default/css/bootstrap-cosmo.css | 6 ++++ themes/default/css/bootstrap-cyborg.css | 6 ++++ themes/default/css/bootstrap-darkly.css | 6 ++++ themes/default/css/bootstrap-default.css | 6 ++++ themes/default/css/bootstrap-flatly.css | 6 ++++ themes/default/css/bootstrap-journal.css | 6 ++++ themes/default/css/bootstrap-lumen.css | 6 ++++ themes/default/css/bootstrap-paper.css | 6 ++++ themes/default/css/bootstrap-readable.css | 6 ++++ themes/default/css/bootstrap-sandstone.css | 6 ++++ themes/default/css/bootstrap-simplex.css | 6 ++++ themes/default/css/bootstrap-slate.css | 6 ++++ themes/default/css/bootstrap-spacelab.css | 6 ++++ themes/default/css/bootstrap-superhero.css | 6 ++++ themes/default/css/bootstrap-united.css | 6 ++++ themes/default/css/bootstrap-yeti.css | 6 ++++ themes/default/css/style.css | 6 ++++ themes/default/js/main.js | 11 ++++++-- themes/default/less/default.less | 6 ++++ themes/default/twig/layout.twig | 11 ++++++++ 28 files changed, 176 insertions(+), 12 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9eb066b9..42935425 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,3 @@ -const utils = require('corifeus-utils'); const fs = require('fs'); const fsExtra = require('fs-extra'); @@ -11,6 +10,35 @@ module.exports = function (grunt) { 'themes/default/css/fontawesome.css': 'themes/default/less/fontawesome.less', } + const wiredepOverrides = { + // for jgrowl it requires animate, so slim is not good + 'jquery': { + main: 'dist/jquery.js' + }, + codemirror: { + main: [ + 'lib/codemirror.css', + 'lib/codemirror.js', + 'addon/mode/simple.js', + 'addon/mode/multiplex.js', + 'addon/mode/multiplex.js', + 'mode/xml/xml.js', + 'mode/javascript/javascript.js', + 'mode/css/css.js', + 'mode/htmlmixed/htmlmixed.js', + 'mode/handlebars/handlebars.js', + 'mode/yaml/yaml.js', + 'mode/sass/sass.js', + ] + }, + twemoji: { + main: [ + '2/twemoji.js', + ] + } + }; + + const root = './node_modules/bootswatch'; const watches = fs.readdirSync(root); const themes = ['default']; @@ -105,7 +133,7 @@ var themes = ${JSON.stringify(themeCss, null, 4)} target: { src: 'themes/default/twig/layout.twig', ignorePath: '../../..', -// overrides: wiredepOverrides, + overrides: wiredepOverrides, // exclude: wiredepExclude fileTypes: { twig: { diff --git a/INSTALL.md b/INSTALL.md index 4c4cf656..eb1925df 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -106,7 +106,7 @@ UrlToolkit { --- -[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.1 +[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.2 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/README.md b/README.md index 0137449e..3ab5126c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ -# 🤖 P3X Gitlist v1.1.1 +# 🤖 P3X Gitlist v1.1.2 # Description @@ -24,7 +24,7 @@ This is Klaus Silveira's fork, with multiple themes, sub-modules and updated to Done, just put on your server, nothing to build: https://github.com/patrikx3/gitlist/releases -### v1.1.1 - unreleased / in progress +### v1.2.0 - unreleased / in progress * In submodules, if the "submodule" and "path" is not the same, it chokes (it should work the submodule name and path are not the same) * Works * submodule "path/name" @@ -76,7 +76,7 @@ If you have Composer in your path, things get easier. But you know the drill. --- -[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.1 +[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.2 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md index 5dd9c6fc..800a5a01 100644 --- a/artifacts/php-7.2-ubuntu.md +++ b/artifacts/php-7.2-ubuntu.md @@ -19,7 +19,7 @@ sudo apt upgrade -y --- -[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.1 +[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.2 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/bower.json b/bower.json index 86e0989b..cf741deb 100644 --- a/bower.json +++ b/bower.json @@ -22,6 +22,7 @@ "lodash": "^4.17.10", "codemirror": "^5.37.0", "raphael": "^2.2.7", - "php-date-formatter": "^1.3.4" + "php-date-formatter": "^1.3.4", + "twemoji": "^2.6.0" } } diff --git a/changelog.md b/changelog.md index c7421ff0..f6586755 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,9 @@ [//]: #@corifeus-header:end +### v1.1.2 +* Added twemoji's + ### v1.1.1 * Format size was missing space (ugly) * Graph time was not using the ```config.ini``` @@ -60,7 +63,7 @@ --- -[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.1 +[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.2 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) diff --git a/package.json b/package.json index e06b4d09..9c873827 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "opencollective": false }, "description": "🤖 P3X Gitlist", - "version": "1.1.1", + "version": "1.1.2", "main": "index.js", "repository": "https://github.com/patrikx3/gitlist", "author": "patrikx3 ", diff --git a/themes/default/css/bootstrap-cerulean.css b/themes/default/css/bootstrap-cerulean.css index 7972f2ac..ffeaeb95 100644 --- a/themes/default/css/bootstrap-cerulean.css +++ b/themes/default/css/bootstrap-cerulean.css @@ -7208,3 +7208,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-cosmo.css b/themes/default/css/bootstrap-cosmo.css index 882e4494..1e4f521a 100644 --- a/themes/default/css/bootstrap-cosmo.css +++ b/themes/default/css/bootstrap-cosmo.css @@ -7261,3 +7261,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-cyborg.css b/themes/default/css/bootstrap-cyborg.css index 18ba8258..0e79fddf 100644 --- a/themes/default/css/bootstrap-cyborg.css +++ b/themes/default/css/bootstrap-cyborg.css @@ -7251,3 +7251,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-darkly.css b/themes/default/css/bootstrap-darkly.css index df505185..cc7dffe8 100644 --- a/themes/default/css/bootstrap-darkly.css +++ b/themes/default/css/bootstrap-darkly.css @@ -7371,3 +7371,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-default.css b/themes/default/css/bootstrap-default.css index f9d1bca6..9a391926 100644 --- a/themes/default/css/bootstrap-default.css +++ b/themes/default/css/bootstrap-default.css @@ -7081,3 +7081,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-flatly.css b/themes/default/css/bootstrap-flatly.css index f4d44bb2..1f2ad41d 100644 --- a/themes/default/css/bootstrap-flatly.css +++ b/themes/default/css/bootstrap-flatly.css @@ -7347,3 +7347,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-journal.css b/themes/default/css/bootstrap-journal.css index d8438329..3aa35bdd 100644 --- a/themes/default/css/bootstrap-journal.css +++ b/themes/default/css/bootstrap-journal.css @@ -7173,3 +7173,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-lumen.css b/themes/default/css/bootstrap-lumen.css index 21ceb03c..f222364e 100644 --- a/themes/default/css/bootstrap-lumen.css +++ b/themes/default/css/bootstrap-lumen.css @@ -7498,3 +7498,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-paper.css b/themes/default/css/bootstrap-paper.css index a23d5a5f..69d12843 100644 --- a/themes/default/css/bootstrap-paper.css +++ b/themes/default/css/bootstrap-paper.css @@ -7823,3 +7823,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-readable.css b/themes/default/css/bootstrap-readable.css index 053f0f57..f8558381 100644 --- a/themes/default/css/bootstrap-readable.css +++ b/themes/default/css/bootstrap-readable.css @@ -7197,3 +7197,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-sandstone.css b/themes/default/css/bootstrap-sandstone.css index 58dfee37..033d2eee 100644 --- a/themes/default/css/bootstrap-sandstone.css +++ b/themes/default/css/bootstrap-sandstone.css @@ -7235,3 +7235,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-simplex.css b/themes/default/css/bootstrap-simplex.css index c38f11f3..12c38356 100644 --- a/themes/default/css/bootstrap-simplex.css +++ b/themes/default/css/bootstrap-simplex.css @@ -7223,3 +7223,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-slate.css b/themes/default/css/bootstrap-slate.css index d2f3cd56..8c8753ce 100644 --- a/themes/default/css/bootstrap-slate.css +++ b/themes/default/css/bootstrap-slate.css @@ -7535,3 +7535,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-spacelab.css b/themes/default/css/bootstrap-spacelab.css index 77c48b5c..f15a81d2 100644 --- a/themes/default/css/bootstrap-spacelab.css +++ b/themes/default/css/bootstrap-spacelab.css @@ -7255,3 +7255,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-superhero.css b/themes/default/css/bootstrap-superhero.css index d4148d20..8ae1d639 100644 --- a/themes/default/css/bootstrap-superhero.css +++ b/themes/default/css/bootstrap-superhero.css @@ -7331,3 +7331,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-united.css b/themes/default/css/bootstrap-united.css index 1ad140af..37336623 100644 --- a/themes/default/css/bootstrap-united.css +++ b/themes/default/css/bootstrap-united.css @@ -7095,3 +7095,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/bootstrap-yeti.css b/themes/default/css/bootstrap-yeti.css index fe068d03..7ad3c0b7 100644 --- a/themes/default/css/bootstrap-yeti.css +++ b/themes/default/css/bootstrap-yeti.css @@ -7395,3 +7395,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/css/style.css b/themes/default/css/style.css index 9f734535..d3ec94ed 100644 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -358,3 +358,9 @@ a.p3x-gitlist-markdown-heading-link { .p3x-gitlist-markdown-image { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} diff --git a/themes/default/js/main.js b/themes/default/js/main.js index 0b5ea5ef..a0ce5bee 100755 --- a/themes/default/js/main.js +++ b/themes/default/js/main.js @@ -1,4 +1,5 @@ $(function () { + $('.dropdown-toggle').dropdown(); if ($('#sourcecode').length) { @@ -14,7 +15,9 @@ $(function () { lineWrapping: true, readOnly: true, mode: mode, - + lineNumberFormatter: function(ln) { + return ln; + } }); } // blob/master @@ -68,7 +71,10 @@ $(function () { var html = marked($('#md-content').text(), { renderer: markdownRenderer }); - $('#md-content').html(html); + $('#md-content').html(twemoji.parse(html, { + folder: 'svg', + ext: '.svg', + })); } var clonePopup = $('#clone-popup') @@ -147,3 +153,4 @@ if ($('#branchList').length) { $('.search').click(function (e) { e.stopPropagation(); }); + diff --git a/themes/default/less/default.less b/themes/default/less/default.less index e2ba8892..50d4b603 100644 --- a/themes/default/less/default.less +++ b/themes/default/less/default.less @@ -48,3 +48,9 @@ a.p3x-gitlist-markdown-heading-link { max-width: 100%; } +img.emoji { + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} \ No newline at end of file diff --git a/themes/default/twig/layout.twig b/themes/default/twig/layout.twig index 28ef0677..1fa7c19a 100644 --- a/themes/default/twig/layout.twig +++ b/themes/default/twig/layout.twig @@ -30,9 +30,20 @@ + + + + + + + + + + +