Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-970 at
cms-community / hippo-addon-channel-manager
Commits:
b6ff77f9 by Mark at 2016-11-07T14:49:58+01:00
CHANNELMGR-970 fix styling based on Carolien feedback
- - - - -
52173b24 by Mark at 2016-11-07T14:52:13+01:00
CHANNELMGR-970 remove errors if values is empty
- - - - -
4 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
- frontend-ng/src/styles/_forms.scss
- frontend-ng/src/styles/_variables.scss
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -26,7 +26,7 @@ export class ChannelFieldsCtrl {
}
getFieldAsArray(fieldId) {
- const field = this.fieldValues[fieldId];
+ const field = this.fieldValues[fieldId] || [];
return angular.isArray(field) ? field : [field];
}
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=====================================
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div ng-repeat="fieldType in ::$ctrl.fieldTypes"
+<div class="field-wrapper"
+ ng-repeat="fieldType in ::$ctrl.fieldTypes"
ng-class="{
'form-field-focused': $ctrl.hasFocusedField(fieldType),
'form-field-compound': fieldType.type == 'COMPOUND'
=====================================
frontend-ng/src/styles/_forms.scss
=====================================
--- a/frontend-ng/src/styles/_forms.scss
+++ b/frontend-ng/src/styles/_forms.scss
@@ -28,6 +28,10 @@
}
}
+.field-wrapper {
+ padding: $form-padding;
+}
+
form {
&> channel-fields {
&> .form-field-compound {
@@ -36,6 +40,13 @@ form {
}
}
+.form-field-compound {
+ padding: 0 8px;
+ h5 {
+ margin-left: -6px;
+ }
+}
+
.form-field-focused {
&.form-field-compound {
border-color: $blue-500;
@@ -52,7 +63,7 @@ form {
channel-fields {
channel-fields {
md-input-container {
- margin-left: 4px;
+ margin-left: 6px;
}
}
}
\ No newline at end of file
=====================================
frontend-ng/src/styles/_variables.scss
=====================================
--- a/frontend-ng/src/styles/_variables.scss
+++ b/frontend-ng/src/styles/_variables.scss
@@ -127,6 +127,9 @@ $select-invalid-color: #f70029;
// Toolbar
$toolbar-height: 40px;
+// Forms
+$form-padding: 0 16px;
+
// Layout breakpoints
$layout-breakpoint-xs: 600px !default;
$layout-breakpoint-sm: 960px !default;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/ede8910a68fc0c90e44897b39a451a30cb95a58b...52173b2452aee28d4e9e0aeebea02fc36791e1cf
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
