Skip to content

Commit a98f878

Browse files
authored
Merge pull request #97 from bkraul/develop
Minimal styling and scripting corrections.
2 parents 1d7250a + 71a2e28 commit a98f878

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

BBCodePlus/BBCodePlus.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function register() {
2222
$this->name = plugin_lang_get( 'title' );
2323
$this->description = plugin_lang_get( 'description' );
2424
$this->page = 'config';
25-
$this->version = '2.1.16';
25+
$this->version = '2.1.17';
2626

2727
$this->requires['MantisCore'] = '2.0.0';
2828
# this plugin can coexist with MantisCoreFormatting.

BBCodePlus/files/bbcodeplus.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,24 @@
6060
padding: 0;
6161
border: 1px solid #888;
6262
width: 50%;
63-
max-height: 50%px;
63+
max-height: 50%;
6464
overflow: auto;
6565
z-index: 1031;
6666
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
6767
animation-name: animatetop;
6868
animation-duration: 0.4s
6969
}
7070

71+
.bbcodeplus.modal-body {
72+
padding: 10px;
73+
}
74+
7175
.bbcodeplus.image-picker ul {
7276
margin: 1em 0;
7377
padding: 0;
7478
list-style: none;
7579
display: grid;
76-
grid: auto-flow / repeat(auto-fit, minmax(100px, 1fr));
80+
grid: auto-flow / repeat(auto-fill, minmax(110px, 1fr));
7781
align-items: baseline;
7882
grid-gap: 10px;
7983
gap: 10px;

BBCodePlus/files/markitup/sets/mantis/set.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,11 @@ mySettings = {
190190

191191
// empty picker body.
192192
body.html("");
193-
193+
194194
// create a new list of images.
195-
var list = body.append("<ul></ul>");
195+
body.append("<ul></ul>")
196+
var list = body.children('ul');
197+
196198
// append thumbnail classes.
197199
list.attr("class", "bbcodeplus image-picker");
198200

@@ -205,7 +207,7 @@ mySettings = {
205207
markitup.textarea.insertAtCaret("[img]" + imgUrl + "[/img]");
206208
$(document.body).css('overflow', 'auto');
207209
modal.hide();
208-
return false;s
210+
return false;
209211
});
210212
list.append(img);
211213
});
Loading

BBCodePlus/files/markitup/skins/mantis/style.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
text-decoration: none;
1313
}
1414
.markItUp {
15-
width: 730px;
1615
margin: 5px 0 5px 0;
1716
}
1817
.markItUpContainer {
@@ -24,11 +23,11 @@
2423

2524
.markItUpEditor {
2625
font:12px 'CG Mono', 'Consolas', 'Courier New', Courier, monospace;
27-
padding: 5px 5px 5px 35px !important;
26+
padding: 5px 5px 5px 5px !important;
2827
border: 3px solid #3C769D;
29-
width: 667px;
28+
width: 98%;
3029
height: 320px;
31-
background: #FFF url("plugin_file.php?file=BBCodePlus/markitup/skins/mantis/images/bg-editor.png") no-repeat;
30+
background: #FFF url("plugin_file.php?file=BBCodePlus/markitup/skins/mantis/images/bg-editor.png") repeat-x;
3231
clear: both;
3332
line-height: 18px;
3433
overflow: auto;

BBCodePlus/files/markitup/skins/plain/style.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
text-decoration: none;
1313
}
1414
.markItUp {
15-
width: 730px;
1615
margin: 5px 0 5px 0;
1716
}
1817
.markItUpContainer {
@@ -22,7 +21,7 @@
2221
font: 12px 'CG Mono', 'Consolas', 'Courier New', Courier, monospace;
2322
padding: 5px 5px 5px 5px;
2423
border: 1px solid #c0c0c0;
25-
width: 705px;
24+
width: 98%;
2625
height: 320px;
2726
clear: both;
2827
line-height: 18px;

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ If you would like to contribute to BBCode plus, please [read this guide first](h
2626

2727
## Change Log
2828

29+
### 2.1.17
30+
31+
- Fixed styling and scripting issues with issue image picker.
32+
- Resized markItUp editor elements.
33+
2934
### 2.1.16
3035

3136
- NEW: Added image picker modal for picking images that have been uploaded to issue.

0 commit comments

Comments
 (0)