From 11b40c58f1d7300acebe8047bb2fdd4fd7ad7d6e Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 11:40:33 -0700
Subject: [PATCH 1/6] add correct fonts

---
 site/documentation/index.html | 2 +-
 site/examples/index.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/documentation/index.html b/site/documentation/index.html
index 163259d..39d8067 100644
--- a/site/documentation/index.html
+++ b/site/documentation/index.html
@@ -14,7 +14,7 @@
   <link rel="stylesheet" href="../css/examples.css"/>
 
   <!-- Brick Fonts -->
-  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/EB+Garamond:400,400i/Open+Sans:400,700">
+  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/Clear+Sans:200,300,400,400i,500,500i,700,700i">
 
 </head>
 
diff --git a/site/examples/index.html b/site/examples/index.html
index 9297390..e0c17df 100644
--- a/site/examples/index.html
+++ b/site/examples/index.html
@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="../css/examples.css"/>
 
   <!-- Brick Fonts -->
-  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/EB+Garamond:400,400i/Open+Sans:400,700">
+  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/Clear+Sans:200,300,400,400i,500,500i,700,700i">
 
   <!-- Dimple and D3 -->
   <script src="http://d3js.org/d3.v3.min.js"></script>

From 03cd0c1ba143566c2b058fddff666ed3a65c71c4 Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 14:31:11 -0700
Subject: [PATCH 2/6] make sidebar not fixed

---
 site/css/style.css            | 57 +++++++++++++++++++++--------------
 site/documentation/index.html |  4 +++
 site/examples/index.html      |  4 +++
 site/scss/base/_buttons.scss  |  5 ++-
 site/scss/style.scss          | 11 ++++---
 5 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/site/css/style.css b/site/css/style.css
index b4cfd5f..7b2a5db 100644
--- a/site/css/style.css
+++ b/site/css/style.css
@@ -1868,6 +1868,7 @@ pre .tex .formula {
   padding: 1em;
   background-color: #1f85c4;
   color: #ecf0f3;
+  border: none;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   -ms-border-radius: 3px;
@@ -1878,44 +1879,48 @@ pre .tex .formula {
   font-size: 0.75em;
   font-weight: 300;
   cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
   -webkit-transition: background-color 75ms linear, color 75ms linear;
   -moz-transition: background-color 75ms linear, color 75ms linear;
   -o-transition: background-color 75ms linear, color 75ms linear;
   transition: background-color 75ms linear, color 75ms linear;
 }
-/* line 14, ../scss/base/_buttons.scss */
-.btn:hover {
+/* line 16, ../scss/base/_buttons.scss */
+.btn:hover, .btn:focus {
   background-color: #379fdf;
   color: white;
+  outline: none;
 }
-/* line 18, ../scss/base/_buttons.scss */
+/* line 21, ../scss/base/_buttons.scss */
 .btn.outline {
   background: transparent;
   color: #1f85c4;
   border: 1px solid #1f85c4;
 }
-/* line 22, ../scss/base/_buttons.scss */
+/* line 25, ../scss/base/_buttons.scss */
 .btn.outline:hover {
   background-color: #379fdf;
   color: white;
   border: 1px solid #379fdf;
 }
-/* line 28, ../scss/base/_buttons.scss */
+/* line 31, ../scss/base/_buttons.scss */
 .btn.dark-blue {
   background: #245070;
   color: #dde3e8;
 }
-/* line 31, ../scss/base/_buttons.scss */
+/* line 34, ../scss/base/_buttons.scss */
 .btn.dark-blue:hover {
   background-color: #306c97;
   color: #ecf0f3;
 }
-/* line 36, ../scss/base/_buttons.scss */
+/* line 39, ../scss/base/_buttons.scss */
 .btn.white {
   background: #fafbfe;
   color: #245070;
 }
-/* line 39, ../scss/base/_buttons.scss */
+/* line 42, ../scss/base/_buttons.scss */
 .btn.white:hover {
   background-color: white;
   color: #1f85c4;
@@ -2031,20 +2036,21 @@ pre .tex .formula {
 
 /* line 94, ../scss/style.scss */
 .sidebar {
-  position: fixed;
-  height: 100vh;
+  position: absolute;
   overflow: auto;
+  background-color: #fafbfe;
+  z-index: 2;
 }
-/* line 100, ../scss/style.scss */
+/* line 99, ../scss/style.scss */
 .sidebar li {
   margin-bottom: 1rem;
   padding: .25rem 0;
 }
-/* line 104, ../scss/style.scss */
+/* line 103, ../scss/style.scss */
 .sidebar a {
   width: 100%;
 }
-/* line 106, ../scss/style.scss */
+/* line 105, ../scss/style.scss */
 .sidebar a img {
   float: left;
   height: 3rem;
@@ -2065,13 +2071,13 @@ pre .tex .formula {
   -o-transition: all 200ms linear;
   transition: all 200ms linear;
 }
-/* line 118, ../scss/style.scss */
+/* line 117, ../scss/style.scss */
 .sidebar a:hover img {
   -webkit-box-shadow: 0 0 0 4px #dde3e8;
   -moz-box-shadow: 0 0 0 4px #dde3e8;
   box-shadow: 0 0 0 4px #dde3e8;
 }
-/* line 123, ../scss/style.scss */
+/* line 122, ../scss/style.scss */
 .sidebar span {
   display: inline-block;
   line-height: 3rem;
@@ -2083,14 +2089,19 @@ pre .tex .formula {
     position: relative;
     height: auto;
   }
-  /* line 133, ../scss/style.scss */
+  /* line 132, ../scss/style.scss */
   .sidebar li {
     display: inline-block;
     padding-right: 1rem;
   }
 }
 
-/* line 140, ../scss/style.scss */
+/* line 138, ../scss/style.scss */
+.scroll-to-top {
+  position: fixed;
+}
+
+/* line 143, ../scss/style.scss */
 .chart {
   position: absolute;
   top: 0;
@@ -2101,7 +2112,7 @@ pre .tex .formula {
   padding-left: 1rem;
 }
 
-/* line 150, ../scss/style.scss */
+/* line 153, ../scss/style.scss */
 .chart-icon {
   display: inline-block;
   margin-bottom: 1rem;
@@ -2121,11 +2132,11 @@ pre .tex .formula {
   transition: all 200ms linear;
   border: 1px solid #dde3e8;
 }
-/* line 162, ../scss/style.scss */
+/* line 165, ../scss/style.scss */
 .chart-icon:hover {
   background-color: #fafbfe;
 }
-/* line 165, ../scss/style.scss */
+/* line 168, ../scss/style.scss */
 .chart-icon:before {
   content: "";
   position: absolute;
@@ -2147,19 +2158,19 @@ pre .tex .formula {
   -o-transition: all 200ms linear;
   transition: all 200ms linear;
 }
-/* line 178, ../scss/style.scss */
+/* line 181, ../scss/style.scss */
 .chart-icon:hover:before {
   -webkit-box-shadow: 0 0 0 12px #dde3e8;
   -moz-box-shadow: 0 0 0 12px #dde3e8;
   box-shadow: 0 0 0 12px #dde3e8;
 }
-/* line 182, ../scss/style.scss */
+/* line 185, ../scss/style.scss */
 .chart-icon img {
   width: 100%;
   height: auto;
 }
 
-/* line 188, ../scss/style.scss */
+/* line 191, ../scss/style.scss */
 .footer {
   position: relative;
   z-index: 5;
diff --git a/site/documentation/index.html b/site/documentation/index.html
index 39d8067..e3c0979 100644
--- a/site/documentation/index.html
+++ b/site/documentation/index.html
@@ -110,6 +110,10 @@
         </ul>
       </aside>
 
+      <div class="scroll-to-top">
+        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+      </div>
+
       <!-- Views -->
       <main class="column-18 pre-2 tablet-column-24 right">
         <div class="white-panel padded">
diff --git a/site/examples/index.html b/site/examples/index.html
index e0c17df..e3548c2 100644
--- a/site/examples/index.html
+++ b/site/examples/index.html
@@ -89,6 +89,10 @@
         </ul>
       </aside>
 
+      <div class="scroll-to-top">
+        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+      </div>
+
       <!-- Views -->
       <main class="column-18 pre-2 tablet-column-24 right">
         <div ng-view></div>
diff --git a/site/scss/base/_buttons.scss b/site/scss/base/_buttons.scss
index 418b3a3..8a888e4 100644
--- a/site/scss/base/_buttons.scss
+++ b/site/scss/base/_buttons.scss
@@ -4,16 +4,19 @@
   padding: 1em;
   background-color: $blue;
   color: $lighter-gray;
+  border: none;
   @include border-radius(3px);
   text-decoration: none;
   font-family: $source;
   font-size: 0.75em;
   font-weight: 300;
   cursor: pointer;
+  @include user-select(none);
   @include transition(background-color 75ms linear, color 75ms linear);
-  &:hover {
+  &:hover, &:focus {
     background-color: lighten($blue, 10%);
     color: $white;
+    outline: none;
   }
   &.outline {
     background: transparent;
diff --git a/site/scss/style.scss b/site/scss/style.scss
index 5aad916..0e2947e 100644
--- a/site/scss/style.scss
+++ b/site/scss/style.scss
@@ -92,11 +92,10 @@
 }
 
 .sidebar {
-  position: fixed;
-  height: 100vh;
+  position: absolute;
   overflow: auto;
-
-
+  background-color: $off-white;
+  z-index: 2;
   li {
     margin-bottom: 1rem;
     padding: .25rem 0;
@@ -136,6 +135,10 @@
     }
   }
 }
+.scroll-to-top {
+  position: fixed;
+
+}
 
 .chart {
   position: absolute;

From ec51171685cdaf3a2a99d74bb22dc48ba3c152d9 Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 14:31:24 -0700
Subject: [PATCH 3/6] fix a couple other css issues on site

---
 site/css/examples.css   | 12 ++++++++++++
 site/css/style.css      | 20 +++++++++++++-------
 site/scss/examples.scss |  9 +++++++++
 site/scss/style.scss    |  4 +++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/site/css/examples.css b/site/css/examples.css
index 0c4dcd4..d67204a 100644
--- a/site/css/examples.css
+++ b/site/css/examples.css
@@ -151,3 +151,15 @@
     float: left;
   }
 }
+
+@media screen and (max-width: 480px) {
+  /* line 54, ../scss/examples.scss */
+  .container {
+    padding: 0 0;
+  }
+
+  /* line 57, ../scss/examples.scss */
+  .white-panel.padded {
+    padding: 2rem 1rem;
+  }
+}
diff --git a/site/css/style.css b/site/css/style.css
index 7b2a5db..129c4a5 100644
--- a/site/css/style.css
+++ b/site/css/style.css
@@ -2100,8 +2100,14 @@ pre .tex .formula {
 .scroll-to-top {
   position: fixed;
 }
+@media screen and (max-width: 960px) {
+  /* line 138, ../scss/style.scss */
+  .scroll-to-top {
+    display: none;
+  }
+}
 
-/* line 143, ../scss/style.scss */
+/* line 145, ../scss/style.scss */
 .chart {
   position: absolute;
   top: 0;
@@ -2112,7 +2118,7 @@ pre .tex .formula {
   padding-left: 1rem;
 }
 
-/* line 153, ../scss/style.scss */
+/* line 155, ../scss/style.scss */
 .chart-icon {
   display: inline-block;
   margin-bottom: 1rem;
@@ -2132,11 +2138,11 @@ pre .tex .formula {
   transition: all 200ms linear;
   border: 1px solid #dde3e8;
 }
-/* line 165, ../scss/style.scss */
+/* line 167, ../scss/style.scss */
 .chart-icon:hover {
   background-color: #fafbfe;
 }
-/* line 168, ../scss/style.scss */
+/* line 170, ../scss/style.scss */
 .chart-icon:before {
   content: "";
   position: absolute;
@@ -2158,19 +2164,19 @@ pre .tex .formula {
   -o-transition: all 200ms linear;
   transition: all 200ms linear;
 }
-/* line 181, ../scss/style.scss */
+/* line 183, ../scss/style.scss */
 .chart-icon:hover:before {
   -webkit-box-shadow: 0 0 0 12px #dde3e8;
   -moz-box-shadow: 0 0 0 12px #dde3e8;
   box-shadow: 0 0 0 12px #dde3e8;
 }
-/* line 185, ../scss/style.scss */
+/* line 187, ../scss/style.scss */
 .chart-icon img {
   width: 100%;
   height: auto;
 }
 
-/* line 191, ../scss/style.scss */
+/* line 193, ../scss/style.scss */
 .footer {
   position: relative;
   z-index: 5;
diff --git a/site/scss/examples.scss b/site/scss/examples.scss
index 30f0629..0be6065 100644
--- a/site/scss/examples.scss
+++ b/site/scss/examples.scss
@@ -48,4 +48,13 @@ h2 {
     margin-bottom: 1.5rem;
     float: left;
   }
+}
+
+@include respond-to($phone){
+  .container {
+    padding: 0 0;
+  }
+  .white-panel.padded {
+    padding: 2rem 1rem;
+  }
 }
\ No newline at end of file
diff --git a/site/scss/style.scss b/site/scss/style.scss
index 0e2947e..b0b3bf1 100644
--- a/site/scss/style.scss
+++ b/site/scss/style.scss
@@ -137,7 +137,9 @@
 }
 .scroll-to-top {
   position: fixed;
-
+  @include respond-to($tablet-mid){
+    display: none;
+  }
 }
 
 .chart {

From a942daecf044015de52ea39678f519ccf3e09697 Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 14:51:28 -0700
Subject: [PATCH 4/6] update readme with fixed scatter plots

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9ffaad2..0e07906 100644
--- a/README.md
+++ b/README.md
@@ -156,11 +156,11 @@ Assuming you set that on your scope as `$scope.scatterData`, you can use the fol
 <graph data="scatterData" width="100%" height="600px">
   <x field="Height" type="Measure"></x>
   <y field="Weight" type="Measure"></y>
-  <scatter-plot series="Height"></scatter-plot>
+  <scatter-plot field="Weight" series="Height" label="Group A"></scatter-plot>
 </graph>
 ```
 
-* Note: right now if your data set has two heights which are the same, it will average the two weights together. This comes from dimple, but we'd like to change that default behavior, see [this issue](https://github.com/esripdx/angular-dimple/issues/15).*
+* Note: the `label` attribute will make all the points the same color and title the group with that label in the legend if you have one.*
 
 ## Contributing
 

From efe2cdecbbeb408bc3031b5db97d63670bdb9a36 Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 15:09:39 -0700
Subject: [PATCH 5/6] fix fonts in correct layout file

---
 documentation/layout.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/documentation/layout.html b/documentation/layout.html
index c9e6f13..85b7aa0 100644
--- a/documentation/layout.html
+++ b/documentation/layout.html
@@ -14,7 +14,7 @@
   <link rel="stylesheet" href="../css/examples.css"/>
 
   <!-- Brick Fonts -->
-  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/EB+Garamond:400,400i/Open+Sans:400,700">
+  <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code+Pro:200,300/Clear+Sans:200,300,400,400i,500,500i,700,700i">
 
 </head>
 
@@ -110,6 +110,10 @@
         </ul>
       </aside>
 
+      <div class="scroll-to-top">
+        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+      </div>
+
       <!-- Views -->
       <main class="column-18 pre-2 tablet-column-24 right">
         <div class="white-panel padded">

From 2668995ae3d7a43d74389319b14e1e825c92b3ee Mon Sep 17 00:00:00 2001
From: Paul C Pederson <ppederson@esri.com>
Date: Fri, 30 May 2014 15:14:11 -0700
Subject: [PATCH 6/6] outline buttons

---
 documentation/layout.html     | 2 +-
 site/documentation/index.html | 2 +-
 site/examples/index.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/layout.html b/documentation/layout.html
index 85b7aa0..0e24b2d 100644
--- a/documentation/layout.html
+++ b/documentation/layout.html
@@ -111,7 +111,7 @@
       </aside>
 
       <div class="scroll-to-top">
-        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+        <button class="btn outline" onClick="window.scrollTo(0,0);">Back to Top</button>
       </div>
 
       <!-- Views -->
diff --git a/site/documentation/index.html b/site/documentation/index.html
index e3c0979..32e6489 100644
--- a/site/documentation/index.html
+++ b/site/documentation/index.html
@@ -111,7 +111,7 @@
       </aside>
 
       <div class="scroll-to-top">
-        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+        <button class="btn outline" onClick="window.scrollTo(0,0);">Back to Top</button>
       </div>
 
       <!-- Views -->
diff --git a/site/examples/index.html b/site/examples/index.html
index e3548c2..1e1736e 100644
--- a/site/examples/index.html
+++ b/site/examples/index.html
@@ -90,7 +90,7 @@
       </aside>
 
       <div class="scroll-to-top">
-        <button class="btn" onClick="window.scrollTo(0,0);">Back to Top</button>
+        <button class="btn outline" onClick="window.scrollTo(0,0);">Back to Top</button>
       </div>
 
       <!-- Views -->