...

4 files changed, 4 insertions, 2 deletions

diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/theme_builder/components/StyleRuleEditor.cpp
index d4556825..dcb33184 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/theme_builder/components/StyleRuleEditor.cpp
@@ -28,7 +28,7 @@ StyleRuleEditor::StyleRuleEditor() {
   main_layout_.AddChild(&body_layout_);
   body_layout_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
   body_layout_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Start);
-  body_layout_.SetMargin({20, 0, 0, 0});
+  body_layout_.SetMargin({10, 0, 0, 0});
 
   remove_button_.ClickEvent()->AddSpyOnlyHandler(
       [this] { remove_event_.Raise(nullptr); });
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp
index 89ab4efb..8cf5af6d 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/theme_builder/components/StyleRuleSetEditor.cpp
@@ -19,6 +19,7 @@ StyleRuleSetEditor::StyleRuleSetEditor() {
   container_.AddChild(&add_button_);
 
   rules_layout_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
+  rules_layout_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Stretch);
 
   add_button_.GetStyleRuleSet()->SetParent(
       ui::ThemeManager::GetInstance()->GetResourceStyleRuleSet(
diff --git a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp b/src/theme_builder/components/conditions/CompoundConditionEditor.cpp
index 1fff17cc..1e149789 100644
--- a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp
+++ b/src/theme_builder/components/conditions/CompoundConditionEditor.cpp
@@ -39,7 +39,7 @@ CompoundConditionEditor::CompoundConditionEditor() {
   SetLabel(u"Compound Condition");
 
   GetContainer()->AddChild(&children_container_);
-  children_container_.SetMargin({20, 0, 0, 0});
+  children_container_.SetMargin({10, 0, 0, 0});
   children_container_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
   children_container_.SetItemCrossAlign(
       ui::controls::FlexCrossAlignment::Start);
diff --git a/src/theme_builder/components/conditions/ConditionEditor.cpp b/src/theme_builder/components/conditions/ConditionEditor.cpp
index a8afa7a7..0f842fa8 100644
--- a/src/theme_builder/components/conditions/ConditionEditor.cpp
+++ b/src/theme_builder/components/conditions/ConditionEditor.cpp
@@ -14,6 +14,7 @@ ConditionEditor::ConditionEditor() {
   border_.SetBackgroundBrush(CreateRandomEditorBackgroundBrush());
 
   container_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
+  container_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Start);
   container_.AddChild(&head_container_);
 
   head_container_.SetFlexDirection(ui::controls::FlexDirection::Horizontal);