8000 chore: Merge back release/4.1.x by fsbraun · Pull Request #7899 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

chore: Merge back release/4.1.x #7899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 63 commits into from
May 1, 2024
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2e31793
Merge pull request #7617 from fsbraun/develop-4
fsbraun Aug 7, 2023
318d417
Fix: modal.scss dark-mode compatibilitiy
fsbraun Aug 8, 2023
5232220
Add: Build all assets as part of the frontend test
fsbraun Aug 8, 2023
94cc9b0
fix: Better action feedback
fsbraun Aug 8, 2023
4c7939e
Merge pull request #7621 from fsbraun/fix/dart-sass
fsbraun Aug 8, 2023
4ab1f58
fix: Update _modal.scss
fsbraun Aug 8, 2023
fcc2f7a
fix: Remove publish/draft reference from grouper admin message
fsbraun Aug 8, 2023
e703659
Merge pull request #7622 from fsbraun/fix/grouper-message
fsbraun Aug 8, 2023
33fbdb1
fix ruff
fsbraun Aug 8, 2023
d79eddc
Add Django 4.2 support to release notes
fsbraun Aug 8, 2023
369f776
Fix transifex-pull-strings
fsbraun Aug 9, 2023
06ecf3a
fix: Update transifex source file (#7629)
fsbraun Aug 22, 2023
ac74c21
Fix: Open new plugin window in language of toolbar not of page (#7632)
fsbraun Aug 23, 2023
33f93d6
Fix: Broken page actions menu if CMS_PERMISSIONS is set
fsbraun Aug 24, 2023
d871d9f
Build: release 4.1.0rc4 (#7637)
fsbraun Aug 25, 2023
58ed512
fix: en locale in `release/4.1.x` (#7638)
fsbraun Aug 25, 2023
b3edda3
fix: en locale typo (#7639)
fsbraun Aug 25, 2023
121acf1
Merge branch 'develop-4' into release/4.1.x
fsbraun Aug 30, 2023
807a87b
fix: Remove `can_publish` permission from django CMS 4 core (#7635)
fsbraun Oct 16, 2023
8b323e7
Merge pull request #7718 from django-cms/develop-4
fsbraun Dec 11, 2023
5e9a71b
ci: Merge back 4.1.0.rc5 build into release/4.1.x (#7720)
fsbraun Dec 12, 2023
118f79f
Update setup.cfg
fsbraun Dec 12, 2023
3411b98
Remove py3.8 from setup.cfg
fsbraun Dec 12, 2023
737e86e
feat: add v4 docs to main branch (#7722)
fsbraun Dec 21, 2023
5c5359f
Update docs for frontend testing (#7726)
protoroto Dec 21, 2023
bb8a7ef
fix: Update make-release script to evaluate git diff-index exit codes
fsbraun Dec 22, 2023
b98b051
Update make-release to allow for empty messages commit
fsbraun Dec 22, 2023
e88032b
chore: Merge `release/build` into `release/4.1.x` (#7729)
fsbraun Dec 27, 2023
959200e
Apply suggestions from code review
fsbraun Dec 31, 2023
490dffa
fix: Incomplete command to create a virtual env in docs (#7735)
fsbraun Jan 4, 2024
cb0cff1
docs: Remove reference to rc5 from 01-install.rst
fsbraun Jan 4, 2024
01dc649
fix #7826
jrief Feb 28, 2024
6da9de8
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 7, 2024
ee2f469
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 18, 2024
1854ba4
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 19, 2024
6b78c89
Merge branch 'release/4.1.x' into develop-4
fsbraun Apr 19, 2024
566cbf4
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 19, 2024
513318c
Fix merge errors
fsbraun Apr 19, 2024
95e9afb
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 20, 2024
7f1ec98
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 23, 2024
6771f8b
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 23, 2024
f5409b8
Merge pull request #7886 from fsbraun/develop-4
fsbraun Apr 23, 2024
bb31ba9
feat: send post request if toolbar button has `cms-form-post-method` …
fsbraun Apr 24, 2024
358baf8
Fix eslint
fsbraun Apr 24, 2024
a999820
Merge pull request #7890 from fsbraun/fix/toolbar-post-button
fsbraun Apr 24, 2024
1d4f072
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 26, 2024
a4c6ccb
fix: structure board on the right for ltr
fsbraun Apr 26, 2024
4fd8210
Merge pull request #7891 from fsbraun/fix/rtl-bugs
fsbraun Apr 26, 2024
ccb2e8b
Fix: Placeholders must not block deletion of their source objects
fsbraun Apr 26, 2024
72459b0
Add some explanation
fsbraun Apr 26, 2024
fce9e6c
Merge pull request #7893 from fsbraun/fix/placeholder-deletion-bug
fsbraun Apr 26, 2024
27edafd
[4.1.1 release process] Building locales
Apr 26, 2024
50cbd71
[4.1.1 release process] Bumped version to 4.1.1
Apr 26, 2024
bf4177f
[4.1.1 release process] compilemessages
Apr 26, 2024
158f989
[4.1.1 release process] compiling new static files
Apr 26, 2024
2ff0855
[4.1.1 release process] updating latest docs
Apr 26, 2024
80fc1f0
Update CHANGELOG.rst
fsbraun Apr 27, 2024
a62d1e1 < 8000 div class="text-emphasized css-truncate css-truncate-target"> Update 4.1.1.rst
fsbraun Apr 27, 2024
1d82698
Update 4.1.1.rst
fsbraun Apr 27, 2024
245e23d
Update 4.1.1.rst
fsbraun Apr 27, 2024
6fb1416
Update CHANGELOG.rst
fsbraun Apr 30, 2024
fe795fb
Merge pull request #7894 from django-cms/release/build
fsbraun Apr 30, 2024
1050c4f
Merge branch 'develop-4' into release/4.1.x
fsbraun May 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: modal.scss dark-mode compatibilitiy
  • Loading branch information
fsbraun committed Aug 8, 2023
commit 318d417a41ab971e7bbe1ae4ffbab9eff8c1ad57
14 changes: 8 additions & 6 deletions cms/static/cms/sass/components/_modal.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//##############################################################################
// MODAL

@use "sass:math";

// Editing plugins in frontend
.cms-modal {
display: none;
Expand Down Expand Up @@ -151,7 +153,7 @@
display: block;
position: absolute;
top: 50%;
margin-top: -$modal-header-button-area-size / 2;
margin-top: math.div(-$modal-header-button-area-size, 2);
right: $padding-normal;
color: $gray-light;
text-align: center;
Expand All @@ -160,7 +162,7 @@
cursor: pointer;
&:before {
position: relative;
top: ($modal-header-button-area-size - $icon-size) / 2;
top: math.div($modal-header-button-area-size - $icon-size, 2);
}
&:hover {
color: $color-primary;
Expand Down Expand Up @@ -223,7 +225,7 @@
a {
color: $color-primary;
&:hover {
color: darken($color-primary, 20%);
color: darken($color-primary-fallback, 20%);
}
&:after {
content: "/";
Expand All @@ -250,7 +252,7 @@
padding: 0 $modal-resize-size 0 $padding-normal;
}
.cms-modal-item-buttons {
$margin: ($toolbar-height - $toolbar-button-height) / 2;
$margin: math.div($toolbar-height - $toolbar-button-height, 2);
@extend .cms-toolbar-item-buttons;
float: right;
margin-left: $margin;
Expand All @@ -266,10 +268,10 @@
// alter footer when html markup is loaded
.cms-modal-markup {
.cms-modal-foot {
height: $modal-footer-height / 2;
height: math.div($modal-footer-height, 2);
}
.cms-modal-body {
bottom: $modal-footer-height / 2;
bottom: math.div($modal-footer-height, 2);
}
}

Expand Down
0