Skip to content

Commit

Permalink
Merge pull request #489 from creative-commoners/pulls/4.0/space-out
Browse files Browse the repository at this point in the history
FIX Adjusting styles to fix some minor issues
  • Loading branch information
raissanorth committed Nov 1, 2018
2 parents b5beb91 + 01ada61 commit e455ed5
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion client/dist/styles/bundle.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 30 additions & 1 deletion client/src/components/ElementEditor/InlineEditForm.scss
@@ -1,10 +1,39 @@
.element-editor-editform {
margin-top: $spacer-xs;
@include make-row();
cursor: auto;

// For some reason the form is not considered a "row" when above a certain media breakpoint
// We need this for the "stacked" form style
@include media-breakpoint-up(lg) {
@include make-row()
}

// Counteract the margin that is added to the bottom of each form group
margin-bottom: -1rem;

// Force tinymce to have proper box-sizing
.mce-tinymce {
box-sizing: border-box;
}

// The form div itself receives some width styling that we prefer to be handled by
// field holder styling as below
&__form {
width: 100%;
}

.form-group {
margin-left: 0;
margin-right: 0;
}

// Specificity overrides for styles provided by admin.
// Designs mandate that we're going with a "stacked" style here which doesn't currently
// translate very well to higher width
& &__form {
& .form-group .form__field-holder {
flex: 1 0 100%;
max-width: 900px;
}
}
}
2 changes: 2 additions & 0 deletions src/Controllers/ElementalAreaController.php
Expand Up @@ -96,6 +96,8 @@ public function getElementForm($elementID)
$form->makeReadonly();
}

$form->addExtraClass('element-editor-editform__form');

return $form;
}

Expand Down

0 comments on commit e455ed5

Please sign in to comment.