changeset 1641:7b3f08db8f66

reformat colorpick on timeline Ignore-this: e6af990f4e2a43441609c2b288010f06
author Drew Perttula <drewp@bigasterisk.com>
date Sat, 10 Jun 2017 07:14:29 +0000
parents 11b74e7d6b88
children 8603ab0b9fa8
files light9/web/light9-color-picker.html light9/web/live/index.html light9/web/timeline/timeline.coffee
diffstat 3 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/light9/web/light9-color-picker.html	Sat Jun 10 05:59:22 2017 +0000
+++ b/light9/web/light9-color-picker.html	Sat Jun 10 07:14:29 2017 +0000
@@ -8,6 +8,7 @@
          position: relative;
          display: flex;
          align-items: center;
+         flex-wrap: wrap;
      }
      #smallRainbowComp, #largeRainbowComp {
          display: inline-block;
@@ -58,17 +59,23 @@
      paper-slider {
          width: 170px;
      }
+     #vee {
+         display: flex;
+         align-items: center;
+     }
     </style>
     <div id="smallRainbowComp">
       <div id="smallRainbow" on-mouseenter="onEnterSmall"></div>
       <div id="smallCrosshair"></div>
     </div>
-    <span>V:</span>
-    <paper-slider min="0"
-                  max="255"
-                  step="1"
-                  value="{{sliderWriteValue}}"
-                  immediate-value="{{value}}"></paper-slider>
+    <span id="vee">
+      V:
+      <paper-slider min="0"
+                    max="255"
+                    step="1"
+                    value="{{sliderWriteValue}}"
+                    immediate-value="{{value}}"></paper-slider>
+    </span>
     <div id="largeRainbowComp">
       <div id="largeRainbow"
            on-mousemove="onCanvasMove"
--- a/light9/web/live/index.html	Sat Jun 10 05:59:22 2017 +0000
+++ b/light9/web/live/index.html	Sat Jun 10 07:14:29 2017 +0000
@@ -177,7 +177,7 @@
              padding: 1px;
              background: #171717;  /* deviceClass gradient added later */
              break-inside: avoid-column;
-             width: 400px;
+             width: 445px;
              
          }
          .deviceAttr {
--- a/light9/web/timeline/timeline.coffee	Sat Jun 10 05:59:22 2017 +0000
+++ b/light9/web/timeline/timeline.coffee	Sat Jun 10 07:14:29 2017 +0000
@@ -516,8 +516,8 @@
     rightX = screenPts[Math.min(2, screenPts.length - 1)].e(1) - 5
     if screenPts.length < 3
       rightX = leftX + 120
-    w = 430
-    h = 80
+    w = 250
+    h = 110
     wasHidden = @inlineRect?.display == 'none'
     @inlineRect = {
       left: leftX,
@@ -547,9 +547,7 @@
     tMax - tMin
     
   _makeCurvePointAdjusters: (yForV, worldPts) ->
-    
     for pointNum in [0...worldPts.length]
-      log('wor', worldPts, pointNum)
       @_makePointAdjuster(yForV, worldPts, pointNum)
 
   _makePointAdjuster: (yForV, worldPts, pointNum) ->