Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
cccd9a62 by Jasper Floor at 2017-09-22T14:33:11+02:00
CMS-10015 made update editor left column resizable
- - - - -
47a7417c by Jasper Floor at 2017-10-04T14:41:25+02:00
CMS-10015 Merge master changes in feature/CMS-10015
- - - - -
363894bd by Bert Leunis at 2017-10-09T15:18:20+02:00
CMS-10015 make the whole left column resizable
- - - - -
fd0a962f by Bert Leunis at 2017-10-16T11:41:42+02:00
CMS-10015 no height calc necessary for tree; no grow on button
- - - - -
4604053e by Bert Leunis at 2017-11-21T10:48:40+01:00
CMS-10015 Merge master changes in feature/CMS-10015
- - - - -
494da7f5 by Bert Leunis at 2017-11-21T12:00:25+01:00
CMS-10015 Hide vertical scroll bar in Edge
- - - - -
30c9e942 by Jeroen Hoffman at 2018-01-09T13:37:27+01:00
CMS-10015 Merge branch 'master' into feature/CMS-10015
- - - - -
d6d55253 by Jeroen Hoffman at 2018-01-16T10:52:54+01:00
CMS-10015 Merge branch 'master' into feature/CMS-10015
- - - - -
0dc9102c by Jeroen Hoffman at 2018-01-16T10:52:57+01:00
CMS-10015 Reintegrate branch 'feature/CMS-10015' into master
- - - - -
2 changed files:
- api/src/main/styling/styles/_admin-perspective.scss
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
Changes:
=====================================
api/src/main/styling/styles/_admin-perspective.scss
=====================================
--- a/api/src/main/styling/styles/_admin-perspective.scss
+++ b/api/src/main/styling/styles/_admin-perspective.scss
@@ -270,33 +270,50 @@
height: 100%;
width: 100%;
display: flex;
- flex-flow: column;
+ flex-flow: row;
overflow: hidden;
> * {
display: flex;
+ flex-flow: column;
}
.updater-left {
- min-width: 200px;
- max-width: 200px;
border-right: 1px solid $dark-gray;
+ overflow: auto;
+ resize: horizontal;
+ width: 200px;
+
+ .updater-tree {
+ border-top: 1px solid $dark-gray;
+
+ padding: 4px 0 0 0;
+ flex: 0;
+
+ > div.hippo-tree > div.wicket-tree {
+ .row {
+ padding-left: 5px;
+ }
+ .row-selected {
+ background: $primary;
+ }
+ }
+ }
}
- .updater-editor-top > .updater-left {
+ .updater-left-top {
display: flex;
justify-content: center;
align-items: center;
-
- border-bottom: 1px solid $dark-gray;
+ flex: 0 0 auto;
> input {
flex: 1 1 auto;
- margin: 0 8px;
+ margin: 6px 8px;
}
}
- .updater-editor-top-right {
+ .updater-right-top {
padding: 8px;
h2 {
@@ -304,25 +321,12 @@
}
}
- > .updater-editor-main {
- height: calc(100% - 32px);
-
- .updater-tree {
- overflow: auto;
- border-right: 1px solid $dark-gray;
- padding: 4px 0 0 0;
-
- > div.hippo-tree > div.wicket-tree {
- .row {
- padding-left: 5px;
- }
- .row-selected {
- background: $primary;
- }
- }
- }
-
+ > .updater-right {
+ width: 100%;
+
.updater-details {
+ height: calc(100% - 32px);
+
display: flex;
overflow-y: auto;
=====================================
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
=====================================
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ Copyright 2012-2017 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.
@@ -19,16 +19,16 @@
<html xmlns:wicket="http://wicket.apache.org/";>
<wicket:extend>
<div class="hippo-panel-plugin-body updater-editor-plugin">
- <div class="updater-editor-top">
- <form class="updater-left" wicket:id="new-form">
+ <div class="updater-left">
+ <form class="updater-left-top" wicket:id="new-form">
<input type="submit" class="btn btn-default btn-sm" value="New"
wicket:id="new-button"/>
</form>
- <div class="updater-editor-top-right">
+ <div class="updater-tree" wicket:id="updater-tree"/>
+ </div>
+ <div class="updater-right">
+ <div class="updater-right-top">
<h2 wicket:id="updater-title"></h2>
</div>
- </div>
- <div class="updater-editor-main">
- <div class="updater-left updater-tree" wicket:id="updater-tree"/>
<div class="updater-details" wicket:id="updater-editor"/>
</div>
</div>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/4f93842d3cc3a59cc45c07092b717ae494dadb29...0dc9102c0d69366a005ae15853cc0fa286f22011
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/4f93842d3cc3a59cc45c07092b717ae494dadb29...0dc9102c0d69366a005ae15853cc0fa286f22011
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
