From 1eeb0c28409f541fbfe322d6f4bac264351ae917 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Tue, 29 Jul 2014 16:14:10 -0400
Subject: [PATCH] Fix accordion menu formatting

---
 server/documents/modules/accordion.html.eco             | 8 ++++----
 src/definitions/collections/form.less                   | 6 ++++++
 src/definitions/modules/accordion.less                  | 4 ++++
 src/themes/packages/default/modules/accordion.variables | 1 +
 src/themes/packages/default/modules/checkbox.variables  | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/server/documents/modules/accordion.html.eco b/server/documents/modules/accordion.html.eco
index 4d7a2dd45..d53c14d6f 100755
--- a/server/documents/modules/accordion.html.eco
+++ b/server/documents/modules/accordion.html.eco
@@ -254,8 +254,8 @@ themes      : ['default']
             <i class="dropdown icon"></i>
             Size
           </a>
-          <div class="active content menu">
-            <div class="ui form item">
+          <div class="active content">
+            <div class="ui form">
               <div class="grouped fields">
                 <div class="field">
                   <div class="ui radio checkbox">
@@ -290,8 +290,8 @@ themes      : ['default']
             <i class="dropdown icon"></i>
             Colors
           </a>
-          <div class="active content menu">
-            <div class="ui form item">
+          <div class="active content">
+            <div class="ui form">
               <div class="grouped fields">
                 <div class="field">
                   <div class="ui checkbox">
diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less
index 3907495b0..48b91369c 100755
--- a/src/definitions/collections/form.less
+++ b/src/definitions/collections/form.less
@@ -48,6 +48,9 @@
   clear: both;
   margin: @fieldMargin;
 }
+.ui.form .field:last-child {
+  margin-bottom: 0em;
+}
 
 /*--------------------
         Labels
@@ -486,6 +489,9 @@
 .ui.form .grouped.fields {
   margin: 0em 0em 1em;
 }
+.ui.form .grouped.fields:last-child {
+  margin-bottom: 0em;
+}
 .ui.form .grouped.fields .field {
   display: block;
   float: none;
diff --git a/src/definitions/modules/accordion.less b/src/definitions/modules/accordion.less
index 9d1cbfc4f..ecabbeffa 100755
--- a/src/definitions/modules/accordion.less
+++ b/src/definitions/modules/accordion.less
@@ -47,11 +47,15 @@
   margin: @contentMargin;
   padding: @contentPadding;
 }
+.ui.accordion .content:last-child {
+  padding-bottom: 0em;
+}
 
 /* Arrow */
 .ui.accordion .title .dropdown.icon,
 .ui.accordion .accordion .title .dropdown.icon {
   display: @iconDisplay;
+  opacity: @iconOpacity;
   width: @iconWidth;
   height: @iconHeight;
   margin: @iconMargin;
diff --git a/src/themes/packages/default/modules/accordion.variables b/src/themes/packages/default/modules/accordion.variables
index c8928bdf9..afebe0180 100644
--- a/src/themes/packages/default/modules/accordion.variables
+++ b/src/themes/packages/default/modules/accordion.variables
@@ -12,6 +12,7 @@
 @titleColor: @textColor;
 
 /* Icon */
+@iconOpacity: 0.75;
 @iconWidth: 1.25em;
 @iconHeight: 1em;
 @iconDisplay: inline-block;
diff --git a/src/themes/packages/default/modules/checkbox.variables b/src/themes/packages/default/modules/checkbox.variables
index ff66f64da..c5da7c374 100755
--- a/src/themes/packages/default/modules/checkbox.variables
+++ b/src/themes/packages/default/modules/checkbox.variables
@@ -2,7 +2,7 @@
             Checkbox
 *******************************/
 
-@checkboxColor: @textColor;
+@checkboxColor: @selectedTextColor;
 @fontSize: 1em;
 @checkboxLineHeight: 15px;