summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2017-08-08 13:07:09 -0700
committerwebchick2017-08-08 13:07:09 -0700
commit4ed19288b03e155a49c1fcba3a0683808fef47fa (patch)
tree706d791976c525fbe7e0136caeb3ec09beaab31c
parent87c8af27cd7bcbfc686e76528de9b966b91d1516 (diff)
Issue #2899395 by timmillwood, Wim Leers, jojototh, xjm, Bojhan, DyanneNova: Content Moderation form in displayed entity looks broken
-rw-r--r--core/modules/content_moderation/css/content_moderation.module.css31
-rw-r--r--core/modules/content_moderation/css/content_moderation.theme.css5
-rw-r--r--core/modules/content_moderation/src/EntityOperations.php1
3 files changed, 31 insertions, 6 deletions
diff --git a/core/modules/content_moderation/css/content_moderation.module.css b/core/modules/content_moderation/css/content_moderation.module.css
index 1f074fb..4c6a0c1 100644
--- a/core/modules/content_moderation/css/content_moderation.module.css
+++ b/core/modules/content_moderation/css/content_moderation.module.css
@@ -8,12 +8,35 @@ ul.entity-moderation-form {
display: flex;
-webkit-flex-wrap: wrap; /* Safari */
flex-wrap: wrap;
- -webkit-justify-content: space-around; /* Safari */
- justify-content: space-around;
- -webkit-align-items: flex-end; /* Safari */
- align-items: flex-end;
+ -webkit-align-items: flex-start; /* Safari */
+ align-items: flex-start;
+}
+
+ul.entity-moderation-form li {
+ margin-right: 2em;
+ display: table;
+}
+
+ul.entity-moderation-form li:last-child {
+ -webkit-align-self: flex-end; /* Safari */
+ align-self: flex-end;
+ margin-right: 0;
+}
+
+ul.entity-moderation-form .form-item {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+ul.entity-moderation-form .form-item label {
+ padding-bottom: 0.25em;
+ display: table;
}
ul.entity-moderation-form input[type=submit] {
margin-bottom: 1.2em;
}
+
+ul.entity-moderation-form .btn {
+ margin-bottom: 1.1em;
+}
diff --git a/core/modules/content_moderation/css/content_moderation.theme.css b/core/modules/content_moderation/css/content_moderation.theme.css
index 7941930..0003db3 100644
--- a/core/modules/content_moderation/css/content_moderation.theme.css
+++ b/core/modules/content_moderation/css/content_moderation.theme.css
@@ -3,5 +3,8 @@
* Theme styles for the content_moderation module.
*/
ul.entity-moderation-form {
- border-bottom: 1px solid gray;
+ border: 1px dashed #bbb;
+ margin: 2em 0em;
+ background: #fff;
+ padding-left: 1em;
}
diff --git a/core/modules/content_moderation/src/EntityOperations.php b/core/modules/content_moderation/src/EntityOperations.php
index 8ddbbe5..f726582 100644
--- a/core/modules/content_moderation/src/EntityOperations.php
+++ b/core/modules/content_moderation/src/EntityOperations.php
@@ -253,7 +253,6 @@ class EntityOperations implements ContainerInjectionInterface {
$component = $display->getComponent('content_moderation_control');
if ($component) {
$build['content_moderation_control'] = $this->formBuilder->getForm(EntityModerationForm::class, $entity);
- $build['content_moderation_control']['#weight'] = $component['weight'];
}
}