Merge pull request #6 from ramj-funtoot/code-merge#1

Code merge#1 - merged with Siva's changes
sivashanmugam-funtoot · Jul 19, 2018 · 26e4978 · 26e4978
2 parents ef77799 + be9373f
commit 26e4978
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 17 deletions.
diff --git a/editor/controllers/mtf-controller.js b/editor/controllers/mtf-controller.js
diff --git a/editor/styles/style.css b/editor/styles/style.css
@@ -201,4 +201,43 @@ td.mtf-pair-td{
 td.mtf-pair-destractor-td{
  border-left: 0px none !important;
   border-right: 0px none;
+}
+
+/* options */
+
+.mtf-options .selected-media-container {
+ margin-left:2%;
+}
+
+.mtf-options .selected-image-container {
+ float: left;
+ margin-right: 2%;
+ width: 46%;
+}
+
+.mtf-options .selected-audio-container {
+ float: left;
+ margin-right: 2%;
+ width: 46%;
+}
+
+.mtf-options .imgWidth{
+ width:100%;
+}
+
+.mtf-options .auto-play-container {
+ text-align: right;
+}
+
+.mtf-options .audio-container {
+ width: 80%;
+}
+
+.mtf-options .selected-audio {
+ max-width: 100%;
+ display:none;
+}
+
+.mtf-options .delete-media-container {
+ width: 20%;
 }
diff --git a/renderer/js/mtftemplate.js b/renderer/js/mtftemplate.js