mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3563 from RobLoach/fa-spin

Browse Source 
(Emscripten) Use Font Awesome's fa-spin class
This commit is contained in:
Andrés 2016-09-10 23:21:58 -05:00 committed by GitHub
commit 457ea6c77f
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/emscripten/proto.css
View File

@ -87,21 +87,6 @@ canvas.webplayer {
outline: none; outline: none;
} }
.fa.spinning {
animation: spin 1s infinite linear;
-webkit-animation: spin2 1s infinite linear;
}
@keyframes spin {
from { transform: scale(1) rotate(0deg); }
to { transform: scale(1) rotate(360deg); }
}
@-webkit-keyframes spin2 {
from { -webkit-transform: rotate(0deg); }
to { -webkit-transform: rotate(360deg); }
}
textarea { textarea {
font-family: monospace; font-family: monospace;
font-size: 0.7em; font-size: 0.7em;

2
pkg/emscripten/proto.html
View File

@ -107,7 +107,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12 form-group btn-group text-xs-center p-t-2" id="openrom"> <div class="col-sm-12 form-group btn-group text-xs-center p-t-2" id="openrom">
<button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()"> <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()">
<span class="fa fa-spinner spinning" id="icnRun"></span> Run <span class="fa fa-spinner fa-spin" id="icnRun"></span> Run
</button> </button>
<button class="btn btn-primary disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()"> <button class="btn btn-primary disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()">
<span class="fa fa-plus" id="icnAdd"></span> Add Content <span class="fa fa-plus" id="icnAdd"></span> Add Content

6
pkg/emscripten/proto.js
View File

@ -50,7 +50,7 @@ function dropboxInit()
document.getElementById('btnRun').disabled = true; document.getElementById('btnRun').disabled = true;
document.getElementById('btnDrop').disabled = true; document.getElementById('btnDrop').disabled = true;
$('#icnDrop').removeClass('fa-dropbox'); $('#icnDrop').removeClass('fa-dropbox');
$('#icnDrop').addClass('fa-spinner spinning'); $('#icnDrop').addClass('fa-spinner fa-spin');
client.authDriver(new Dropbox.AuthDriver.Redirect()); client.authDriver(new Dropbox.AuthDriver.Redirect());
@ -66,7 +66,7 @@ function dropboxInit()
function success() function success()
{ {
document.getElementById('btnRun').disabled = false; document.getElementById('btnRun').disabled = false;
$('#icnDrop').removeClass('fa-spinner spinning'); $('#icnDrop').removeClass('fa-spinner').removeClass('fa-spin');
$('#icnDrop').addClass('fa-check'); $('#icnDrop').addClass('fa-check');
console.log("WEBPLAYER: Sync successful"); console.log("WEBPLAYER: Sync successful");
setupFileSystem("dropbox"); setupFileSystem("dropbox");
@ -311,7 +311,7 @@ $(function() {
// Activate the Start RetroArch button. // Activate the Start RetroArch button.
$('#btnRun').removeClass('disabled'); $('#btnRun').removeClass('disabled');
$('#icnRun').removeClass('fa-spinner spinning'); $('#icnRun').removeClass('fa-spinner').removeClass('fa-spin');
$('#icnRun').addClass('fa-play'); $('#icnRun').addClass('fa-play');
if (localStorage.getItem("backend") == "dropbox") if (localStorage.getItem("backend") == "dropbox")