Merge pull request #26 from nikolaswise/v1.1

adjust doc, rename property
paulcpederson · Aug 29, 2014 · 4efd522 · 4efd522
2 parents 0817505 + b73987f
commit 4efd522
Show file tree

Hide file tree

Showing 30 changed files with 476 additions and 418 deletions.
diff --git a/dist/angular-dimple.js b/dist/angular-dimple.js
diff --git a/dist/angular-dimple.min.js b/dist/angular-dimple.min.js
diff --git a/documentation/index.md b/documentation/index.md
@@ -243,28 +243,30 @@ Scatter Plots also use the `series` attribute. Series defines the categorical da
 ---
 
 ## Ring
+<a class="example-link" href="../examples/#/ring">example</a>
+
 The `ring` directive creates pie and donut charts - but require a seperate type of axis that the other charts in Angular Dimple. A ring chart uses a `<p></p>` axis to plot a single measure. Adding multiple series to a ring chart will create concentric circles within the chart.
 
-You can define both the width of the ring (as a percentage) and the size of the ring (as a percentage).
+You can define both the thickness of the ring (as a percentage) and the diameter of the ring (as a percentage).
 
 ```html
-<p field="Unit Sales"></p>
+<r field="Unit Sales"></r>
 <ring field="Owner"></ring>
 
 <!-- OR -->
 
-<p field="Unit Sales"></p>
-<ring field="Owner" width="20"></ring>
-<ring field="Price Tier" width="20" radius="75"></ring>>
+<r field="Unit Sales"></r>
+<ring field="Owner" thickness="20"></ring>
+<ring field="Price Tier" thickness="20" diameter="75"></ring>>
 ```
 
 #### Attributes
 
 | attribute | description |
 | --------- | ----------- |
 | field     | **Required.** Field to plot as a ring. |
-| width     | Accepts a number. Width of ring, as percent of circle size. |
-| radius    | Accepts a number. Size of ring, as percent of circle size. |
+| thickness     | Accepts a number. Width of ring, as percent of circle size. |
+| diameter    | Accepts a number. Size of ring, as percent of circle size. |
 
 
 

diff --git a/documentation/partials/animation-test.md b/documentation/partials/animation-test.md
@@ -0,0 +1,13 @@
+
+<div class="white-panel">
+  <graph data="graphData" width="100%" height="600px">
+    <x field="Month" order-by="Date"></x>
+    <y field="Unit Sales"></y>
+    <legend></legend>
+    <line field="Owner" value="Aperture"></line>
+  </graph>
+</div>
+
+<button id="update_data" ng-click="update_data()" class="btn">
+	Change Data
+</button>
diff --git a/documentation/partials/ring.md b/documentation/partials/ring.md
@@ -7,7 +7,7 @@
 
 <div class="white-panel">
   <graph data="graphData" width="100%" height="600px">
-    <p field="Unit Sales"></p>
+    <r field="Unit Sales"></r>
     <legend></legend>
     <ring field="Owner" thickness="20"></ring>
   </graph>
@@ -16,7 +16,7 @@
 ```html
 <!-- Default Stacked -->
   <graph data="graphData" width="100%" height="600px">
-    <p field="Unit Sales"></p>
+    <r field="Unit Sales"></r>
     <legend></legend>
     <ring field="Owner" thickness="20"></ring>
   </graph>
@@ -31,19 +31,19 @@
 
 <div class="white-panel">
   <graph data="graphData" width="100%" height="600px">
-    <p field="Unit Sales"></p>
+    <r field="Unit Sales"></r>
     <legend></legend>
     <ring field="Owner" thickness="20"></ring>
-	  <ring field="Price Tier" thickness="20" radius="75"></ring>
+	  <ring field="Price Tier" thickness="20" diameter="75"></ring>
   </graph>
 </div>
 
 ```html
 <!-- Default Stacked -->
   <graph data="graphData" width="100%" height="600px">
-    <p field="Unit Sales"></p>
+    <r field="Unit Sales"></r>
     <legend></legend>
     <ring field="Owner" thickness="20"></ring>
-	  <ring field="Price Tier" thickness="20" radius="75"></ring>
+	  <ring field="Price Tier" thickness="20" diameter="75"></ring>
   </graph>
 ```
diff --git a/site/css/examples.css b/site/css/examples.css
@@ -98,15 +98,13 @@
 /* line 5, ../scss/examples.scss */
 .white-panel {
   margin-bottom: 1rem;
-  background-color: white;
-  border: 1px solid #ecf0f3;
-  -webkit-box-sizing: border-box;
+  background-color: #FFFFFF;
+  border: 1px solid #ECF0F3;
   -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
-  -ms-border-radius: 3px;
-  -o-border-radius: 3px;
+  -webkit-border-radius: 3px;
   border-radius: 3px;
 }
 /* line 11, ../scss/examples.scss */
@@ -141,7 +139,7 @@
 }
 
 @media screen and (max-width: 662px) {
-  /* line 43, ../scss/examples.scss */
+  /* line 42, ../scss/examples.scss */
   .example-link,
   .api-link {
     width: 100%;

diff --git a/site/css/home.css b/site/css/home.css
@@ -7,11 +7,11 @@
 }
 /* line 9, ../scss/home.scss */
 .homepage-navigation a {
-  color: #fafbfe;
+  color: #FAFBFE;
 }
 /* line 11, ../scss/home.scss */
 .homepage-navigation a:hover {
-  color: white;
+  color: #FFFFFF;
 }
 
 /* line 17, ../scss/home.scss */
@@ -22,15 +22,15 @@ pre {
 
 /* line 22, ../scss/home.scss */
 code {
-  background-color: white;
-  border-color: #ecf0f3;
+  background-color: #FFFFFF;
+  border-color: #ECF0F3;
 }
 
 /* line 27, ../scss/home.scss */
 .banner {
   position: relative;
   overflow: hidden;
-  color: white;
+  color: #FFFFFF;
   background: url(../img/dots.svg) #245070;
   z-index: 20;
 }
@@ -79,5 +79,5 @@ code {
 
 /* line 71, ../scss/home.scss */
 .charts-list a {
-  color: #76899b;
+  color: #76899B;
 }