Some styling and code formatting tweaks.

Squashed commit of the following: commit a7015f9 Author: Jeremy Kahn <[email protected]> Date: Sat Oct 19 14:50:20 2013 -0500 Fixes some formatting and builds 0.3.5. commit bc62c42 Author: Jeremy Kahn <[email protected]> Date: Sat Oct 19 14:45:57 2013 -0500 Reverts some unit-related changes. commit b1183a2 Author: Jeremy Kahn <[email protected]> Date: Sat Oct 19 14:35:34 2013 -0500 Reformats dependency listing. commit 2529b7d Author: Jeremy Kahn <[email protected]> Date: Thu Oct 17 21:27:05 2013 -0500 Adds HTML and CSS for unit selection.
580 · Oct 19, 2013 · 634ca9b · 634ca9b
1 parent 0184990
commit 634ca9b
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 25 deletions.
diff --git a/bin/app.js b/bin/app.js
diff --git a/bin/libs.js b/bin/libs.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Stylie",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "./index.html",
   "dependencies": {
     "shifty": "0.12.0",

diff --git a/dev.html b/dev.html
@@ -3,7 +3,6 @@
 <head>
   <title>Stylie.  A graphical CSS animation tool.</title>
   <meta charset="utf-8">
-  <meta name="viewport" content="user-scalable=false;">
   <link href='lib/rekapi-controls/font-awesome/css/font-awesome.css' rel='stylesheet' type='text/css'>
   <link href='lib/dragon/jquery.dragon-slider.css' rel='stylesheet' type='text/css'>
   <link href='lib/rekapi-controls/rekapi-controls.css' rel='stylesheet' type='text/css'>
@@ -57,7 +56,7 @@ <h2>A fun CSS animation tool, powered by <a href="http://rekapi.com" target="_bl
             <li>
               <div id="custom-ease">
                 <label>Custom easings:</label>
-                <select class="custom-ease-select"></select>
+                <select class="easing custom-ease-select"></select>
                 <button class="icon icon-plus" title="Add a new custom easing formula">&nbsp;</button>
                 <div class="bezierizer"></div>
                 <div class="property-field">
@@ -111,7 +110,7 @@ <h3>
               <h3>
                 Vendors:
               </h3>
-              <ul class="checkboxes">
+              <ul class="checkboxes vendors">
                 <li>
                   <label>
                     <input id="moz-toggle" class="class-toggle" type="checkbox">

diff --git a/index.html b/index.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Stylie",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "homepage": "https://github.com/jeremyckahn/stylie",
   "author": "Jeremy Kahn <[email protected]>",
   "description": "A CSS3 keyframe generator",

diff --git a/src/init.js b/src/init.js
@@ -5,11 +5,20 @@ require([
     ,'src/utils'
 
     // Views
-    ,'src/ui/checkbox', 'src/ui/ease-select', 'src/ui/fps-slider'
-    ,'src/ui/auto-update-textfield', 'src/ui/canvas', 'src/ui/pane'
-    ,'src/ui/tabs', 'src/ui/css-output', 'src/ui/html-input'
-    ,'src/ui/custom-ease', 'src/ui/modal', 'src/ui/hotkey-handler'
-    ,'src/ui/rekapi-controls', 'src/ui/alert'
+    ,'src/ui/checkbox'
+    ,'src/ui/ease-select'
+    ,'src/ui/fps-slider'
+    ,'src/ui/auto-update-textfield'
+    ,'src/ui/canvas'
+    ,'src/ui/pane'
+    ,'src/ui/tabs'
+    ,'src/ui/css-output'
+    ,'src/ui/html-input'
+    ,'src/ui/custom-ease'
+    ,'src/ui/modal'
+    ,'src/ui/hotkey-handler'
+    ,'src/ui/rekapi-controls'
+    ,'src/ui/alert'
 
     // Collections
     ,'src/collection/actors'
@@ -19,11 +28,20 @@ require([
       ,constant
       ,util
 
-      ,CheckboxView, EaseSelectView, FPSSliderView
-      ,AutoUpdateTextFieldView, CanvasView, PaneView
-      ,TabsView, CSSOutputView, HTMLInputView
-      ,CustomEaseView, ModalView, HotkeyHandlerView
-      ,RekapiControlsView, AlertView
+      ,CheckboxView
+      ,EaseSelectView
+      ,FPSSliderView
+      ,AutoUpdateTextFieldView
+      ,CanvasView
+      ,PaneView
+      ,TabsView
+      ,CSSOutputView
+      ,HTMLInputView
+      ,CustomEaseView
+      ,ModalView
+      ,HotkeyHandlerView
+      ,RekapiControlsView
+      ,AlertView
 
       ,ActorCollection
 

diff --git a/src/ui/custom-ease.js b/src/ui/custom-ease.js
@@ -75,7 +75,7 @@ define([
       $option
         .val(easingName)
         .text(easingName);
-      $('#control-pane select').append($option);
+      $('#control-pane select.easing').append($option);
       this._$easingSelect.val(easingName);
       this._bezierizer.setHandlePositions(this._defaultBezierizerPoints);
       this._curvePoints[easingName] = this._bezierizer.getHandlePositions();

diff --git a/src/ui/keyframe-form.js b/src/ui/keyframe-form.js
@@ -54,7 +54,7 @@ define([
     ].join('');
 
   var EASE_SELECT_TEMPLATE = [
-      '<select class="{{property}}-easing" data-axis="{{property}}"></select>'
+      '<select class="easing {{property}}-easing" data-axis="{{property}}"></select>'
     ].join('');
 
   var MILLISECOND_INPUT_TEMPLATE = [

diff --git a/style.css b/style.css
@@ -523,6 +523,11 @@ canvas {
     padding-right: 12px;
   }
 
+  #control-pane .vendors span {
+    font-size: 0.85em;
+    padding-right: 0;
+  }
+
   #control-pane .ease-label {
     display: inline-block;
     width: 20px;
@@ -780,6 +785,10 @@ canvas {
     width: 50%;
   }
 
+  ul.controls .checkboxes.vendors li {
+    width: 33%;
+  }
+
 #html-input {
   line-height: 0;
 }