Minor Fixes, Removed LiceCap Gif page

jchu634 · Mar 4, 2023 · 3f1112f · 3f1112f
1 parent 802f018
commit 3f1112f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 41 deletions.
diff --git a/application/css/loopy.css b/application/css/loopy.css
@@ -162,7 +162,7 @@ div[big=yes] .play_button_label{
 	background: #222;
 	color: #777;
 }
-#sidebar .mini_button{
+#sidebar .mini_button:not(.disabled){
 	background: #999;
 	color: #fff;
 	padding: 3px 5px;
@@ -171,14 +171,27 @@ div[big=yes] .play_button_label{
 
 	cursor: pointer;
 }
-#sidebar .mini_button:hover{
+#sidebar .mini_button[disabled='true']{
+	background: #555;
+	color: #fff;
+	padding: 3px 5px;
+	border-radius: 2px;
+	font-size: 16px;
+
+	cursor: pointer;
+}
+#sidebar .mini_button:not([disabled='true']):hover{
 	background: #aaa;
 }
-#sidebar[mode=play] .mini_button{
+#sidebar[mode=play] .mini_button:not([disabled='true']){
+	background: #999;
+	color: #111;
+}
+#sidebar[mode=play] .mini_button.disabled{
 	background: #555;
 	color: #111;
 }
-#sidebar[mode=play] .mini_button:hover{
+#sidebar[mode=play] .mini_button:not([disabled='true']):hover{
 	background: #666;
 }
 #sidebar a{ color: #777; }
@@ -265,7 +278,21 @@ div[big=yes] .play_button_label{
 	background: #333;
 }
 
+/*********
 
+GifEncode Progress Bar
+
+**********/
+#gif_progress {
+	width: 100%;
+	background-color: grey;
+}
+
+#gif_bar {
+	width: 1%;
+	height: 30px;
+	background-color: green;
+}
 
 /**********
 

diff --git a/application/js/Modal.js b/application/js/Modal.js
@@ -242,20 +242,6 @@ function Modal(loopy){
 
 	})();
 
-	// GIF
-	(function(){
-		var page = new Page();
-		page.width = 530;
-		page.height = 400;
-		page.addComponent(new ModalIframe({
-			page: page,
-			src: "pages/gif.html",
-			width: 500,
-			height: 350
-		}))
-		self.addPage("save_gif", page);
-	})();
-
 }
 
 function ModalIframe(config){

diff --git a/application/js/Sidebar.js b/application/js/Sidebar.js
@@ -176,7 +176,6 @@ function Sidebar(loopy){
 			"<span class='mini_button' onclick='publish(\"export/file\")'>save as file</span> "+
 			"<span class='mini_button' onclick='publish(\"import/file\")'>load from file</span> <br><br>"+
 			"<span class='mini_button' onclick='publish(\"modal\",[\"embed\"])'>embed in your website</span> <br><br>"+
-			"<span class='mini_button' onclick='publish(\"modal\",[\"save_gif\"])'>make a GIF using LICEcap</span> <br><br>"+
 			"<span class='mini_button' onclick='toggleRecording(this)' id='record'>Start Recording GIF</span> <br><br>"+
 			"<span class='mini_button'disabled='true' onclick='download()' id='download'>Download GIF</span> <br><br>"+
 			"<div id='gif_progress' style='display:none'><div id='gif_bar'></div></div>"+

diff --git a/application/pages/gif.html b/application/pages/gif.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "loopy-electron",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "description": "Loopy made into an Electron app",
     "main": "main.js",
     "author": "Nicky Case, Joshua Chung",