Changeset - 7b3f08db8f66
[Not reviewed]
default
0 3 0
Drew Perttula - 8 years ago 2017-06-10 07:14:29
drewp@bigasterisk.com
reformat colorpick on timeline
Ignore-this: e6af990f4e2a43441609c2b288010f06
3 files changed with 16 insertions and 11 deletions:
0 comments (0 inline, 0 general)
light9/web/light9-color-picker.html
Show inline comments
 
@@ -5,12 +5,13 @@
 
  <template>
 
    <style>
 
     :host {
 
         position: relative;
 
         display: flex;
 
         align-items: center;
 
         flex-wrap: wrap;
 
     }
 
     #smallRainbowComp, #largeRainbowComp {
 
         display: inline-block;
 
         overflow: hidden;
 
         position: relative;
 
     }
 
@@ -55,23 +56,29 @@
 
         left: -50px;
 
         top: -110px;
 
     }
 
     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"
 
           on-mouseup="hideLarge"
 
           on-mouseleave="hideLarge"></div>
 
      <div id="largeCrosshair"></div>
light9/web/live/index.html
Show inline comments
 
@@ -174,13 +174,13 @@
 
         .device {
 
             border: 2px solid #151e2d;
 
             margin: 4px;
 
             padding: 1px;
 
             background: #171717;  /* deviceClass gradient added later */
 
             break-inside: avoid-column;
 
             width: 400px;
 
             width: 445px;
 
             
 
         }
 
         .deviceAttr {
 
             border-top: 1px solid #272727;
 
             padding-bottom: 2px;
 
             display: flex;
light9/web/timeline/timeline.coffee
Show inline comments
 
@@ -513,14 +513,14 @@ Polymer
 

	
 
  _updateInlineAttrs: (screenPts) ->
 
    leftX = Math.max(2, screenPts[Math.min(1, screenPts.length - 1)].e(1) + 5)
 
    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,
 
      top: @offsetTop + @offsetHeight - h - 5,
 
      width: w,
 
      height: h,
 
@@ -544,15 +544,13 @@ Polymer
 
  _curveWidth: (worldPts) ->
 
    tMin = @graph.floatValue(worldPts[0].uri, @graph.Uri(':time'))
 
    tMax = @graph.floatValue(worldPts[3].uri, @graph.Uri(':time'))
 
    tMax - tMin
 
    
 
  _makeCurvePointAdjusters: (yForV, worldPts) ->
 
    
 
    for pointNum in [0...worldPts.length]
 
      log('wor', worldPts, pointNum)
 
      @_makePointAdjuster(yForV, worldPts, pointNum)
 

	
 
  _makePointAdjuster: (yForV, worldPts, pointNum) ->
 
    U = (x) => @graph.Uri(x)
 

	
 
    adjId = @uri + '/p' + pointNum
0 comments (0 inline, 0 general)