Merge branch 'master' of https://github.com/legomushroom/mojs-curve-editor

legomushroom · legomushroom · commit fb58ec97bc70 · 2016-08-04T12:56:57.000+02:00
diff --git a/app/css/assets/colors.postcss.css b/app/css/assets/colors.postcss.css
@@ -1,4 +1,4 @@
 
 $c-purple: #3A0839;
 $c-orange: #FF512F;
-$c-white : #FFFFFF;
+$c-white : #FFFFFF;
diff --git a/app/css/blocks/icon-button.postcss.css b/app/css/blocks/icon-button.postcss.css
@@ -39,4 +39,3 @@
       transform:    translate( -54%, -54% ) scale(.95);
   }
 }
-
diff --git a/app/css/blocks/icon-button.postcss.css.json b/app/css/blocks/icon-button.postcss.css.json
@@ -1 +1 @@
-{"icon-button":"_icon-button_va2ff_4","is-checked":"_is-checked_va2ff_31"}
+{"icon-button":"_icon-button_1jdiw_4","is-checked":"_is-checked_1jdiw_31"}
diff --git a/app/css/blocks/icon-divider.postcss.css b/app/css/blocks/icon-divider.postcss.css
@@ -0,0 +1,19 @@
+@import '../assets/globals.postcss.css';
+
+.icon-divider {
+  position:         relative;
+  width:            calc( 16*$PX );
+  height:           calc( 16*$PX );
+  display:          block;
+  background:       $c-white;
+  box-shadow:       0 calc( -1*$PX ) 4 rgba(0,0,0,.30);
+
+  & icon {
+    position:     absolute;
+    left:         50%;
+    top:          70%;
+    width:        100%;
+    height:       100%;
+    transform:    translate( -50%, -50% );
+  }
+}
diff --git a/app/css/blocks/icon-divider.postcss.css.json b/app/css/blocks/icon-divider.postcss.css.json
@@ -0,0 +1 @@
+{"icon-divider":"_icon-divider_177dd_3"}
diff --git a/app/js/tags/curve-editor.tag b/app/js/tags/curve-editor.tag
@@ -2,25 +2,32 @@ require('./resize-handle');
 require('./icons');
 require('./icon');
 require('./icon-button');
+require('./icon-divider');
 require('./curve');
 
 <curve-editor class={this.CLASSES['curve-editor']} style={this.getStyle()}>
   <icons />
 
   <div class={this.CLASSES['curve-editor__left']}>
     <icon-button shape="code"></icon-button>
+    <icon-divider shape="divider"></icon-divider>
     <a href="https://github.com/legomushroom/mojs-curve-editor" target="_blank" class={this.CLASSES['curve-editor__mojs-logo']}>
       <icon shape="mojs-logo" />
     </a>
   </div>
 
+<<<<<<< HEAD
+  <curve adc={this.CLASSES['curve-editor__right']} />
+
+=======
   <div class={this.CLASSES['curve-editor__right']}>
     <curve />
     <resize-handle type="top"></resize-handle>
     <resize-handle type="right"></resize-handle>
     <resize-handle type="bottom"></resize-handle>
   </div>
   
+>>>>>>> 160ef2ef7c5f203d6f474a73062d6f86e7069387
   <script type="babel">
     require('../../css/blocks/curve-editor');
     this.CLASSES = require('../../css/blocks/curve-editor.postcss.css.json');
@@ -83,4 +90,4 @@ require('./curve');
 
   </script>
 
-</curve-editor>
+</curve-editor>
diff --git a/app/js/tags/icon-divider.tag b/app/js/tags/icon-divider.tag
@@ -0,0 +1,11 @@
+require('./icon');
+
+<icon-divider class={this.CLASSES['icon-divider']}>
+  <icon shape={opts.shape}></icon>
+
+  <script>
+    this.CLASSES = require('../../css/blocks/icon-divider.postcss.css.json');
+    require('../../css/blocks/icon-divider');
+  </script>
+
+</icon-divider>
diff --git a/app/js/tags/icons.tag b/app/js/tags/icons.tag
@@ -4,8 +4,9 @@
       <circle cx="11" cy="16" r="1"></circle>
       <circle cx="16" cy="16" r="1"></circle>
       <circle cx="21" cy="16" r="1"></circle>
-    </g>    
+    </g>
     <path id="code-shape" d="M8,16.0849648 C8,15.8210793 8.11149069,15.6129393 8.33483405,15.4609065 L12.3390874,12.8419612 C12.3897649,12.8014192 12.4657813,12.7811481 12.5674985,12.7811481 C12.7398023,12.7811481 12.9048664,12.8571645 13.0623289,13.0095592 C13.2194294,13.161954 13.2983417,13.3393255 13.2983417,13.5423979 C13.2983417,13.7353347 13.2219633,13.8826617 13.0692066,13.9840168 L9.85769553,16.0849648 L13.0692066,18.1862747 C13.2219633,18.2677208 13.2983417,18.4146858 13.2983417,18.6278937 C13.2983417,18.830966 13.2197914,19.0061657 13.0623289,19.1531307 C12.9048664,19.3004576 12.7398023,19.3739401 12.5674985,19.3739401 C12.4657813,19.3739401 12.3897649,19.3536691 12.3390874,19.313127 L8.33483405,16.6938198 C8.11149069,16.541425 8,16.3387147 8,16.0849648 L8,16.0849648 Z M14.1399516,20.6875756 C14.1265582,20.6075774 14.1287301,20.5301131 14.1468293,20.4548207 L16.9395263,11.356022 C16.9891179,11.1623612 17.1237755,11.0468887 17.344223,11.0096045 C17.5042194,10.9824558 17.658786,11.0128623 17.8075609,11.1008242 C17.9563358,11.1891479 18.0442976,11.313308 18.0710844,11.4733044 C18.0862876,11.5634381 18.079772,11.6470561 18.0518993,11.7237965 L15.2664419,20.7748134 C15.2085247,20.9800577 15.0593878,21.1031318 14.8193932,21.1440358 C14.6488993,21.1729945 14.4994005,21.1389681 14.3698106,21.0426807 C14.2402208,20.9460313 14.1638424,20.8276629 14.1399516,20.6875756 L14.1399516,20.6875756 Z M18.9528744,19.1527687 C18.7954119,19.0058037 18.7168616,18.830604 18.7168616,18.6275317 C18.7168616,18.4244594 18.7878102,18.2774944 18.9300695,18.1859127 L22.1426665,16.0846028 L18.9300695,13.9836549 C18.7878102,13.8718022 18.7168616,13.7248372 18.7168616,13.5420359 C18.7168616,13.3389636 18.7954119,13.161592 18.9528744,13.0091973 C19.1103369,12.8568025 19.275039,12.7807861 19.4477048,12.7807861 C19.5389245,12.7807861 19.6098731,12.8014192 19.6609126,12.8415992 L23.6651659,15.4605445 C23.8881473,15.6129393 24,15.8210793 24,16.0846028 C24,16.3488502 23.8881473,16.5515606 23.6651659,16.6938198 L19.6609126,19.3127651 C19.6098731,19.3533071 19.5389245,19.3735782 19.4477048,19.3735782 C19.275039,19.3735782 19.1103369,19.3000957 18.9528744,19.1527687 L18.9528744,19.1527687 Z"></path>
+    <path id="divider-shape" d="M0,1 L15.625,1"></path>
     <path id="mojs-logo-shape" d="M18.4678907,2.67700048 C19.488586,3.25758625 20.2789227,4.18421651 20.87823,5.1973579 C24.0807788,10.501451 27.2777091,15.8113116 30.480258,21.1154047 C31.1320047,22.1612281 31.7706417,23.2647256 31.9354512,24.5162532 C32.188284,26.0619186 31.6919826,27.7363895 30.5589171,28.80336 C29.4501984,29.8857103 27.8807622,30.3182659 26.3806209,30.3048086 C19.4511293,30.3086535 12.5235106,30.3086535 5.59401901,30.3048086 C3.71556494,30.343258 1.69852104,29.5723478 0.683444165,27.8709623 C-0.406546132,26.1099803 -0.0975282643,23.7914822 0.940022637,22.0843293 C4.34296485,16.4130445 7.76650826,10.7532945 11.1825603,5.08969961 C11.9747698,3.74781595 13.1846215,2.60202418 14.6847628,2.18292584 C15.9451812,1.81573418 17.3348251,2.01182606 18.4678907,2.67700048 Z M15.3334668,9.51526849 C15.6146238,9.03779476 16.0791597,9.02250655 16.3785679,9.4929547 L25.2763555,23.4736913 C25.5723919,23.9388414 25.3568433,24.3159201 24.8074398,24.3159202 L7.62314647,24.3159205 C7.06813505,24.3159206 6.84622798,23.9286889 7.12728913,23.4513779 L15.3334668,9.51526849 Z" fill-rule="evenodd"></path>
   </svg>
-</icons>
+</icons>
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "hammerjs": "^2.0.8",
     "propagating-hammerjs": "^1.4.6",
     "redux": "^3.5.2",
+    "redux-undo": "^0.6.1",
     "riot": "^2.5.0"
   },
   "devDependencies": {

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,3 @@`
`39`	`39`	`transform: translate( -54%, -54% ) scale(.95);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"icon-button":"_icon-button_va2ff_4","is-checked":"_is-checked_va2ff_31"}`
	`1`	`+{"icon-button":"_icon-button_1jdiw_4","is-checked":"_is-checked_1jdiw_31"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"icon-divider":"_icon-divider_177dd_3"}`