From 6c69e46a1e06d10de8b6d5e8edd8dabafe7ce572 Mon Sep 17 00:00:00 2001 From: yaemiku Date: Wed, 6 Jul 2022 23:36:29 +0200 Subject: [PATCH] [fix] change summernote theme --- .worktime | 6 +- core/static/css/dist/styles.css | 329 ++------------------------------ pdlzbs/settings.py | 2 +- static/css/dist/styles.css | 123 ++++++++---- 4 files changed, 103 insertions(+), 357 deletions(-) diff --git a/.worktime b/.worktime index 43049a2..3fc7335 100644 --- a/.worktime +++ b/.worktime @@ -1,3 +1,5 @@ -08.06.2022 - 1h 37mins +08.06.2022 - 1h 37 mins 09.06.2022 - 1h -12.06.2022 - 1h 15mins \ No newline at end of file +12.06.2022 - 1h 15 mins +15.06.2022 - 1h 30 mins +23.06.2022 - 1h 30 mins \ No newline at end of file diff --git a/core/static/css/dist/styles.css b/core/static/css/dist/styles.css index 9c14284..a69f79a 100644 --- a/core/static/css/dist/styles.css +++ b/core/static/css/dist/styles.css @@ -1081,216 +1081,6 @@ select { margin-bottom: 0; } -.prose-sm { - font-size: 0.875rem; - line-height: 1.7142857; -} - -.prose-sm :where(p):not(:where([class~="not-prose"] *)) { - margin-top: 1.1428571em; - margin-bottom: 1.1428571em; -} - -.prose-sm :where([class~="lead"]):not(:where([class~="not-prose"] *)) { - font-size: 1.2857143em; - line-height: 1.5555556; - margin-top: 0.8888889em; - margin-bottom: 0.8888889em; -} - -.prose-sm :where(blockquote):not(:where([class~="not-prose"] *)) { - margin-top: 1.3333333em; - margin-bottom: 1.3333333em; - padding-left: 1.1111111em; -} - -.prose-sm :where(h1):not(:where([class~="not-prose"] *)) { - font-size: 2.1428571em; - margin-top: 0; - margin-bottom: 0.8em; - line-height: 1.2; -} - -.prose-sm :where(h2):not(:where([class~="not-prose"] *)) { - font-size: 1.4285714em; - margin-top: 1.6em; - margin-bottom: 0.8em; - line-height: 1.4; -} - -.prose-sm :where(h3):not(:where([class~="not-prose"] *)) { - font-size: 1.2857143em; - margin-top: 1.5555556em; - margin-bottom: 0.4444444em; - line-height: 1.5555556; -} - -.prose-sm :where(h4):not(:where([class~="not-prose"] *)) { - margin-top: 1.4285714em; - margin-bottom: 0.5714286em; - line-height: 1.4285714; -} - -.prose-sm :where(img):not(:where([class~="not-prose"] *)) { - margin-top: 1.7142857em; - margin-bottom: 1.7142857em; -} - -.prose-sm :where(video):not(:where([class~="not-prose"] *)) { - margin-top: 1.7142857em; - margin-bottom: 1.7142857em; -} - -.prose-sm :where(figure):not(:where([class~="not-prose"] *)) { - margin-top: 1.7142857em; - margin-bottom: 1.7142857em; -} - -.prose-sm :where(figure > *):not(:where([class~="not-prose"] *)) { - margin-top: 0; - margin-bottom: 0; -} - -.prose-sm :where(figcaption):not(:where([class~="not-prose"] *)) { - font-size: 0.8571429em; - line-height: 1.3333333; - margin-top: 0.6666667em; -} - -.prose-sm :where(code):not(:where([class~="not-prose"] *)) { - font-size: 0.8571429em; -} - -.prose-sm :where(h2 code):not(:where([class~="not-prose"] *)) { - font-size: 0.9em; -} - -.prose-sm :where(h3 code):not(:where([class~="not-prose"] *)) { - font-size: 0.8888889em; -} - -.prose-sm :where(pre):not(:where([class~="not-prose"] *)) { - font-size: 0.8571429em; - line-height: 1.6666667; - margin-top: 1.6666667em; - margin-bottom: 1.6666667em; - border-radius: 0.25rem; - padding-top: 0.6666667em; - padding-right: 1em; - padding-bottom: 0.6666667em; - padding-left: 1em; -} - -.prose-sm :where(ol):not(:where([class~="not-prose"] *)) { - padding-left: 1.5714286em; -} - -.prose-sm :where(ul):not(:where([class~="not-prose"] *)) { - padding-left: 1.5714286em; -} - -.prose-sm :where(li):not(:where([class~="not-prose"] *)) { - margin-top: 0.2857143em; - margin-bottom: 0.2857143em; -} - -.prose-sm :where(ol > li):not(:where([class~="not-prose"] *)) { - padding-left: 0.4285714em; -} - -.prose-sm :where(ul > li):not(:where([class~="not-prose"] *)) { - padding-left: 0.4285714em; -} - -.prose-sm > :where(ul > li p):not(:where([class~="not-prose"] *)) { - margin-top: 0.5714286em; - margin-bottom: 0.5714286em; -} - -.prose-sm > :where(ul > li > *:first-child):not(:where([class~="not-prose"] *)) { - margin-top: 1.1428571em; -} - -.prose-sm > :where(ul > li > *:last-child):not(:where([class~="not-prose"] *)) { - margin-bottom: 1.1428571em; -} - -.prose-sm > :where(ol > li > *:first-child):not(:where([class~="not-prose"] *)) { - margin-top: 1.1428571em; -} - -.prose-sm > :where(ol > li > *:last-child):not(:where([class~="not-prose"] *)) { - margin-bottom: 1.1428571em; -} - -.prose-sm :where(ul ul, ul ol, ol ul, ol ol):not(:where([class~="not-prose"] *)) { - margin-top: 0.5714286em; - margin-bottom: 0.5714286em; -} - -.prose-sm :where(hr):not(:where([class~="not-prose"] *)) { - margin-top: 2.8571429em; - margin-bottom: 2.8571429em; -} - -.prose-sm :where(hr + *):not(:where([class~="not-prose"] *)) { - margin-top: 0; -} - -.prose-sm :where(h2 + *):not(:where([class~="not-prose"] *)) { - margin-top: 0; -} - -.prose-sm :where(h3 + *):not(:where([class~="not-prose"] *)) { - margin-top: 0; -} - -.prose-sm :where(h4 + *):not(:where([class~="not-prose"] *)) { - margin-top: 0; -} - -.prose-sm :where(table):not(:where([class~="not-prose"] *)) { - font-size: 0.8571429em; - line-height: 1.5; -} - -.prose-sm :where(thead th):not(:where([class~="not-prose"] *)) { - padding-right: 1em; - padding-bottom: 0.6666667em; - padding-left: 1em; -} - -.prose-sm :where(thead th:first-child):not(:where([class~="not-prose"] *)) { - padding-left: 0; -} - -.prose-sm :where(thead th:last-child):not(:where([class~="not-prose"] *)) { - padding-right: 0; -} - -.prose-sm :where(tbody td):not(:where([class~="not-prose"] *)) { - padding-top: 0.6666667em; - padding-right: 1em; - padding-bottom: 0.6666667em; - padding-left: 1em; -} - -.prose-sm :where(tbody td:first-child):not(:where([class~="not-prose"] *)) { - padding-left: 0; -} - -.prose-sm :where(tbody td:last-child):not(:where([class~="not-prose"] *)) { - padding-right: 0; -} - -.prose-sm > :where(:first-child):not(:where([class~="not-prose"] *)) { - margin-top: 0; -} - -.prose-sm > :where(:last-child):not(:where([class~="not-prose"] *)) { - margin-bottom: 0; -} - .nav-item { border-top-width: 1px; --tw-border-opacity: 1; @@ -1344,6 +1134,10 @@ select { margin-right: auto; } +.mb-0 { + margin-bottom: 0px; +} + .mt-\[40px\] { margin-top: 40px; } @@ -1360,10 +1154,6 @@ select { margin-bottom: 1rem; } -.mb-0 { - margin-bottom: 0px; -} - .block { display: block; } @@ -1420,10 +1210,6 @@ select { min-width: 145px; } -.max-w-xs { - max-width: 20rem; -} - .basis-3\/5 { flex-basis: 60%; } @@ -1440,10 +1226,6 @@ select { transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } -.grid-cols-2 { - grid-template-columns: repeat(2, minmax(0, 1fr)); -} - .flex-col { flex-direction: column; } @@ -1480,10 +1262,6 @@ select { gap: 0.75rem; } -.gap-2 { - gap: 0.5rem; -} - .border { border-width: 1px; } @@ -1550,14 +1328,6 @@ select { font-family: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif; } -.text-\[13px\] { - font-size: 13px; -} - -.text-\[15px\] { - font-size: 15px; -} - .text-3xl { font-size: 1.875rem; line-height: 2.25rem; @@ -1568,24 +1338,21 @@ select { line-height: 1.75rem; } +.text-\[13px\] { + font-size: 13px; +} + +.text-\[15px\] { + font-size: 15px; +} + .text-5xl { font-size: 3rem; line-height: 1; } -.text-2xl { - font-size: 1.5rem; - line-height: 2rem; -} - -.text-4xl { - font-size: 2.25rem; - line-height: 2.5rem; -} - -.text-lg { - font-size: 1.125rem; - line-height: 1.75rem; +.font-semibold { + font-weight: 600; } .font-bold { @@ -1596,14 +1363,6 @@ select { font-weight: 300; } -.font-medium { - font-weight: 500; -} - -.font-semibold { - font-weight: 600; -} - .italic { font-style: italic; } @@ -1663,33 +1422,10 @@ select { display: block; } -.prose-headings\:mb-0 :is(:where(h1, h2, h3, h4, th):not(:where([class~="not-prose"] *))) { - margin-bottom: 0px; -} - -.prose-headings\:mt-0 :is(:where(h1, h2, h3, h4, th):not(:where([class~="not-prose"] *))) { - margin-top: 0px; -} - .prose-h1\:mb-0 :is(:where(h1):not(:where([class~="not-prose"] *))) { margin-bottom: 0px; } -.prose-h1\:text-xl :is(:where(h1):not(:where([class~="not-prose"] *))) { - font-size: 1.25rem; - line-height: 1.75rem; -} - -.prose-h1\:text-lg :is(:where(h1):not(:where([class~="not-prose"] *))) { - font-size: 1.125rem; - line-height: 1.75rem; -} - -.prose-h1\:text-xs :is(:where(h1):not(:where([class~="not-prose"] *))) { - font-size: 0.75rem; - line-height: 1rem; -} - .prose-h1\:font-light :is(:where(h1):not(:where([class~="not-prose"] *))) { font-weight: 300; } @@ -1699,44 +1435,11 @@ select { margin-bottom: 0px; } -.prose-h2\:mt-0 :is(:where(h2):not(:where([class~="not-prose"] *))) { - margin-top: 0px; -} - -.prose-h2\:bg-black :is(:where(h2):not(:where([class~="not-prose"] *))) { - --tw-bg-opacity: 1; - background-color: rgb(0 0 0 / var(--tw-bg-opacity)); -} - -.prose-h2\:text-xs :is(:where(h2):not(:where([class~="not-prose"] *))) { - font-size: 0.75rem; - line-height: 1rem; -} - -.prose-h2\:text-2xl :is(:where(h2):not(:where([class~="not-prose"] *))) { - font-size: 1.5rem; - line-height: 2rem; -} - -.prose-h2\:font-light :is(:where(h2):not(:where([class~="not-prose"] *))) { - font-weight: 300; -} - -.prose-h3\:bg-black :is(:where(h3):not(:where([class~="not-prose"] *))) { - --tw-bg-opacity: 1; - background-color: rgb(0 0 0 / var(--tw-bg-opacity)); -} - .prose-h3\:text-xs :is(:where(h3):not(:where([class~="not-prose"] *))) { font-size: 0.75rem; line-height: 1rem; } -.prose-h3\:text-2xl :is(:where(h3):not(:where([class~="not-prose"] *))) { - font-size: 1.5rem; - line-height: 2rem; -} - @media (min-width: 1024px) { .lg\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); @@ -1745,8 +1448,4 @@ select { .lg\:flex-row { flex-direction: row; } - - .lg\:gap-2 { - gap: 0.5rem; - } } diff --git a/pdlzbs/settings.py b/pdlzbs/settings.py index ad37841..b8cf555 100644 --- a/pdlzbs/settings.py +++ b/pdlzbs/settings.py @@ -133,4 +133,4 @@ MEDIA_ROOT = BASE_DIR / 'media' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -SUMMERNOTE_THEME = 'bs5' +# SUMMERNOTE_THEME = 'bs5' diff --git a/static/css/dist/styles.css b/static/css/dist/styles.css index 027ac93..a69f79a 100644 --- a/static/css/dist/styles.css +++ b/static/css/dist/styles.css @@ -1134,6 +1134,10 @@ select { margin-right: auto; } +.mb-0 { + margin-bottom: 0px; +} + .mt-\[40px\] { margin-top: 40px; } @@ -1146,6 +1150,10 @@ select { margin-left: -12px; } +.mb-4 { + margin-bottom: 1rem; +} + .block { display: block; } @@ -1158,6 +1166,10 @@ select { display: table; } +.grid { + display: grid; +} + .contents { display: contents; } @@ -1186,24 +1198,24 @@ select { min-height: 125px; } -.w-\[48px\] { - width: 48px; -} - .w-full { width: 100%; } +.w-\[48px\] { + width: 48px; +} + .min-w-\[145px\] { min-width: 145px; } -.basis-2\/3 { - flex-basis: 66.666667%; +.basis-3\/5 { + flex-basis: 60%; } -.basis-1\/3 { - flex-basis: 33.333333%; +.basis-2\/5 { + flex-basis: 40%; } .border-collapse { @@ -1218,6 +1230,10 @@ select { flex-direction: column; } +.place-items-center { + place-items: center; +} + .items-center { align-items: center; } @@ -1230,14 +1246,14 @@ select { justify-content: center; } -.justify-between { - justify-content: space-between; -} - .justify-around { justify-content: space-around; } +.gap-4 { + gap: 1rem; +} + .gap-6 { gap: 1.5rem; } @@ -1246,10 +1262,6 @@ select { gap: 0.75rem; } -.gap-4 { - gap: 1rem; -} - .border { border-width: 1px; } @@ -1258,11 +1270,25 @@ select { border-bottom-width: 1px; } +.border-dashed { + border-style: dashed; +} + .border-slate-400 { --tw-border-opacity: 1; border-color: rgb(148 163 184 / var(--tw-border-opacity)); } +.border-stone-500 { + --tw-border-opacity: 1; + border-color: rgb(120 113 108 / var(--tw-border-opacity)); +} + +.border-stone-400 { + --tw-border-opacity: 1; + border-color: rgb(168 162 158 / var(--tw-border-opacity)); +} + .bg-white { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -1273,19 +1299,9 @@ select { background-color: rgb(249 250 251 / var(--tw-bg-opacity)); } -.bg-slate-400 { - --tw-bg-opacity: 1; - background-color: rgb(148 163 184 / var(--tw-bg-opacity)); -} - -.bg-slate-900 { - --tw-bg-opacity: 1; - background-color: rgb(15 23 42 / var(--tw-bg-opacity)); -} - -.bg-slate-500 { - --tw-bg-opacity: 1; - background-color: rgb(100 116 139 / var(--tw-bg-opacity)); +.py-4 { + padding-top: 1rem; + padding-bottom: 1rem; } .pb-1 { @@ -1296,6 +1312,14 @@ select { padding-right: 50px; } +.pb-6 { + padding-bottom: 1.5rem; +} + +.pt-0 { + padding-top: 0px; +} + .text-center { text-align: center; } @@ -1304,6 +1328,16 @@ select { font-family: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif; } +.text-3xl { + font-size: 1.875rem; + line-height: 2.25rem; +} + +.text-xl { + font-size: 1.25rem; + line-height: 1.75rem; +} + .text-\[13px\] { font-size: 13px; } @@ -1317,6 +1351,10 @@ select { line-height: 1; } +.font-semibold { + font-weight: 600; +} + .font-bold { font-weight: 700; } @@ -1346,6 +1384,11 @@ select { color: rgb(255 255 255 / var(--tw-text-opacity)); } +.underline { + -webkit-text-decoration-line: underline; + text-decoration-line: underline; +} + .antialiased { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -1379,27 +1422,29 @@ select { display: block; } -.prose-h1\:font-extralight :is(:where(h1):not(:where([class~="not-prose"] *))) { - font-weight: 200; +.prose-h1\:mb-0 :is(:where(h1):not(:where([class~="not-prose"] *))) { + margin-bottom: 0px; } .prose-h1\:font-light :is(:where(h1):not(:where([class~="not-prose"] *))) { font-weight: 300; } -@media (min-width: 640px) { - .sm\:flex-row { - flex-direction: row; - } +.prose-h2\:my-0 :is(:where(h2):not(:where([class~="not-prose"] *))) { + margin-top: 0px; + margin-bottom: 0px; } -@media (min-width: 768px) { - .md\:flex-row { - flex-direction: row; - } +.prose-h3\:text-xs :is(:where(h3):not(:where([class~="not-prose"] *))) { + font-size: 0.75rem; + line-height: 1rem; } @media (min-width: 1024px) { + .lg\:grid-cols-2 { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + .lg\:flex-row { flex-direction: row; }