From 3f1112f9bcb194b35ab9526829891815c87e31b4 Mon Sep 17 00:00:00 2001 From: JCHU634 <87676426+jchu634@users.noreply.github.com> Date: Sun, 5 Mar 2023 00:13:30 +1300 Subject: [PATCH] Minor Fixes, Removed LiceCap Gif page --- application/css/loopy.css | 35 +++++++++++++++++++++++++++++++---- application/js/Modal.js | 14 -------------- application/js/Sidebar.js | 1 - application/pages/gif.html | 21 --------------------- package.json | 2 +- 5 files changed, 32 insertions(+), 41 deletions(-) delete mode 100644 application/pages/gif.html diff --git a/application/css/loopy.css b/application/css/loopy.css index 0f70fa7..acc4000 100644 --- 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 index f462d7d..afccbb6 100644 --- 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 index f692385..795a4a3 100644 --- a/application/js/Sidebar.js +++ b/application/js/Sidebar.js @@ -176,7 +176,6 @@ function Sidebar(loopy){ "save as file "+ "load from file

"+ "embed in your website

"+ - "make a GIF using LICEcap

"+ "Start Recording GIF

"+ "Download GIF

"+ ""+ diff --git a/application/pages/gif.html b/application/pages/gif.html deleted file mode 100644 index f1faf02..0000000 --- a/application/pages/gif.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Step 1: download LICEcap, - a free open-source tool to record GIFs (Windows/Mac only. Linux users, try - Peek) -

- Step 2: record a GIF while playing around in LOOPY -

- Step 3: ta-dah -

-
- -
- - \ No newline at end of file diff --git a/package.json b/package.json index 4786517..fdc8035 100644 --- 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",