Skip to content

Commit 3a2d603

Browse files
committed
fix: bootstrap modal emoji, upgrade jquery, fix css, some flake8, etc.
1 parent 2675461 commit 3a2d603

File tree

22 files changed

+45
-33
lines changed

22 files changed

+45
-33
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
github: [agusmakmun]
2-
patreon: summonagus
32
ko_fi:
43
liberapay:
54
issuehunt:

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ about: Create a bug report
77
<!-- Describe the bug here. -->
88

99
## Details
10+
- OS (Operating System) version:
1011
- Browser and browser version:
11-
- OS version:
12+
- Django version:
1213
- Martor version:
1314

1415
### Steps to reproduce

martor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
__VERSION__ = '1.5.8'
3+
__VERSION__ = '1.5.9'
44
__AUTHOR__ = 'Agus Makmun (Summon Agus)'
55
__AUTHOR_EMAIL__ = '[email protected]'

martor/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from __future__ import unicode_literals
33

44
from django.contrib import admin
5-
from django.db import models
65

76
from .widgets import AdminMartorWidget
87
from .models import MartorField

martor/extensions/mention.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def extendMarkdown(self, md, md_globals):
4646
def makeExtension(*args, **kwargs):
4747
return MentionExtension(*args, **kwargs)
4848

49+
4950
if __name__ == "__main__":
5051
import doctest
5152
doctest.testmod()

martor/extensions/urlize.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def handleMatch(self, m):
6161
text = url
6262

6363
if not url.split('://')[0] in ('http', 'https', 'ftp'):
64-
if '@' in url and not '/' in url:
64+
if '@' in url and '/' not in url:
6565
url = 'mailto:' + url
6666
else:
6767
url = 'http://' + url
@@ -83,6 +83,7 @@ def extendMarkdown(self, md, md_globals):
8383
def makeExtension(*args, **kwargs):
8484
return UrlizeExtension(*args, **kwargs)
8585

86+
8687
if __name__ == "__main__":
8788
import doctest
8889
doctest.testmod()

martor/fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from django import forms
55

66
from .settings import MARTOR_ENABLE_LABEL
7-
from .widgets import (MartorWidget, AdminMartorWidget)
7+
from .widgets import MartorWidget
88

99

1010
class MartorFormField(forms.CharField):

martor/static/martor/css/martor-admin.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,15 @@ fieldset .form-row>div {
8383
fieldset .form-row div>label {
8484
display: contents!important;
8585
}
86+
87+
.submit-row a.deletelink {
88+
height: unset;
89+
}
90+
91+
.table.markdown-reference h2 {
92+
font-size: 1.5em;
93+
background: none;
94+
color: unset;
95+
padding: 0;
96+
font-weight: 300!important;
97+
}

martor/static/martor/css/martor-admin.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/css/martor.bootstrap.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)