Permalink
Browse files

Blend modes (4.0.18)

  • Loading branch information...
1 parent db0489c commit ac147f9156aec300ce555145abf3bc71961d87dd Doug Anarino committed Jun 19, 2016
Showing with 25,955 additions and 4,150 deletions.
  1. +9 −0 Changelog
  2. +162 −51 app/app.css
  3. +7 −3 app/index.html
  4. +9 −13 app/index.max.html
  5. +22 −0 app/module/blend/blend-merger.json
  6. +26 −0 app/module/blend/merger.html
  7. +2 −2 app/module/chromakey/chromakey-effect.html
  8. +4 −0 app/module/filter/filter.json
  9. 0 app/module/overlay/{direction-merger.json → center-merger.json}
  10. +2 −2 app/module/overlay/merger.html
  11. +7 −14 app/module/pan/scaler.html
  12. +9 −9 app/module/pan/scaler.json
  13. +1 −1 app/module/scale/scaler.html
  14. +5 −5 app/module/text/effect.html
  15. +5 −5 app/module/text/theme.html
  16. +6 −4 app/views/browser/clip.html
  17. +10 −0 app/views/browser/volume.html
  18. +1 −1 app/views/inspector/gain.html
  19. +17 −22 app/views/panels.html
  20. +4 −3 app/views/timeline/clip.html
  21. +5 −3 bower.json
  22. +20 −0 bower_components/angular-animate/.bower.json
  23. +21 −0 bower_components/angular-animate/LICENSE.md
  24. +68 −0 bower_components/angular-animate/README.md
  25. +4,148 −0 bower_components/angular-animate/angular-animate.js
  26. +56 −0 bower_components/angular-animate/angular-animate.min.js
  27. +8 −0 bower_components/angular-animate/angular-animate.min.js.map
  28. +10 −0 bower_components/angular-animate/bower.json
  29. +2 −0 bower_components/angular-animate/index.js
  30. +33 −0 bower_components/angular-animate/package.json
  31. +31 −0 bower_components/angular-bootstrap/.bower.json
  32. +1 −0 bower_components/angular-bootstrap/.gitignore
  33. +1 −0 bower_components/angular-bootstrap/.npmignore
  34. +120 −0 bower_components/angular-bootstrap/README.md
  35. +19 −0 bower_components/angular-bootstrap/bower.json
  36. +2 −0 bower_components/angular-bootstrap/index.js
  37. +23 −0 bower_components/angular-bootstrap/package.json
  38. +115 −0 bower_components/angular-bootstrap/ui-bootstrap-csp.css
  39. +7,347 −0 bower_components/angular-bootstrap/ui-bootstrap-tpls.js
  40. +10 −0 bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
  41. +6,924 −0 bower_components/angular-bootstrap/ui-bootstrap.js
  42. +10 −0 bower_components/angular-bootstrap/ui-bootstrap.min.js
  43. +13 −0 bower_components/angular-file-upload/.babelrc
  44. +4 −4 bower_components/angular-file-upload/.bower.json
  45. +15 −0 bower_components/angular-file-upload/README.md
  46. +1 −4 bower_components/angular-file-upload/WebpackConfig.js
  47. +1,165 −1,276 bower_components/angular-file-upload/dist/angular-file-upload.js
  48. +1 −1 bower_components/angular-file-upload/dist/angular-file-upload.js.map
  49. +2 −2 bower_components/angular-file-upload/dist/angular-file-upload.min.js
  50. +1 −1 bower_components/angular-file-upload/dist/angular-file-upload.min.js.map
  51. +1 −1 bower_components/angular-file-upload/package.json
  52. +1 −1 bower_components/angular-file-upload/src/services/FileItem.js
  53. +20 −8 bower_components/angular-file-upload/src/services/FileUploader.js
  54. +5 −5 bower_components/angular-resource/.bower.json
  55. +21 −0 bower_components/angular-resource/LICENSE.md
  56. +1 −1 bower_components/angular-resource/angular-resource.js
  57. +1 −1 bower_components/angular-resource/angular-resource.min.js
  58. +2 −2 bower_components/angular-resource/bower.json
  59. +9 −2 bower_components/angular-resource/package.json
  60. +4 −4 bower_components/angular/.bower.json
  61. +21 −0 bower_components/angular/LICENSE.md
  62. +260 −105 bower_components/angular/angular.js
  63. +299 −297 bower_components/angular/angular.min.js
  64. BIN bower_components/angular/angular.min.js.gzip
  65. +3 −3 bower_components/angular/angular.min.js.map
  66. +1 −1 bower_components/angular/bower.json
  67. +1 −1 bower_components/angular/package.json
  68. +10 −13 bower_components/bootstrap/.bower.json
  69. +5 −0 bower_components/bootstrap/CHANGELOG.md
  70. +165 −112 bower_components/bootstrap/Gruntfile.js
  71. +1 −1 bower_components/bootstrap/LICENSE
  72. +52 −40 bower_components/bootstrap/README.md
  73. +5 −9 bower_components/bootstrap/bower.json
  74. +204 −59 bower_components/bootstrap/dist/css/bootstrap-theme.css
  75. +1 −1 bower_components/bootstrap/dist/css/bootstrap-theme.css.map
  76. +4 −3 bower_components/bootstrap/dist/css/bootstrap-theme.min.css
  77. +1 −0 bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map
  78. +879 −322 bower_components/bootstrap/dist/css/bootstrap.css
  79. +1 −1 bower_components/bootstrap/dist/css/bootstrap.css.map
  80. +4 −3 bower_components/bootstrap/dist/css/bootstrap.min.css
  81. +1 −0 bower_components/bootstrap/dist/css/bootstrap.min.css.map
  82. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
  83. +272 −213 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
  84. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
  85. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
  86. BIN bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
  87. +531 −282 bower_components/bootstrap/dist/js/bootstrap.js
  88. +5 −4 bower_components/bootstrap/dist/js/bootstrap.min.js
  89. +13 −0 bower_components/bootstrap/dist/js/npm.js
  90. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot
  91. +272 −213 bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
  92. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
  93. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff
  94. BIN bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2
  95. +7 −0 bower_components/bootstrap/grunt/.jshintrc
  96. +30 −0 bower_components/bootstrap/grunt/bs-commonjs-generator.js
  97. +5 −4 bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js
  98. +13 −12 bower_components/bootstrap/grunt/bs-lessdoc-parser.js
  99. +6 −8 bower_components/bootstrap/grunt/bs-raw-files-generator.js
  100. +46 −0 bower_components/bootstrap/grunt/configBridge.json
  101. +5 −5 bower_components/bootstrap/grunt/sauce_browsers.yml
  102. +42 −0 bower_components/bootstrap/js/.jscsrc
  103. +15 −0 bower_components/bootstrap/js/.jshintrc
  104. +46 −26 bower_components/bootstrap/js/affix.js
  105. +7 −5 bower_components/bootstrap/js/alert.js
  106. +27 −17 bower_components/bootstrap/js/button.js
  107. +35 −21 bower_components/bootstrap/js/carousel.js
  108. +68 −27 bower_components/bootstrap/js/collapse.js
  109. +55 −41 bower_components/bootstrap/js/dropdown.js
  110. +88 −31 bower_components/bootstrap/js/modal.js
  111. +5 −10 bower_components/bootstrap/js/popover.js
  112. +28 −26 bower_components/bootstrap/js/scrollspy.js
  113. +45 −18 bower_components/bootstrap/js/tab.js
  114. +111 −54 bower_components/bootstrap/js/tooltip.js
  115. +2 −2 bower_components/bootstrap/js/transition.js
  116. +304 −0 bower_components/bootstrap/less/.csscomb.json
  117. +19 −0 bower_components/bootstrap/less/.csslintrc
  118. +5 −0 bower_components/bootstrap/less/alerts.less
  119. +14 −3 bower_components/bootstrap/less/badges.less
  120. +6 −0 bower_components/bootstrap/less/bootstrap.less
  121. +21 −17 bower_components/bootstrap/less/button-groups.less
  122. +19 −10 bower_components/bootstrap/less/buttons.less
  123. +34 −7 bower_components/bootstrap/less/carousel.less
  124. +1 −0 bower_components/bootstrap/less/close.less
  125. +1 −0 bower_components/bootstrap/less/code.less
  126. +3 −1 bower_components/bootstrap/less/component-animations.less
  127. +9 −8 bower_components/bootstrap/less/dropdowns.less
  128. +123 −50 bower_components/bootstrap/less/forms.less
  129. +75 −3 bower_components/bootstrap/less/glyphicons.less
  130. +8 −3 bower_components/bootstrap/less/input-groups.less
  131. +10 −4 bower_components/bootstrap/less/jumbotron.less
  132. +10 −11 bower_components/bootstrap/less/list-group.less
  133. +40 −30 bower_components/bootstrap/less/media.less
  134. +1 −0 bower_components/bootstrap/less/mixins.less
  135. +2 −1 bower_components/bootstrap/less/mixins/background-variant.less
  136. +19 −4 bower_components/bootstrap/less/mixins/buttons.less
  137. +5 −1 bower_components/bootstrap/less/mixins/forms.less
  138. +4 −4 bower_components/bootstrap/less/mixins/grid-framework.less
  139. +4 −4 bower_components/bootstrap/less/mixins/grid.less
  140. +2 −2 bower_components/bootstrap/less/mixins/hide-text.less
  141. +0 −1 bower_components/bootstrap/less/mixins/image.less
  142. +1 −1 bower_components/bootstrap/less/mixins/labels.less
  143. +2 −1 bower_components/bootstrap/less/mixins/list-group.less
  144. +2 −1 bower_components/bootstrap/less/mixins/pagination.less
  145. +18 −0 bower_components/bootstrap/less/mixins/reset-text.less
  146. +1 −1 bower_components/bootstrap/less/mixins/responsive-visibility.less
  147. +2 −1 bower_components/bootstrap/less/mixins/text-emphasis.less
  148. +8 −5 bower_components/bootstrap/less/mixins/vendor-prefixes.less
  149. +3 −3 bower_components/bootstrap/less/modals.less
  150. +30 −25 bower_components/bootstrap/less/navbar.less
  151. +1 −1 bower_components/bootstrap/less/navs.less
  152. +12 −13 bower_components/bootstrap/less/normalize.less
  153. +1 −2 bower_components/bootstrap/less/pager.less
  154. +5 −4 bower_components/bootstrap/less/pagination.less
  155. +32 −4 bower_components/bootstrap/less/panels.less
  156. +5 −7 bower_components/bootstrap/less/popovers.less
  157. +96 −96 bower_components/bootstrap/less/print.less
  158. +1 −19 bower_components/bootstrap/less/progress-bars.less
  159. +10 −9 bower_components/bootstrap/less/responsive-embed.less
  160. +12 −1 bower_components/bootstrap/less/scaffolding.less
  161. +14 −13 bower_components/bootstrap/less/tables.less
  162. +49 −16 bower_components/bootstrap/less/theme.less
  163. +1 −1 bower_components/bootstrap/less/thumbnails.less
  164. +13 −7 bower_components/bootstrap/less/tooltip.less
  165. +2 −13 bower_components/bootstrap/less/type.less
  166. +0 −2 bower_components/bootstrap/less/utilities.less
  167. +44 −21 bower_components/bootstrap/less/variables.less
  168. +8 −0 bower_components/bootstrap/nuget/MyGet.ps1
  169. +28 −0 bower_components/bootstrap/nuget/bootstrap.less.nuspec
  170. +28 −0 bower_components/bootstrap/nuget/bootstrap.nuspec
  171. +32 −0 bower_components/bootstrap/package.js
  172. +44 −38 bower_components/bootstrap/package.json
  173. +5 −5 bower_components/moviemasher.js/.bower.json
  174. +6 −0 bower_components/moviemasher.js/Changelog
  175. +1 −1 bower_components/moviemasher.js/bower.json
  176. +17 −0 bower_components/moviemasher.js/dist/filters/blend.js
  177. +1 −0 bower_components/moviemasher.js/dist/filters/blend.min.js
  178. +0 −1 bower_components/moviemasher.js/dist/filters/color.js
  179. +0 −3 bower_components/moviemasher.js/dist/filters/crop.js
  180. +0 −1 bower_components/moviemasher.js/dist/filters/drawbox.js
  181. +175 −76 bower_components/moviemasher.js/dist/moviemasher.js
  182. +3 −2 bower_components/moviemasher.js/dist/moviemasher.min.js
  183. +1 −1 bower_components/moviemasher.js/package.json
  184. +17 −0 bower_components/moviemasher.js/src/filters/blend.js
  185. +0 −1 bower_components/moviemasher.js/src/filters/color.js
  186. +0 −3 bower_components/moviemasher.js/src/filters/crop.js
  187. +0 −1 bower_components/moviemasher.js/src/filters/drawbox.js
  188. +1 −1 bower_components/moviemasher.js/src/moviemasher.js
  189. +7 −4 bower_components/moviemasher.js/src/others/audio.js
  190. +1 −1 bower_components/moviemasher.js/src/others/colors.js
  191. +78 −3 bower_components/moviemasher.js/src/others/constant.js
  192. +6 −5 bower_components/moviemasher.js/src/others/mash.js
  193. +66 −48 bower_components/moviemasher.js/src/others/player.js
  194. +10 −11 bower_components/moviemasher.js/src/others/time.js
  195. +5 −2 bower_components/moviemasher.js/src/others/util.js
  196. +3 −4 config/aws/moviemasher.ini
  197. +2 −1 config/docker/development/docker-compose.yml
  198. +3 −4 config/docker/moviemasher.ini
  199. +28 −30 dist/angular-moviemasher.js
  200. +1 −1 dist/angular-moviemasher.min.js
  201. +1 −1 package.json
  202. +27 −29 src/angular-moviemasher.js
View
@@ -2,6 +2,15 @@
version <future>:
- freeze frame
+version 1.0.14:
+ - new blend merger with support for compositing blend modes
+ - added angular-bootstrap and angular-animate dependencies
+ - fixed issues related to crossorigin images used in icons
+ - reimplemented volume slider as pop up
+ - removed experimental flag from export_audio_codec option
+ - removed preset switch from export_video_codec option
+ - better styling of player sliders
+
version 1.0.13:
- fixed paths in index.max.html
- mount all of moviemasher.js in development container
View
@@ -51,21 +51,29 @@
overflow-y: auto;
-webkit-overflow-y-scrolling: none;
}
-.amm-browser-media {
+.amm-browser-media-container {
display:inline-block;
position:relative;
- margin: 20px 0px 0px 20px;
- width: 142px; /* browser-media-icon.width + 2 * border */
- height: 76px; /* browser-media-icon.height + 2 * border */
- background-color: lightgray;
+ margin: 20px 0px 0px 20px;
+ width: 142px; /* browser-media-icon.width + 2 * border */
+ height: 76px; /* browser-media-icon.height + 2 * border */
+}
+.amm-browser-media {
+ display:inline-block;
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
border-radius: 6px;
border: solid 2px gray;
+ background-color: lightgray;
box-shadow: 2px 2px 4px #333333;
}
.amm-browser-media:hover {
border: solid 2px lightgray;
}
-.amm-browser-media-label {
+.amm-timeline-clip-label {
background-color: rgba(255,255,255,0.5);
color: #333333;
padding: 5px;
@@ -80,13 +88,34 @@
white-space: nowrap;
text-overflow: ellipsis;
}
+.amm-browser-media-label {
+ background-color: rgba(255,255,255,0.5);
+ color: #333333;
+ padding: 5px;
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ border-bottom-right-radius: 6px;
+ border-bottom-left-radius: 6px;
+ border-top: solid 1px gray;
+ overflow-x:hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
.amm-browser-media-icon {
display:inline-block;
- width: 138px; /* should be divisor of player.width */
- height: 72px; /* should be divisor of player.height */
+ width: 138px; /* should be divisor of player.width */
+ height: 72px; /* should be divisor of player.height */
+ border-radius: 6px;
+ overflow: hidden;
+}
+.amm-browser-media-icon > img {
+ width: 142px;
+ height: 76px;
border-radius: 6px;
- background-size: cover;
- background-position:center;
+ border: solid 2px transparent;
+ margin: -2px;
}
.amm-inspector {
overflow: auto;
@@ -134,7 +163,6 @@
left:0px;
bottom:0px;
}
-
amm-timeline-track-controls {
position:absolute;
width: 100px;
@@ -155,8 +183,9 @@ amm-timeline-track.amm-drop-dragover {
}
amm-timeline-track {
height: 64px;
- padding:2px;
+ padding:1px;
display:block;
+ border: 1px solid transparent;
}
.amm-border-bottom {
border-bottom: 1px solid lightgray;
@@ -189,7 +218,6 @@ amm-timeline-track-controls amm-timeline-track {
border: 2px solid rgba(20,20,20,0.6);
border-radius: inherit;
}
-
amm-timeline-ruler,
amm-timeline-rule {
position: absolute;
@@ -254,9 +282,8 @@ amm-timeline-rule-line {
}
.amm-timeline-clip {
display:inline-block;
- position:relative;
- height: 60px;
- background-color: lightgray;
+ height: 60px;
+ background-color: lightgray;
border-radius: 6px;
border: solid 2px gray;
overflow: hidden;
@@ -269,23 +296,11 @@ amm-timeline-rule-line {
width: 120px;
height: 60px;
border-radius: 6px;
- background-size: cover;
- background-position:center;
+ overflow: hidden;
}
-.amm-timeline-clip-label {
- background-color: rgba(255,255,255,0.5);
- color: #333333;
- padding: 5px;
- position:absolute;
- right:0px;
- left:0px;
- bottom:0px;
- border-bottom-right-radius: 6px;
- border-bottom-left-radius: 6px;
- border-top: solid 1px gray;
- overflow-x:hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+.amm-timeline-clip-icon > img {
+ max-height: 60px;
+ width: 100%;
}
.amm-container{
position:relative;
@@ -300,7 +315,6 @@ amm-timeline-rule-line {
white-space: nowrap;
text-overflow: ellipsis;
overflow-x:hidden;
-
position: absolute;
height:34px;
line-height: 30px;
@@ -322,25 +336,21 @@ amm-timeline-rule-line {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
-
.amm-head select {
max-width: 180px;
}
.amm-foot input {
width: 50px;
}
-
.amm-selected {
border-color: #990000;
}
.amm-selected:hover {
border-color: #FF0000;
}
-
.amm-mouseless {
pointer-events: none;
}
-
.amm-colorpicker,
.amm-colorpicker-background,
.amm-colorpicker button {
@@ -369,13 +379,6 @@ amm-timeline-rule-line {
.colorpicker > .dropdown-menu {
min-width: 150px;
}
-.pixelated {
- image-rendering: -moz-crisp-edges;
- image-rendering: -o-crisp-edges;
- image-rendering: -webkit-optimize-contrast;
- -ms-interpolation-mode: nearest-neighbor;
-}
-
.amm-width100 {
width: 100%;
}
@@ -384,13 +387,10 @@ amm-timeline-rule-line {
overflow: hidden;
white-space: nowrap;
}
- /* clear: left;
- text-align: right;
-*/
-
.amm-error {
color: red;
width:200px;
+ height: 20px;
margin-left: 10px;
display: inline-block;
cursor: pointer;
@@ -399,9 +399,12 @@ amm-timeline-rule-line {
display:inline-block;
width:200px;
height:20px;
- padding-top:6px;
+ position: relative;
+ overflow: hidden;
+ padding-top:2px;
+ margin-top: -6px;
+ margin-bottom: -6px;
}
-
.amm-canvas-container {
position: absolute;
left: 0;
@@ -438,7 +441,6 @@ amm-timeline-rule-line {
padding: 3px;
margin-top:-3px;
}
-
.amm-inspector-row {
margin-bottom: 6px;
clear: right;
@@ -452,6 +454,7 @@ amm-timeline-rule-line {
.amm-inspector-row > select {
float: right;
width: 200px;
+ color: black;
}
.amm-inspector-row > input[type="range"],
.amm-inspector-row > input[type="text"],
@@ -462,3 +465,111 @@ amm-timeline-rule-line {
width: 80px;
}
+
+input[type=range].amm-pos {
+ -webkit-appearance: none;
+ width: 80px;
+ margin: -1px 0;
+ margin-left: 5px;
+}
+
+input[type=range].amm-pos:focus {
+ outline: none;
+}
+input[type=range].amm-pos::-webkit-slider-runnable-track {
+ width: 100%;
+ height: 11px;
+ cursor: pointer;
+ box-shadow: 2px 2px 2px rgba(54, 53, 56, 0.3), 0px 0px 2px rgba(67, 65, 69, 0.3);
+ background: rgba(0, 0, 0, 0.5);
+ border-radius: 2px;
+ border: 1px solid rgba(0, 0, 0, 0);
+}
+input[type=range].amm-pos::-webkit-slider-thumb {
+ box-shadow: 0px 0px 1px #670000, 0px 0px 0px #810000;
+ border: 0px solid #ff1e00;
+ height: 9px;
+ width: 20px;
+ border-radius: 2px;
+ background: #00ffff;
+ cursor: pointer;
+ -webkit-appearance: none;
+ margin-top: 0px;
+}
+input[type=range].amm-pos:focus::-webkit-slider-runnable-track {
+ background: rgba(38, 38, 38, 0.5);
+}
+input[type=range].amm-pos::-moz-range-track {
+ width: 100%;
+ height: 11px;
+ cursor: pointer;
+ box-shadow: 2px 2px 2px rgba(54, 53, 56, 0.3), 0px 0px 2px rgba(67, 65, 69, 0.3);
+ background: rgba(0, 0, 0, 0.5);
+ border-radius: 2px;
+ border: 1px solid rgba(0, 0, 0, 0);
+}
+input[type=range].amm-pos::-moz-range-thumb {
+ box-shadow: 0px 0px 1px #670000, 0px 0px 0px #810000;
+ border: 0px solid #ff1e00;
+ height: 9px;
+ width: 20px;
+ border-radius: 2px;
+ background: #00ffff;
+ cursor: pointer;
+}
+input[type=range].amm-pos::-ms-track {
+ width: 100%;
+ height: 11px;
+ cursor: pointer;
+ background: transparent;
+ border-color: transparent;
+ color: transparent;
+}
+input[type=range].amm-pos::-ms-fill-lower {
+ background: rgba(0, 0, 0, 0.5);
+ border: 1px solid rgba(0, 0, 0, 0);
+ border-radius: 4px;
+ box-shadow: 2px 2px 2px rgba(54, 53, 56, 0.3), 0px 0px 2px rgba(67, 65, 69, 0.3);
+}
+input[type=range].amm-pos::-ms-fill-upper {
+ background: rgba(0, 0, 0, 0.5);
+ border: 1px solid rgba(0, 0, 0, 0);
+ border-radius: 4px;
+ box-shadow: 2px 2px 2px rgba(54, 53, 56, 0.3), 0px 0px 2px rgba(67, 65, 69, 0.3);
+}
+input[type=range].amm-pos::-ms-thumb {
+ box-shadow: 0px 0px 1px #670000, 0px 0px 0px #810000;
+ border: 0px solid #ff1e00;
+ width: 20px;
+ border-radius: 2px;
+ background: #00ffff;
+ cursor: pointer;
+ height: 9px;
+}
+input[type=range].amm-pos:focus::-ms-fill-lower {
+ background: rgba(0, 0, 0, 0.5);
+}
+input[type=range].amm-pos:focus::-ms-fill-upper {
+ background: rgba(38, 38, 38, 0.5);
+}
+.amm-slider-vert-container > button {
+ position: absolute;
+ bottom: 10px;
+ left: 10px;
+}
+.amm-slider-vert-container {
+ display: inline-block;
+ width: 11px;
+ height: 100px;
+}
+input[type=range].amm-slider-vert {
+ width: 70px;
+ top: 14px;
+ right: 25px;
+ position: absolute;
+ transform: rotate(270deg);
+ transform-origin: 100% 0%;
+}
+
+button:focus {outline:0 !important;}
+
View
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
<html xmlns:ng="http://angularjs.org" lang="en">
<head>
<meta charset="utf-8">
@@ -7,15 +7,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>AngularJS Example :: Movie Masher</title>
<script src="../bower_components/angular/angular.min.js"></script>
+ <script src="../bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
+ <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+ <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
<script src="../bower_components/angular-resource/angular-resource.min.js"></script>
<script src="../bower_components/angular-file-upload/dist/angular-file-upload.min.js"></script>
<script src="../bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.js"></script>
<script src="../bower_components/opentype.js/dist/opentype.min.js"></script>
<script src="../bower_components/script.js/dist/script.min.js"></script>
<script src="../bower_components/moviemasher.js/dist/moviemasher.min.js"></script>
<script src="../dist/angular-moviemasher.min.js"></script>
- <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
- <link rel="stylesheet" href="../bower_components/angular-bootstrap-colorpicker/css/colorpicker.css">
+ <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" href="../bower_components/angular-bootstrap-colorpicker/css/colorpicker.min.css">
<link rel="stylesheet" href="app.css" />
</head>
<body ng-app='angular.moviemasher'>
Oops, something went wrong.

0 comments on commit ac147f9

Please sign in to comment.