Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/AddAnimationSupport'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackschaedler
jackschaedler committed Jun 14, 2014
2 parents a73dcf5 + 8c09568 commit 6cf6bd0
Show file tree
Hide file tree
Showing 40 changed files with 3,162 additions and 806 deletions.
Binary file modified preview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions project.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
:optimizations :advanced
:pretty-print false
:preamble ["react/react_with_addons.min.js"
"gifjs/dist/gif.js"]
"gifjs/dist/gif.js"
"lz-string/lz-string-1.3.3-min.js"]
:externs ["react/react_with_addons.js"
"gifjs/dist/gif.js"]
"gifjs/dist/gif.js"
"lz-string/lz-string-1.3.3-min.js"]
:closure-warnings {:externs-validation :off
:non-standard-jsdoc :off}}}]})
97 changes: 0 additions & 97 deletions resources/fonts/fontello-7bc56e03/css/fontello-embedded.css
View file

This file was deleted.

Binary file removed resources/fonts/fontello-7bc56e03/font/fontello.woff
View file
Binary file not shown.
0 ...urces/fonts/fontello-7bc56e03/LICENSE.txt → ...urces/fonts/fontello-c1686fe7/LICENSE.txt
View file
File renamed without changes.
0 resources/fonts/fontello-7bc56e03/README.txt → resources/fonts/fontello-c1686fe7/README.txt
View file
File renamed without changes.
138 changes: 138 additions & 0 deletions ...urces/fonts/fontello-7bc56e03/config.json → ...urces/fonts/fontello-c1686fe7/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,42 @@
"code": 59430,
"src": "fontawesome"
},
{
"uid": "0f4cae16f34ae243a6144c18a003f2d8",
"css": "cancel-circled",
"code": 59436,
"src": "fontawesome"
},
{
"uid": "4ba33d2607902cf690dd45df09774cb0",
"css": "plus-circled",
"code": 59437,
"src": "fontawesome"
},
{
"uid": "1a5cfa186647e8c929c2b17b9fc4dac1",
"css": "plus-squared",
"code": 59438,
"src": "fontawesome"
},
{
"uid": "f755a58fb985eeb70bd47d9b31892a34",
"css": "minus-squared",
"code": 59439,
"src": "fontawesome"
},
{
"uid": "9a76bc135eac17d2c8b8ad4a5774fc87",
"css": "download",
"code": 59422,
"src": "fontawesome"
},
{
"uid": "eeec3208c90b7b48e804919d0d2d4a41",
"css": "upload",
"code": 59457,
"src": "fontawesome"
},
{
"uid": "c76b7947c957c9b78b11741173c8349b",
"css": "attention",
Expand All @@ -30,18 +60,114 @@
"code": 59434,
"src": "fontawesome"
},
{
"uid": "8933c2579166c2ee56ae40dc6a0b4dc6",
"css": "angle-circled-left",
"code": 59442,
"src": "fontawesome"
},
{
"uid": "94089b37297572e936b0943bcfa041d3",
"css": "angle-circled-right",
"code": 59443,
"src": "fontawesome"
},
{
"uid": "6855131631509e8795730ce062045ea1",
"css": "left-circled",
"code": 59444,
"src": "fontawesome"
},
{
"uid": "19b04848ae7332d2c0ea2a9e19064037",
"css": "right-circled",
"code": 59445,
"src": "fontawesome"
},
{
"uid": "ed5a38704f0329e610ee1c92bec3ad3d",
"css": "expand-right",
"code": 59440,
"src": "fontawesome"
},
{
"uid": "ea2ec99fbce03864e593bbf4f302a79d",
"css": "collapse-left",
"code": 59441,
"src": "fontawesome"
},
{
"uid": "f4445feb55521283572ee88bc304f928",
"css": "floppy-1",
"code": 59456,
"src": "fontawesome"
},
{
"uid": "bf45c39702763f1803b550c36a0ceb12",
"css": "cancel-squared",
"code": 59446,
"src": "entypo"
},
{
"uid": "9e1c33b6849ceb08db8acfaf02188b7d",
"css": "plus-squared-1",
"code": 59447,
"src": "entypo"
},
{
"uid": "4ffa544c1a81c905f0a8a5745d8b9faa",
"css": "minus-squared-1",
"code": 59448,
"src": "entypo"
},
{
"uid": "39a5a0d7ce8342d149373b2ce219503a",
"css": "alert",
"code": 59428,
"src": "entypo"
},
{
"uid": "2626e3a1bbcd90e45849af3b58a1d594",
"css": "trash",
"code": 59449,
"src": "entypo"
},
{
"uid": "4b20e1deee87faf4c3fab735fbd4bc1a",
"css": "lamp",
"code": 59425,
"src": "entypo"
},
{
"uid": "cb13afd4722a849d48056540bb74c47e",
"css": "play",
"code": 59450,
"src": "entypo"
},
{
"uid": "48f2e18872fe74d4579a4c8a1527fc1e",
"css": "stop",
"code": 59451,
"src": "entypo"
},
{
"uid": "d8d378d0ce413f231dfa37592e39c227",
"css": "pause",
"code": 59452,
"src": "entypo"
},
{
"uid": "0afbb00323696f49e9c47f4d9fe6390b",
"css": "to-end",
"code": 59453,
"src": "entypo"
},
{
"uid": "ceefe7653a4f6edaacce9e7f196cec5a",
"css": "to-start",
"code": 59454,
"src": "entypo"
},
{
"uid": "89eb512cb82a1c3fe83cb16134f9876c",
"css": "back-in-time",
Expand All @@ -54,12 +180,24 @@
"code": 59421,
"src": "entypo"
},
{
"uid": "191bcf63575a78def53c907c3d3bf7f0",
"css": "floppy",
"code": 59455,
"src": "entypo"
},
{
"uid": "8ea66d97faf9816abd34f48f3f26d216",
"css": "bucket",
"code": 59432,
"src": "entypo"
},
{
"uid": "6cea40aa6cc50057083e4f0a5b92410c",
"css": "flow-line",
"code": 59435,
"src": "entypo"
},
{
"uid": "fa92c2529910e6958311b673ebf307e2",
"css": "videocam",
Expand Down
0 ...fonts/fontello-7bc56e03/css/animation.css → ...fonts/fontello-c1686fe7/css/animation.css
View file
File renamed without changes.
29 changes: 26 additions & 3 deletions .../fontello-7bc56e03/css/fontello-codes.css → .../fontello-c1686fe7/css/fontello-codes.css
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,38 @@

.icon-video:before { content: '\e826'; } /* '' */
.icon-lightbulb:before { content: '\e820'; } /* '' */
.icon-plus-circled:before { content: '\e82d'; } /* '' */
.icon-plus-squared:before { content: '\e82e'; } /* '' */
.icon-minus-squared:before { content: '\e82f'; } /* '' */
.icon-download:before { content: '\e81e'; } /* '' */
.icon-upload:before { content: '\e841'; } /* '' */
.icon-attention:before { content: '\e825'; } /* '' */
.icon-move:before { content: '\e82a'; } /* '' */
.icon-angle-circled-left:before { content: '\e832'; } /* '' */
.icon-angle-circled-right:before { content: '\e833'; } /* '' */
.icon-left-circled:before { content: '\e834'; } /* '' */
.icon-right-circled:before { content: '\e835'; } /* '' */
.icon-expand-right:before { content: '\e830'; } /* '' */
.icon-collapse-left:before { content: '\e831'; } /* '' */
.icon-floppy-1:before { content: '\e840'; } /* '' */
.icon-cancel-squared:before { content: '\e836'; } /* '' */
.icon-plus-squared-1:before { content: '\e837'; } /* '' */
.icon-minus-squared-1:before { content: '\e838'; } /* '' */
.icon-alert:before { content: '\e824'; } /* '' */
.icon-trash:before { content: '\e839'; } /* '' */
.icon-lamp:before { content: '\e821'; } /* '' */
.icon-play:before { content: '\e83a'; } /* '' */
.icon-stop:before { content: '\e83b'; } /* '' */
.icon-pause:before { content: '\e83c'; } /* '' */
.icon-to-end:before { content: '\e83d'; } /* '' */
.icon-to-start:before { content: '\e83e'; } /* '' */
.icon-back-in-time:before { content: '\e81c'; } /* '' */
.icon-droplet:before { content: '\e81d'; } /* '' */
.icon-floppy:before { content: '\e83f'; } /* '' */
.icon-bucket:before { content: '\e828'; } /* '' */
.icon-flow-line:before { content: '\e82b'; } /* '' */
.icon-videocam:before { content: '\e827'; } /* '' */
.icon-picture:before { content: '\e819'; } /* '' */
.icon-cancel-circled:before { content: '\e82c'; } /* '' */
.icon-pencil:before { content: '\e817'; } /* '' */
.icon-pen:before { content: '\e816'; } /* '' */
.icon-edit:before { content: '\e818'; } /* '' */
Expand All @@ -20,7 +43,7 @@
.icon-cloud:before { content: '\e822'; } /* '' */
.icon-cloud-flash:before { content: '\e823'; } /* '' */
.icon-brush-1:before { content: '\e812'; } /* '' */
.icon-download:before { content: '\e81e'; } /* '' */
.icon-pipette:before { content: '\e811'; } /* '' */
.icon-scissors-outline:before { content: '\e813'; } /* '' */
.icon-scissors:before { content: '\e814'; } /* '' */
.icon-info:before { content: '\e808'; } /* '' */
Expand All @@ -41,4 +64,4 @@
.icon-grid:before { content: '\e81b'; } /* '' */
.icon-github-circled:before { content: '\e829'; } /* '' */
.icon-download-1:before { content: '\e81f'; } /* '' */
.icon-pipette:before { content: '\e811'; } /* '' */
.icon-picture:before { content: '\e819'; } /* '' */
120 changes: 120 additions & 0 deletions resources/fonts/fontello-c1686fe7/css/fontello-embedded.css
View file

Large diffs are not rendered by default.

29 changes: 26 additions & 3 deletions ...tello-7bc56e03/css/fontello-ie7-codes.css → ...tello-c1686fe7/css/fontello-ie7-codes.css
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,38 @@

.icon-video { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-lightbulb { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-attention { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-left-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-right-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-expand-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-collapse-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-floppy-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus-squared-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-alert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-lamp { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-play { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-stop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pause { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-to-end { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-to-start { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-back-in-time { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-droplet { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-floppy { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-bucket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-flow-line { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-videocam { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pen { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -20,7 +43,7 @@
.icon-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cloud-flash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pipette { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-scissors-outline { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-scissors { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -41,4 +64,4 @@
.icon-grid { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-github-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pipette { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
29 changes: 26 additions & 3 deletions ...ts/fontello-7bc56e03/css/fontello-ie7.css → ...ts/fontello-c1686fe7/css/fontello-ie7.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,38 @@

.icon-video { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-lightbulb { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-attention { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-left-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-right-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-expand-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-collapse-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-floppy-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus-squared-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-alert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-lamp { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-play { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-stop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pause { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-to-end { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-to-start { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-back-in-time { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-droplet { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-floppy { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-bucket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-flow-line { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-videocam { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pen { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -31,7 +54,7 @@
.icon-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cloud-flash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pipette { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-scissors-outline { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-scissors { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-info { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -52,4 +75,4 @@
.icon-grid { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-github-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-download-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-pipette { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Loading

0 comments on commit 6cf6bd0

Please sign in to comment.