Merge remote-tracking branch 'origin/release-1.2'

# Conflicts: # CHANGELOG.md # Patches/adjustContentModuleMarkupForLoginAs.patch # package.json
Unikka · Mar 9, 2021 · a6921dd · a6921dd
2 parents 0a43357 + f0bda74
commit a6921dd
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/.releaserc b/.releaserc
@@ -1,5 +1,5 @@
 {
-    "branch": "release",
+    "branches": ["release-*", "master"],
     "analyzeCommits": {
         "preset": "eslint",
         "releaseRules": [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,19 @@
 
 * Update @unikka/loginas-api to version 1.1.0 ([1bd425d](https://github.com/unikka/login-as/commit/1bd425d9807debcec8e8b8a9f2f8bf56e7737ec5))
 
+## [1.2.3](https://github.com/unikka/login-as/compare/v1.2.2...v1.2.3) (2021-03-09)
+
+
+### Build
+
+* Adjust branches for semantic release ([8b79f47](https://github.com/unikka/login-as/commit/8b79f4763d4aae4d65e59c6478e1fe80bf204600))
+* Adjust regex for release branch ([bb30d5d](https://github.com/unikka/login-as/commit/bb30d5db36f67a278c55ff998fa1e04181d8568f))
+
+### Fix
+
+* Adjust user menu for larger content ([770905b](https://github.com/unikka/login-as/commit/770905b7829d4fcd7f6b9bdf572f7072977e7bb6))
+* Fix drop down alignment also for old content module ([1bfb1cc](https://github.com/unikka/login-as/commit/1bfb1cc3618b8780ecdb9bc1c681b0b09b6acad9))
+
 ## [1.2.2](https://github.com/unikka/login-as/compare/v1.2.1...v1.2.2) (2021-02-25)
 
 

diff --git a/Patches/adjustContentModuleMarkupForLoginAs.patch b/Patches/adjustContentModuleMarkupForLoginAs.patch
@@ -1,19 +1,18 @@
-diff --git a/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html b/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
-index 74d0957eb..49c8a382d 100644
 --- a/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
 +++ b/Neos.Neos/Resources/Private/Templates/Backend/Content/Container.html
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,7 @@
  <!-- TODO: remove this from HTML as it should not be shown in preview mode for example, this causes 'flickering' -->
 -<div id="neos-application" class="neos" role="application">
 +<div id="neos-application" class="neos" role="application" data-csrf-Token="{f:security.csrfToken()}">
-+  <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
- 	<div id="neos-top-bar">
- 		<div id="neos-top-bar-right">
- 			<div id="neos-user-actions">
-@@ -8,4 +9,4 @@
- 		</div>
- 	</div>
- 	<f:render partial="Backend/Menu" arguments="{_all}" />
++       <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
++       <link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
+        <div id="neos-top-bar">
+                <div id="neos-top-bar-right">
+                        <div id="neos-user-actions">
+@@ -8,4 +10,4 @@
+                </div>
+        </div>
+        <f:render partial="Backend/Menu" arguments="{_all}" />
 -</div>
 \ No newline at end of file
 +</div>
diff --git a/Resources/Private/Layouts/BackendModule.html b/Resources/Private/Layouts/BackendModule.html
@@ -1,6 +1,7 @@
 {namespace neos=Neos\Neos\ViewHelpers}
 <div class="neos-content neos-indented neos-fluid-container" data-csrf-Token="{f:security.csrfToken()}">
   <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
+  <link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
 
   <f:render section="subtitle" optional="1" />
 
@@ -18,6 +19,5 @@
 		</f:if>
 	</f:validation.results>
 
-  backend module
 	<f:render section="content" />
 </div>
diff --git a/Resources/Private/Layouts/BackendSubModule.html b/Resources/Private/Layouts/BackendSubModule.html
@@ -1,5 +1,6 @@
 <div class="neos-content neos-container-fluid"  data-csrf-Token="{f:security.csrfToken()}">
   <script src="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Javascript/Main.js')}"></script>
+  <link rel="stylesheet" href="{f:uri.resource(package: 'Unikka.LoginAs', path: 'Stylesheets/Styles.css')}">
 
   <f:render section="subtitle" optional="1" />
 

diff --git a/Resources/Public/Stylesheets/Styles.css b/Resources/Public/Stylesheets/Styles.css
@@ -0,0 +1,9 @@
+.neos .neos-dropdown-menu {
+    left: auto !important;
+    min-width: 100% !important;
+}
+
+/* Change right alingment for emberjs based content module */
+.neos-backend #neos-top-bar #neos-publish-menu .neos-dropdown-menu {
+    right: initial;
+}