Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits: 5fc92b30 by Bert Leunis at 2017-09-28T16:42:21+02:00 CMS-10839 field styling - - - - - 3427df93 by Bert Leunis at 2017-10-05T16:15:33+02:00 CMS-10839 narrow down the styling of checkbox and label to only this plugin - - - - - 4ecd5b0c by Jeroen Hoffman at 2017-10-19T21:33:08+02:00 CMS-10839 Merge branch 'master' into bugfix/CMS-10839 - - - - - 40ce3065 by Jeroen Hoffman at 2017-10-20T15:54:29+02:00 CMS-10839 Reintegrate branch 'bugfix/CMS-10839' to master - - - - - 2 changed files: - api/src/main/styling/styles/_editor.scss - editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html Changes: ===================================== api/src/main/styling/styles/_editor.scss ===================================== --- a/api/src/main/styling/styles/_editor.scss +++ b/api/src/main/styling/styles/_editor.scss @@ -114,6 +114,10 @@ width: auto; } + .hippo-editor-field-boolean > input[type="checkbox"] + label { + margin-left: 8px; + } + input[type="submit"] { width: auto; } ===================================== editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html ===================================== --- a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html +++ b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html @@ -1,5 +1,5 @@ <!-- - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-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. @@ -15,9 +15,11 @@ --> <html xmlns:wicket="http://wicket.apache.org/"> <wicket:panel> - <div class="hippo-editor-mixin" wicket:id="mixins"> + <div class="hippo-editor-field" wicket:id="mixins"> <h3 class="hippo-editor-field-title"><wicket:message key="mixins" /></h3> - <input type="checkbox" wicket:id="mixin"/><label wicket:id="label">[ mixin ]</label> + <div class="hippo-editor-field-boolean"> + <input type="checkbox" wicket:id="mixin"/><label wicket:id="label">[ mixin ]</label> + </div> </div> </wicket:panel> </html> View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074 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