Merge pull request #368 from MDCox/v0.2.1

Clustering controls has uniform styling

Author: mdcox-sdm

app/scripts/alchemy/clustering/clustering.coffee

@@ -63,12 +63,12 @@ class alchemy.clustering
 alchemy.clusterControls =
     init: ()->
         changeClusterHTML = """
-                            <h4>Cluster By:</h4>
-                            <input class='form-control' id='cluster-key' placeholder="Cluster Key"></input>
+                            <input class='form-control form-inline' id='cluster-key' placeholder="Cluster Key"></input>
                             """
         d3.select("#clustering-container")
             .append("div")
             .attr("id", "cluster-key-container")
+            .attr('class', 'property form-inline form-group')
             .html(changeClusterHTML)
             .style("display", "none")
 

app/styles/_controls.scss

@@ -290,7 +290,19 @@
 
 #clustering {
     padding: 0.5em 1em;
+    cursor: pointer;
+    color: white;
+    border-bottom: thin dashed #E89619;
     #cluster_control_header, #cluster-key-container {
         padding: 10px 10px 0 10px;
     }
+    #cluster-key {
+        color: #333;
+        background-color: #000;
+        border-radius: 4px;
+        border: thin solid #333;
+        text-align: center;
+        display: inline-block;
+        width: 100%;
+    }
 }

site/app/styles/_landing.scss

@@ -231,7 +231,6 @@ hr{
 } 
 
 #nav-tabs{
-	height: 95px;
 	display: block;
 }