diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index cc22b6f09..cc1ac62d0 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -11,39 +11,15 @@ on:
# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
jobs:
build:
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
strategy:
matrix:
- os: [ macos-latest, ubuntu-latest ]
- python-version: [ 3.9, "3.10" ]
- django-version: [ 3.2, 4.0, 4.1, 4.2 ]
+ python-version: [ "3.10", "3.11", "3.12" , "3.13"]
+ django-version: [ "5.0", "5.1" ]
include:
- - os: macos-latest
- python-version: "3.8"
- django-version: "3.2"
- - os: ubuntu-latest
- python-version: "3.8"
- django-version: "3.2"
- - os: macos-latest
- python-version: "3.8"
- django-version: "4.0"
- - os: ubuntu-latest
- python-version: "3.8"
- django-version: "4.0"
- - os: macos-latest
- python-version: "3.10"
- django-version: "5.0"
- - os: ubuntu-latest
- python-version: "3.10"
- django-version: "5.0"
- - os: macos-latest
- python-version: "3.10"
- django-version: "5.0.3"
- - os: ubuntu-latest
- python-version: "3.10"
- django-version: "5.0.3"
-
+ - python-version: "3.9"
+ django-version: "4.2"
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -55,8 +31,8 @@ jobs:
- name: Install dependencies
run: |
- pip install -q Django==${{ matrix.django-version }}
- python -m pip install --upgrade pip
+ pip install -U pip setuptools
+ pip install -q django==${{ matrix.django-version }}
python setup.py install
- name: Test with pytest
diff --git a/README.md b/README.md
index d39b2b43a..2705321b5 100644
--- a/README.md
+++ b/README.md
@@ -300,7 +300,6 @@ Different with *Template Renderer*, the *Template Editor Form* have more css & j
{% block css %}
-
{% endblock %}
@@ -328,7 +327,6 @@ Different with *Template Renderer*, the *Template Editor Form* have more css & j
-
{% endblock %}
diff --git a/martor/static/martor/css/martor-admin.css b/martor/static/martor/css/martor-admin.css
index 249217ae0..192d71985 100644
--- a/martor/static/martor/css/martor-admin.css
+++ b/martor/static/martor/css/martor-admin.css
@@ -127,6 +127,11 @@ fieldset .form-row .main-martor {
display: revert;
}
+/* fix issue: #270 */
+table {
+ caption-side: top;
+}
+
/* fix issue: #168 */
@media (prefers-color-scheme: dark) {
body {
diff --git a/martor/static/martor/css/martor-admin.min.css b/martor/static/martor/css/martor-admin.min.css
index b0c80a4cd..9f3d9ed84 100644
--- a/martor/static/martor/css/martor-admin.min.css
+++ b/martor/static/martor/css/martor-admin.min.css
@@ -129,6 +129,10 @@ fieldset .form-row .main-martor {
display: revert
}
+table {
+ caption-side: top;
+}
+
@media (prefers-color-scheme:dark) {
body {
color: #fff;
diff --git a/martor/static/martor/css/martor.bootstrap.css b/martor/static/martor/css/martor.bootstrap.css
index 11e9021e2..33ed550a9 100644
--- a/martor/static/martor/css/martor.bootstrap.css
+++ b/martor/static/martor/css/martor.bootstrap.css
@@ -10,6 +10,9 @@ body.overflow {
width: 100%;
height: 250px;
min-height: 100px;
+ resize: vertical;
+ border-right: 1px solid rgb(204, 204, 204);
+ border-bottom: 1px solid rgb(204, 204, 204);
}
.main-martor {
margin: 1em 0;
diff --git a/martor/static/martor/css/martor.bootstrap.min.css b/martor/static/martor/css/martor.bootstrap.min.css
index 6873671d2..cf3a3683f 100644
--- a/martor/static/martor/css/martor.bootstrap.min.css
+++ b/martor/static/martor/css/martor.bootstrap.min.css
@@ -18,7 +18,10 @@ body.overflow {
.martor-field {
width: 100%;
height: 250px;
- min-height: 100px
+ min-height: 100px;
+ resize: vertical;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc
}
.main-martor {
diff --git a/martor/static/martor/css/martor.semantic.css b/martor/static/martor/css/martor.semantic.css
index e77c1e7ee..9a4c40bb7 100644
--- a/martor/static/martor/css/martor.semantic.css
+++ b/martor/static/martor/css/martor.semantic.css
@@ -226,6 +226,9 @@ div.martor-preview pre tt{margin:0;padding:0;background-color:transparent;border
width: 100%;
height: 250px;
min-height: 100px;
+ resize: vertical;
+ border-right: 1px solid rgb(204, 204, 204);
+ border-bottom: 1px solid rgb(204, 204, 204);
}
div.martor-preview {
diff --git a/martor/static/martor/css/martor.semantic.min.css b/martor/static/martor/css/martor.semantic.min.css
index b3ffea488..0e5fe6ad9 100644
--- a/martor/static/martor/css/martor.semantic.min.css
+++ b/martor/static/martor/css/martor.semantic.min.css
@@ -37,7 +37,8 @@ body.overflow {
}
.martor-toolbar {
- padding: 0 0.85714286em !important4px !important !important
+ padding: 0 0.85714286em !important;
+ padding-bottom: 4px!important
}
.martor-toolbar .ui.icon .markdown-image-upload {
@@ -499,7 +500,10 @@ div.martor-preview pre tt {
.martor-field {
width: 100%;
height: 250px;
- min-height: 100px
+ min-height: 100px;
+ resize: vertical;
+ border-right: 1px solid rgb(204, 204, 204);
+ border-bottom: 1px solid rgb(204, 204, 204)
}
div.martor-preview {
diff --git a/martor/static/martor/js/martor.bootstrap.js b/martor/static/martor/js/martor.bootstrap.js
index 7a3fa57e8..3daef48f8 100644
--- a/martor/static/martor/js/martor.bootstrap.js
+++ b/martor/static/martor/js/martor.bootstrap.js
@@ -136,14 +136,6 @@
textareaId.val(value);
});
- // resize the editor using `resizable.min.js`
- $('#' + editorId).resizable({
- direction: 'bottom',
- stop: function () {
- editor.resize();
- }
- });
-
// update the preview if this menu is clicked
var currentTab = $('.tab-pane#nav-preview-' + field_name);
var editorTabButton = $('.nav-link#nav-editor-tab-' + field_name);
diff --git a/martor/static/martor/js/martor.bootstrap.min.js b/martor/static/martor/js/martor.bootstrap.min.js
index ff10db3ac..2ceb947d1 100644
--- a/martor/static/martor/js/martor.bootstrap.min.js
+++ b/martor/static/martor/js/martor.bootstrap.min.js
@@ -6,4 +6,4 @@
* Repository : https://github.com/agusmakmun/django-markdown-editor
* JS Minifier : https://jscompress.com
**/
-!function(A){(A=A||django.jQuery).fn.martor=function(){A(".martor").trigger("martor.init");function K(e){var n=null,o=0;if(document.cookie&&""!==document.cookie)for(var t=document.cookie.split(";");o