From d87cf6980a56b71ecd09b2b6809ae6a34f37ca9b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 27 Feb 2017 16:03:45 -0500
Subject: [PATCH] (css) Improve display of recurrence editor

---
 .../SchedulerUI/UIxRecurrenceEditor.wox       | 26 ++++++++-----------
 .../scss/components/checkbox/checkbox.scss    |  7 ++++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
index bd11a766e..10365674e 100644
--- a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
@@ -93,20 +93,16 @@
         <md-radio-button value="byday">
           <var:string label:value="The"/>
         </md-radio-button>
-        <md-input-container>
-          <md-select ng-model="editor.component.repeat.month.occurrence">
-            <var:foreach list="monthlyRepeatList" item="item">
-              <md-option var:value="valueForMonthlyRepeat"><var:string value="itemText"/></md-option>
-            </var:foreach>
-          </md-select>
-        </md-input-container>
-        <md-input-container>
-          <md-select ng-model="editor.component.repeat.month.day">
-            <var:foreach list="monthlyDayList" item="item">
-              <md-option var:value="valueForMonthlyDay"><var:string value="item"/></md-option>
-            </var:foreach>
-          </md-select>
-        </md-input-container>
+        <md-select ng-model="editor.component.repeat.month.occurrence">
+          <var:foreach list="monthlyRepeatList" item="item">
+            <md-option var:value="valueForMonthlyRepeat"><var:string value="itemText"/></md-option>
+          </var:foreach>
+        </md-select>
+        <md-select ng-model="editor.component.repeat.month.day">
+          <var:foreach list="monthlyDayList" item="item">
+            <md-option var:value="valueForMonthlyDay"><var:string value="item"/></md-option>
+          </var:foreach>
+        </md-select>
       </div>
     </md-radio-group>
   </div>
@@ -131,7 +127,7 @@
       </md-grid-list>
     </div>
     <div layout="row" layout-align="start center">
-      <md-checkbox ng-model="editor.component.repeat.year.byday">
+      <md-checkbox class="sg-checkbox--with-select" ng-model="editor.component.repeat.year.byday">
         <var:string label:value="The"/>
       </md-checkbox>
       <md-select ng-model="editor.component.repeat.month.occurrence">
diff --git a/UI/WebServerResources/scss/components/checkbox/checkbox.scss b/UI/WebServerResources/scss/components/checkbox/checkbox.scss
index 1ce46f616..1c0752236 100644
--- a/UI/WebServerResources/scss/components/checkbox/checkbox.scss
+++ b/UI/WebServerResources/scss/components/checkbox/checkbox.scss
@@ -7,6 +7,11 @@ md-sidenav md-checkbox {
     margin: 0;
 }
 
+// Checkbox in an inline form beside a select element
+.md-inline-form md-checkbox.sg-checkbox--with-select {
+  margin: 2.5*$baseline-grid $baseline-grid/2 3*$baseline-grid + 2 0;
+}
+
 // Checkbox for the sg-checkmark directive
 // ---------------------------------------
 .sg-checkmark {
@@ -16,4 +21,4 @@ md-sidenav md-checkbox {
   &.sg-checked md-icon {
     opacity: 1;
   }
-}
\ No newline at end of file
+}