Skip to content

Commit a6921dd

Browse files
Merge remote-tracking branch 'origin/release-1.2'
# Conflicts: # CHANGELOG.md # Patches/adjustContentModuleMarkupForLoginAs.patch # package.json
2 parents 0a43357 + f0bda74 commit a6921dd

File tree

6 files changed

+35
-13
lines changed

6 files changed

+35
-13
lines changed

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"branch": "release",
2+
"branches": ["release-*", "master"],
33
"analyzeCommits": {
44
"preset": "eslint",
55
"releaseRules": [

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@
4242

4343
* Update @unikka/loginas-api to version 1.1.0 ([1bd425d](https://github.com/unikka/login-as/commit/1bd425d9807debcec8e8b8a9f2f8bf56e7737ec5))
4444

45+
## [1.2.3](https://github.com/unikka/login-as/compare/v1.2.2...v1.2.3) (2021-03-09)
46+
47+
48+
### Build
49+
50+
* Adjust branches for semantic release ([8b79f47](https://github.com/unikka/login-as/commit/8b79f4763d4aae4d65e59c6478e1fe80bf204600))
51+
* Adjust regex for release branch ([bb30d5d](https://github.com/unikka/login-as/commit/bb30d5db36f67a278c55ff998fa1e04181d8568f))
52+
53+
### Fix
54+
55+
* Adjust user menu for larger content ([770905b](https://github.com/unikka/login-as/commit/770905b7829d4fcd7f6b9bdf572f7072977e7bb6))
56+
* Fix drop down alignment also for old content module ([1bfb1cc](https://github.com/unikka/login-as/commit/1bfb1cc3618b8780ecdb9bc1c681b0b09b6acad9))
57+
4558
## [1.2.2](https://github.com/unikka/login-as/compare/v1.2.1...v1.2.2) (2021-02-25)
4659

4760

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
diff --git a/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html b/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
2-
index 74d0957eb..49c8a382d 100644
31
--- a/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
42
+++ b/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
5-
@@ -1,5 +1,6 @@
3+
@@ -1,5 +1,7 @@
64
<!-- TODO: remove this from HTML as it should not be shown in preview mode for example, this causes 'flickering' -->
75
-<div id="neos-application" class="neos" role="application">
86
+<div id="neos-application" class="neos" role="application" data-csrf-Token="{f:security.csrfToken()}">
9-
+ <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
10-
<div id="neos-top-bar">
11-
<div id="neos-top-bar-right">
12-
<div id="neos-user-actions">
13-
@@ -8,4 +9,4 @@
14-
</div>
15-
</div>
16-
<f:render partial="Backend/Menu" arguments="{_all}" />
7+
+ <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
8+
+ <link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
9+
<div id="neos-top-bar">
10+
<div id="neos-top-bar-right">
11+
<div id="neos-user-actions">
12+
@@ -8,4 +10,4 @@
13+
</div>
14+
</div>
15+
<f:render partial="Backend/Menu" arguments="{_all}" />
1716
-</div>
1817
\ No newline at end of file
1918
+</div>

Resources/Private/Layouts/BackendModule.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{namespace neos=Neos\Neos\ViewHelpers}
22
<div class="neos-content neos-indented neos-fluid-container" data-csrf-Token="{f:security.csrfToken()}">
33
<script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
4+
<link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
45

56
<f:render section="subtitle" optional="1" />
67

@@ -18,6 +19,5 @@
1819
</f:if>
1920
</f:validation.results>
2021

21-
backend module
2222
<f:render section="content" />
2323
</div>

Resources/Private/Layouts/BackendSubModule.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<div class="neos-content neos-container-fluid" data-csrf-Token="{f:security.csrfToken()}">
22
<script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
3+
<link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
34

45
<f:render section="subtitle" optional="1" />
56

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.neos .neos-dropdown-menu {
2+
left: auto !important;
3+
min-width: 100% !important;
4+
}
5+
6+
/* Change right alingment for emberjs based content module */
7+
.neos-backend #neos-top-bar #neos-publish-menu .neos-dropdown-menu {
8+
right: initial;
9+
}

0 commit comments

Comments
 (0)