Arthur Bogaart pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
87ee6bc4 by Arthur Bogaart at 2018-02-23T15:40:16+01:00
CHANNELMGR-1753 Fix missing horizontal scrollbar in desktop view
- - - - -
302b34a0 by Arthur Bogaart at 2018-02-23T15:41:21+01:00
CHANNELMGR-1753 Make right sidepanel close animation smoother
- - - - -
b0f14c18 by Arthur Bogaart at 2018-02-23T15:43:24+01:00
CHANNELMGR-1753 Hide horizontal scrollbar on close animation
During the close animation of the right sidepanel, a horizontal scrollbar is
shown in the md-content element of the channel. This is ugly and is now
hidden using CSS.
- - - - -
86f44e09 by Arthur Bogaart at 2018-02-23T15:44:59+01:00
CHANNELMGR-1753 Reintegrate bugfix/CHANNELMGR-1753
- - - - -
5 changed files:
- frontend-ng/src/app/channel/channel.controller.js
- frontend-ng/src/app/channel/channel.html
- + frontend-ng/src/app/channel/channel.scss
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
- frontend-ng/src/styles/_iframe.scss
Changes:
=====================================
frontend-ng/src/app/channel/channel.controller.js
=====================================
--- a/frontend-ng/src/app/channel/channel.controller.js
+++ b/frontend-ng/src/app/channel/channel.controller.js
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import './channel.scss';
+
class ChannelCtrl {
constructor(
$log,
=====================================
frontend-ng/src/app/channel/channel.html
=====================================
--- a/frontend-ng/src/app/channel/channel.html
+++ b/frontend-ng/src/app/channel/channel.html
@@ -67,7 +67,8 @@
</md-progress-linear>
</md-toolbar>
- <md-content layout="row"
+ <md-content class="channel-content"
+ layout="row"
flex>
<left-side-panel layout="row"
is-configuration-locked="channelCtrl.isConfigurationLocked()"
=====================================
frontend-ng/src/app/channel/channel.scss
=====================================
--- /dev/null
+++ b/frontend-ng/src/app/channel/channel.scss
@@ -0,0 +1,18 @@
+// Copyright 2018 Hippo B.V. (http://www.onehippo.com)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+.channel-content {
+ // hide horizontal scrollbar that appears during the close animation of the
right sidepanel
+ overflow-x: hidden;
+}
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
@@ -86,10 +86,11 @@ class RightSidePanelCtrl {
}
_closePanel() {
+ this.$element.removeClass('sidepanel-open');
+ this.$element.css('max-width', '0px');
+
this.SidePanelService.close('right')
.finally(() => {
- this.$element.removeClass('sidepanel-open');
- this.$element.css('max-width', '0px');
this.setFullWidth(false);
});
}
=====================================
frontend-ng/src/styles/_iframe.scss
=====================================
--- a/frontend-ng/src/styles/_iframe.scss
+++ b/frontend-ng/src/styles/_iframe.scss
@@ -29,9 +29,9 @@ hippo-iframe {
background-color: $canvas-bgcolor;
- // ensure a horizontal scrollbar in Safari for constrained viewport widths
+ // ensure a horizontal scrollbar for constrained viewport widths
height: 100%;
- overflow: hidden;
+ overflow-y: hidden;
user-select: none;
&.hippo-dragging {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/78f7cfdbff435c26127a12c8370ac8136512c9e2...86f44e097a447eb81ae5f2a15b0cc1cb002cdb94
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/78f7cfdbff435c26127a12c8370ac8136512c9e2...86f44e097a447eb81ae5f2a15b0cc1cb002cdb94
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
