Skip to content

Commit 4bce4b1

Browse files
SISheogorathSISheogorath
authored
Merge pull request #989 from SISheogorath/remove/octicon
Remove dead package octicon
2 parents bf525e4 + 1d452a6 commit 4bce4b1

File tree

8 files changed

+23
-30
lines changed

8 files changed

+23
-30
lines changed

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
"morgan": "^1.7.0",
9090
"mysql": "^2.12.0",
9191
"node-uuid": "^1.4.7",
92-
"octicons": "~4.4.0",
9392
"passport": "^0.4.0",
9493
"passport-dropbox-oauth2": "^1.1.0",
9594
"passport-facebook": "^2.1.1",

‎public/css/github-extract.css

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,24 @@
119119
color: #ddd;
120120
}
121121

122-
.markdown-body h1 .octicon-link,
123-
.markdown-body h2 .octicon-link,
124-
.markdown-body h3 .octicon-link,
125-
.markdown-body h4 .octicon-link,
126-
.markdown-body h5 .octicon-link,
127-
.markdown-body h6 .octicon-link {
122+
.markdown-body h1 .fa-link,
123+
.markdown-body h2 .fa-link,
124+
.markdown-body h3 .fa-link,
125+
.markdown-body h4 .fa-link,
126+
.markdown-body h5 .fa-link,
127+
.markdown-body h6 .fa-link {
128128
color: #000;
129129
vertical-align: middle;
130130
visibility: hidden;
131+
font-size: 16px;
131132
}
132133

133-
.night .markdown-body h1 .octicon-link,
134-
.night .markdown-body h2 .octicon-link,
135-
.night .markdown-body h3 .octicon-link,
136-
.night .markdown-body h4 .octicon-link,
137-
.night .markdown-body h5 .octicon-link,
138-
.night .markdown-body h6 .octicon-link {
134+
.night .markdown-body h1 .fa-link,
135+
.night .markdown-body h2 .fa-link,
136+
.night .markdown-body h3 .fa-link,
137+
.night .markdown-body h4 .fa-link,
138+
.night .markdown-body h5 .fa-link,
139+
.night .markdown-body h6 .fa-link {
139140
color: #fff;
140141
}
141142

@@ -148,12 +149,12 @@
148149
text-decoration: none;
149150
}
150151

151-
.markdown-body h1:hover .anchor .octicon-link,
152-
.markdown-body h2:hover .anchor .octicon-link,
153-
.markdown-body h3:hover .anchor .octicon-link,
154-
.markdown-body h4:hover .anchor .octicon-link,
155-
.markdown-body h5:hover .anchor .octicon-link,
156-
.markdown-body h6:hover .anchor .octicon-link {
152+
.markdown-body h1:hover .anchor .fa-link,
153+
.markdown-body h2:hover .anchor .fa-link,
154+
.markdown-body h3:hover .anchor .fa-link,
155+
.markdown-body h4:hover .anchor .fa-link,
156+
.markdown-body h5:hover .anchor .fa-link,
157+
.markdown-body h6:hover .anchor .fa-link {
157158
visibility: visible;
158159
}
159160

‎public/js/extra.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ const anchorForId = id => {
834834
const anchor = document.createElement('a')
835835
anchor.className = 'anchor hidden-xs'
836836
anchor.href = `#${id}`
837-
anchor.innerHTML = '<span class="octicon octicon-link"></span>'
837+
anchor.innerHTML = '<i class="fa fa-link"></i>'
838838
anchor.title = id
839839
return anchor
840840
}

‎public/views/codimd/head.ejs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
1313
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css" integrity="sha256-02JtFTurpwBjQJ6q13iJe82/NF0RbZlJroDegK5g87Y=" crossorigin="anonymous" />
1414
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
15-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
1615
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
1716
<%- include ../build/index-header %>
1817
<%- include ../shared/polyfill %>

‎public/views/html.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
1919
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
2020
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
21-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
2221
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/themes/prism.min.css" integrity="sha256-vtR0hSWRc3Tb26iuN2oZHt3KRUomwTufNIf5/4oeCyg=" crossorigin="anonymous" />
2322
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github-gist.min.css" integrity="sha256-tAflq+ymku3Khs+I/WcAneIlafYgDiOQ9stIHH985Wo=" crossorigin="anonymous" />
2423
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />

‎public/views/pretty.ejs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
2222
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
2323
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
24-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
2524
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
2625
<%- include build/pretty-header %>
2726
<%- include shared/polyfill %>

‎public/views/slide.ejs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<% if(useCDN) { %>
1919
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
2020
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
21-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
2221
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0/css/reveal.min.css" integrity="sha256-ol2N5Xr80jdDqxK0lte3orKGb9Ja3sOnpAUV7TTADmg=" crossorigin="anonymous" />
2322
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
2423
<%- include build/slide-header %>

‎webpack.common.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ module.exports = {
239239
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
240240
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
241241
path.join(__dirname, 'public/css/bootstrap-social.css'),
242-
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
243-
path.join(__dirname, 'node_modules/octicons/build/octicons.css')
242+
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css')
244243
],
245244
'index-pack': [
246245
'babel-polyfill',
@@ -289,8 +288,7 @@ module.exports = {
289288
'pretty-styles-pack': [
290289
path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
291290
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
292-
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
293-
path.join(__dirname, 'node_modules/octicons/build/octicons.css')
291+
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css')
294292
],
295293
'pretty-pack': [
296294
'babel-polyfill',
@@ -326,8 +324,7 @@ module.exports = {
326324
],
327325
'slide-styles-pack': [
328326
path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'),
329-
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
330-
path.join(__dirname, 'node_modules/octicons/build/octicons.css')
327+
path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css')
331328
],
332329
'slide-pack': [
333330
'babel-polyfill',

0 commit comments

Comments
 (0)