Skip to content

Commit 60889ac

Browse files
author
Hidekazu Tanaka
committed
Merge pull request refactory-id#296 from waggyman/support-bs4
Change some style that supported by Bootstrap 4
2 parents a496d34 + f375463 commit 60889ac

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

bower.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"name": "bootstrap-markdown",
33
"version": "2.10.0",
4-
"main": ["./js/bootstrap-markdown.js", "./css/bootstrap-markdown.min.css"],
4+
"main": [
5+
"./js/bootstrap-markdown.js",
6+
"./css/bootstrap-markdown.min.css"
7+
],
58
"license": "Apache-2.0",
69
"dependencies": {
7-
"bootstrap": "~3"
10+
"bootstrap": "v4.0.0-alpha.6"
811
},
912
"devDependencies": {
10-
"markdown":"~0.4.0"
13+
"markdown": "~0.4.0"
1114
}
1215
}

js/bootstrap-markdown.js

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
var z,
107107
buttons = btnGroups[y].data,
108108
btnGroupContainer = $('<div/>', {
109-
'class': 'btn-group'
109+
'class': 'btn-group mr-2'
110110
});
111111

112112
for (z = 0; z < buttons.length; z++) {
@@ -122,9 +122,9 @@
122122

123123
// Construct the button object
124124
buttonContainer = $('<button></button>');
125-
buttonContainer.text(' ' + this.__localize(btnText)).addClass('btn-default btn-sm').addClass(btnClass);
125+
buttonContainer.text(' ' + this.__localize(btnText)).addClass('btn-default btn-secondary btn-sm').addClass(btnClass);
126126
if (btnClass.match(/btn\-(primary|success|info|warning|danger|link)/)) {
127-
buttonContainer.removeClass('btn-default');
127+
buttonContainer.removeClass('btn-default btn-secondary');
128128
}
129129
buttonContainer.attr({
130130
'type': 'button',
@@ -1025,7 +1025,7 @@
10251025
width: 'inherit',
10261026
height: 'inherit',
10271027
resize: 'none',
1028-
iconlibrary: 'glyph',
1028+
iconlibrary: 'fa',
10291029
language: 'en',
10301030
initialstate: 'editor',
10311031
parser: null,
@@ -1041,7 +1041,6 @@
10411041
hotkey: 'Ctrl+B',
10421042
title: 'Bold',
10431043
icon: {
1044-
glyph: 'glyphicon glyphicon-bold',
10451044
fa: 'fa fa-bold',
10461045
'fa-3': 'icon-bold',
10471046
'fa-5': 'fas fa-bold',
@@ -1078,7 +1077,6 @@
10781077
title: 'Italic',
10791078
hotkey: 'Ctrl+I',
10801079
icon: {
1081-
glyph: 'glyphicon glyphicon-italic',
10821080
fa: 'fa fa-italic',
10831081
'fa-3': 'icon-italic',
10841082
'fa-5': 'fas fa-italic',
@@ -1115,7 +1113,6 @@
11151113
title: 'Heading',
11161114
hotkey: 'Ctrl+H',
11171115
icon: {
1118-
glyph: 'glyphicon glyphicon-header',
11191116
fa: 'fa fa-header',
11201117
'fa-3': 'icon-font',
11211118
'fa-5': 'fas fa-heading',
@@ -1160,7 +1157,6 @@
11601157
title: 'URL/Link',
11611158
hotkey: 'Ctrl+L',
11621159
icon: {
1163-
glyph: 'glyphicon glyphicon-link',
11641160
fa: 'fa fa-link',
11651161
'fa-3': 'icon-link',
11661162
'fa-5': 'fas fa-link',
@@ -1198,7 +1194,6 @@
11981194
title: 'Image',
11991195
hotkey: 'Ctrl+G',
12001196
icon: {
1201-
glyph: 'glyphicon glyphicon-picture',
12021197
fa: 'fa fa-picture-o',
12031198
'fa-3': 'icon-picture',
12041199
'fa-5': 'far fa-image',
@@ -1242,7 +1237,6 @@
12421237
hotkey: 'Ctrl+U',
12431238
title: 'Unordered List',
12441239
icon: {
1245-
glyph: 'glyphicon glyphicon-list',
12461240
fa: 'fa fa-list',
12471241
'fa-3': 'icon-list-ul',
12481242
'fa-5': 'fas fa-list-ul',
@@ -1294,7 +1288,6 @@
12941288
hotkey: 'Ctrl+O',
12951289
title: 'Ordered List',
12961290
icon: {
1297-
glyph: 'glyphicon glyphicon-th-list',
12981291
fa: 'fa fa-list-ol',
12991292
'fa-3': 'icon-list-ol',
13001293
'fa-5': 'fas fa-list-ol',
@@ -1348,7 +1341,6 @@
13481341
hotkey: 'Ctrl+K',
13491342
title: 'Code',
13501343
icon: {
1351-
glyph: 'glyphicon glyphicon-console',
13521344
fa: 'fa fa-code',
13531345
'fa-3': 'icon-code',
13541346
'fa-5': 'fas fa-code',
@@ -1393,7 +1385,6 @@
13931385
hotkey: 'Ctrl+Q',
13941386
title: 'Quote',
13951387
icon: {
1396-
glyph: 'glyphicon glyphicon-comment',
13971388
fa: 'fa fa-quote-left',
13981389
'fa-3': 'icon-quote-left',
13991390
'fa-5': 'fas fa-quote-left',
@@ -1452,7 +1443,6 @@
14521443
btnText: 'Preview',
14531444
btnClass: 'btn btn-primary btn-sm',
14541445
icon: {
1455-
glyph: 'glyphicon glyphicon-search',
14561446
fa: 'fa fa-search',
14571447
'fa-3': 'icon-search',
14581448
'fa-5': 'fas fa-search',
@@ -1486,7 +1476,6 @@
14861476
name: "fullscreenOn",
14871477
icon: {
14881478
fa: 'fa fa-expand',
1489-
glyph: 'glyphicon glyphicon-fullscreen',
14901479
'fa-3': 'icon-resize-full',
14911480
'fa-5': 'fas fa-expand-arrows-alt',
14921481
octicons: 'octicon octicon-link-external'
@@ -1496,7 +1485,6 @@
14961485
name: "fullscreenOff",
14971486
icon: {
14981487
fa: 'fa fa-compress',
1499-
glyph: 'glyphicon glyphicon-fullscreen',
15001488
'fa-3': 'icon-resize-small',
15011489
'fa-5': 'fas fa-compress',
15021490
octicons: 'octicon octicon-browser'

0 commit comments

Comments
 (0)