Merge branch 'master' into develop

maackle · Jun 13, 2016 · 46fa4e4 · 46fa4e4
2 parents 5bd8dd3 + a27ce29
commit 46fa4e4
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 49 deletions.
diff --git a/web/examples/download-table.html b/web/examples/download-table.html
@@ -29,7 +29,7 @@
   <div id="table" style="clear: both; margin-top: 30px;">
   </div>
   <div style="clear: both">
-    <button id="download">download table</button>
+    <button class="btn" id="download">download table</button>
   </div>
 
 <script type="text/javascript" src="../js/d3.js"></script>

diff --git a/web/examples/series.html b/web/examples/series.html
@@ -11,9 +11,9 @@
 <div class="container">
 <script type="text/javascript" src="header.js"></script>
 <div id="test"></div>
-<button onclick="button1()">1</button>
-<button onclick="button2()">2</button>
-<button onclick="button3()">3</button>
+<button class="btn" onclick="button1()">1</button>
+<button class="btn" onclick="button2()">2</button>
+<button class="btn" onclick="button3()">3</button>
 
 <script type="text/javascript" src="../js/d3.js"></script>
 <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/examples/table-pagination.html b/web/examples/table-pagination.html
@@ -13,8 +13,8 @@
   <table id="test"></table>
   <div id="paging">
     Showing <span id="begin"></span>-<span id="end"></span> of <span id="size"></span>.
-    <input id="last" type="Button" value="Last" onclick="javascript:last()" />
-    <input id="next" type="button" value="Next" onclick="javascript:next()"/>
+    <input id="last" class="btn" type="Button" value="Last" onclick="javascript:last()" />
+    <input id="next" class="btn" type="button" value="Next" onclick="javascript:next()"/>
   </div>
 
 <script type="text/javascript" src="../js/d3.js"></script>

diff --git a/web/resizing/resizing-series.html b/web/resizing/resizing-series.html
@@ -8,9 +8,9 @@
   <body>
 
     <div id="test"></div>
-    <button onclick="button1()">1</button>
-    <button onclick="button2()">2</button>
-    <button onclick="button3()">3</button>
+    <button class="btn" onclick="button1()">1</button>
+    <button class="btn" onclick="button2()">2</button>
+    <button class="btn" onclick="button3()">3</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/area-transitions.html b/web/transitions/area-transitions.html
@@ -11,11 +11,11 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
-    <button onclick="button4()">stacks</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
+    <button class="btn" onclick="button4()">stacks</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/bar-transitions.html b/web/transitions/bar-transitions.html
@@ -11,10 +11,10 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/ordinal-bar-transitions.html b/web/transitions/ordinal-bar-transitions.html
@@ -12,12 +12,12 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
-    <button onclick="button4()">reverse</button>
-    <button onclick="button5()">backward</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
+    <button class="btn" onclick="button4()">reverse</button>
+    <button class="btn" onclick="button5()">backward</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/ordinal-line-transitions.html b/web/transitions/ordinal-line-transitions.html
@@ -12,12 +12,12 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
-    <button onclick="button4()">reverse</button>
-    <button onclick="button5()">backward</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
+    <button class="btn" onclick="button4()">reverse</button>
+    <button class="btn" onclick="button5()">backward</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/ordinal-row-transitions.html b/web/transitions/ordinal-row-transitions.html
@@ -12,12 +12,12 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
-    <button onclick="button4()">reverse</button>
-    <button onclick="button5()">backward</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
+    <button class="btn" onclick="button4()">reverse</button>
+    <button class="btn" onclick="button5()">backward</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>

diff --git a/web/transitions/pie-external-label-transitions.html b/web/transitions/pie-external-label-transitions.html
@@ -11,10 +11,10 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">little</button>
-    <button onclick="button2()">keep 2</button>
-    <button onclick="button3()">keep 4</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">little</button>
+    <button class="btn" onclick="button2()">keep 2</button>
+    <button class="btn" onclick="button3()">keep 4</button>
 
 
     <script type="text/javascript" src="../js/d3.js"></script>

diff --git a/web/transitions/pie-transitions.html b/web/transitions/pie-transitions.html
@@ -11,10 +11,10 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">little</button>
-    <button onclick="button2()">keep 2</button>
-    <button onclick="button3()">keep 4</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">little</button>
+    <button class="btn" onclick="button2()">keep 2</button>
+    <button class="btn" onclick="button3()">keep 4</button>
 
 
     <script type="text/javascript" src="../js/d3.js"></script>

diff --git a/web/transitions/stacked-bar-transitions.html b/web/transitions/stacked-bar-transitions.html
@@ -11,11 +11,11 @@
     <script type="text/javascript" src="../examples/header.js"></script>
 
     <div id="test"></div>
-    <button onclick="transitionTest.stop()">stop</button>
-    <button onclick="button1()">left</button>
-    <button onclick="button2()">right</button>
-    <button onclick="button3()">middle</button>
-    <button onclick="button4()">stacks</button>
+    <button class="btn" onclick="transitionTest.stop()">stop</button>
+    <button class="btn" onclick="button1()">left</button>
+    <button class="btn" onclick="button2()">right</button>
+    <button class="btn" onclick="button3()">middle</button>
+    <button class="btn" onclick="button4()">stacks</button>
 
     <script type="text/javascript" src="../js/d3.js"></script>
     <script type="text/javascript" src="../js/crossfilter.js"></script>