Bert Leunis pushed to branch release/3.0 at cms-community / hippo-plugin-content-blocks
Commits: 53ec8859 by Bert Leunis at 2016-12-15T13:42:22+01:00 HIPPLUG-1417 update provided dependencies version numbers - - - - - e747345b by Bert Leunis at 2016-12-15T13:43:02+01:00 HIPPLUG-1417 improved block header title & controls

 (cherry picked from commits 12fc0a533ec2df605abfcddf1b2449d76322fd29 ca1e240f11e9d581ced8f5185a5dc803b5c74684 e910689823c4d410fb76b1a205f31922ac72fdc0) - - - - - 269ac342 by Bert Leunis at 2016-12-15T13:46:04+01:00 HIPPLUG-1417 Reintegrate bugfix/HIPPLUG-1417 - - - - - 3 changed files: - pom.xml - src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html - src/main/resources/org/onehippo/forge/contentblocks/style.css Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ </scm> <properties> - <hippo.repository.version>4.0.2</hippo.repository.version> - <hippo.cms.version>4.0.2</hippo.cms.version> + <hippo.repository.version>4.0.4</hippo.repository.version> + <hippo.cms.version>4.0.4</hippo.cms.version> </properties> <repositories> ===================================== src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html ===================================== --- a/src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html +++ b/src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html @@ -59,15 +59,15 @@ <wicket:fragment wicket:id="edit-fragment"> <div class="hippo-editor-field"> + <div class="hippo-editor-field-subfield-controls" wicket:id="controls"> + <a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a> + <a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a> + <a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a> + </div> <div class="content-block-title"> <span wicket:id="itemTitle">[ item title ]</span> </div> <div class="hippo-editor-field-subfield contentpicker-blocks"> - <div class="hippo-editor-field-subfield-controls" wicket:id="controls"> - <a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a> - <a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a> - <a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a> - </div> <div wicket:id="item"></div> </div> </div> ===================================== src/main/resources/org/onehippo/forge/contentblocks/style.css ===================================== --- a/src/main/resources/org/onehippo/forge/contentblocks/style.css +++ b/src/main/resources/org/onehippo/forge/contentblocks/style.css @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2010-2016 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. @@ -14,10 +14,14 @@ * limitations under the License. */ -.hippo-editor-field-subfield:hover > .contentpicker-blocks > .hippo-editor-field-subfield-controls { +.hippo-editor-field:hover > .hippo-editor-field-subfield-controls { opacity: 1; } +.hippo-editor-field > .hippo-editor-field-subfield-controls { + padding: 4px; +} + .contentpicker-blocks div.hippo-diff-added { float: none; } @@ -95,11 +99,8 @@ } .content-block-title { - font-weight: bold; - font-size: small; - padding-top: 5px; - padding-left: 8px; - padding-bottom: 2px; + font-size: 16px; + padding-bottom: 8px; } /* Dialog style */ View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-content-blocks/compare/b34f67eaa461da46515281cf2240adb5536ced91...269ac3426ec9f7a0a745c23bbfb48e05ef333a6c
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn