From 1d452a6ed4c0bfac4dadd2c90fa53282222ebe1b Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Thu, 4 Oct 2018 20:01:01 +0200 Subject: [PATCH] Remove dead package octicon Octicon no longer provides its CSS classes and this way is useless in CodiMD. Replacing all used classes in the UI and remove it from build system. Signed-off-by: Sheogorath --- package.json | 1 - public/css/github-extract.css | 37 ++++++++++++++++++----------------- public/js/extra.js | 2 +- public/views/codimd/head.ejs | 1 - public/views/html.hbs | 1 - public/views/pretty.ejs | 1 - public/views/slide.ejs | 1 - webpack.common.js | 9 +++------ 8 files changed, 23 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 3aa28fad8..b0a906db2 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "morgan": "^1.7.0", "mysql": "^2.12.0", "node-uuid": "^1.4.7", - "octicons": "~4.4.0", "passport": "^0.4.0", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", diff --git a/public/css/github-extract.css b/public/css/github-extract.css index 7f7058a0a..f7b15445c 100644 --- a/public/css/github-extract.css +++ b/public/css/github-extract.css @@ -119,23 +119,24 @@ color: #ddd; } -.markdown-body h1 .octicon-link, -.markdown-body h2 .octicon-link, -.markdown-body h3 .octicon-link, -.markdown-body h4 .octicon-link, -.markdown-body h5 .octicon-link, -.markdown-body h6 .octicon-link { +.markdown-body h1 .fa-link, +.markdown-body h2 .fa-link, +.markdown-body h3 .fa-link, +.markdown-body h4 .fa-link, +.markdown-body h5 .fa-link, +.markdown-body h6 .fa-link { color: #000; vertical-align: middle; visibility: hidden; + font-size: 16px; } -.night .markdown-body h1 .octicon-link, -.night .markdown-body h2 .octicon-link, -.night .markdown-body h3 .octicon-link, -.night .markdown-body h4 .octicon-link, -.night .markdown-body h5 .octicon-link, -.night .markdown-body h6 .octicon-link { +.night .markdown-body h1 .fa-link, +.night .markdown-body h2 .fa-link, +.night .markdown-body h3 .fa-link, +.night .markdown-body h4 .fa-link, +.night .markdown-body h5 .fa-link, +.night .markdown-body h6 .fa-link { color: #fff; } @@ -148,12 +149,12 @@ text-decoration: none; } -.markdown-body h1:hover .anchor .octicon-link, -.markdown-body h2:hover .anchor .octicon-link, -.markdown-body h3:hover .anchor .octicon-link, -.markdown-body h4:hover .anchor .octicon-link, -.markdown-body h5:hover .anchor .octicon-link, -.markdown-body h6:hover .anchor .octicon-link { +.markdown-body h1:hover .anchor .fa-link, +.markdown-body h2:hover .anchor .fa-link, +.markdown-body h3:hover .anchor .fa-link, +.markdown-body h4:hover .anchor .fa-link, +.markdown-body h5:hover .anchor .fa-link, +.markdown-body h6:hover .anchor .fa-link { visibility: visible; } diff --git a/public/js/extra.js b/public/js/extra.js index 7a1077d59..dd2640478 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -834,7 +834,7 @@ const anchorForId = id => { const anchor = document.createElement('a') anchor.className = 'anchor hidden-xs' anchor.href = `#${id}` - anchor.innerHTML = '' + anchor.innerHTML = '' anchor.title = id return anchor } diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs index b76eb706c..356ded6d2 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/codimd/head.ejs @@ -12,7 +12,6 @@ - <%- include ../build/index-header %> <%- include ../shared/polyfill %> diff --git a/public/views/html.hbs b/public/views/html.hbs index cc08b6fe9..490d31a47 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -18,7 +18,6 @@ - diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index a20f2296b..a087be7fe 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -21,7 +21,6 @@ - <%- include build/pretty-header %> <%- include shared/polyfill %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 2b069f2df..42fb51998 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -18,7 +18,6 @@ <% if(useCDN) { %> - <%- include build/slide-header %> diff --git a/webpack.common.js b/webpack.common.js index 377992b3a..efd2b3e24 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -239,8 +239,7 @@ module.exports = { path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), path.join(__dirname, 'public/css/bootstrap-social.css'), - path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/build/octicons.css') + path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css') ], 'index-pack': [ 'babel-polyfill', @@ -289,8 +288,7 @@ module.exports = { 'pretty-styles-pack': [ path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), - path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/build/octicons.css') + path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css') ], 'pretty-pack': [ 'babel-polyfill', @@ -326,8 +324,7 @@ module.exports = { ], 'slide-styles-pack': [ path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), - path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/build/octicons.css') + path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css') ], 'slide-pack': [ 'babel-polyfill',