From 58e73435d3a91a39e5941247bfdb240bea231ae2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 23 Nov 2014 02:36:50 -0800 Subject: [PATCH] GUAC-932: Replace green spinner with spinning cog. --- .../main/webapp/app/index/styles/loading.css | 71 ++++++++++++++++++ .../src/main/webapp/app/index/styles/ui.css | 11 --- guacamole/src/main/webapp/images/cog.png | Bin 0 -> 4651 bytes guacamole/src/main/webapp/images/spinner.gif | Bin 1924 -> 0 bytes 4 files changed, 71 insertions(+), 11 deletions(-) create mode 100644 guacamole/src/main/webapp/app/index/styles/loading.css create mode 100644 guacamole/src/main/webapp/images/cog.png delete mode 100644 guacamole/src/main/webapp/images/spinner.gif diff --git a/guacamole/src/main/webapp/app/index/styles/loading.css b/guacamole/src/main/webapp/app/index/styles/loading.css new file mode 100644 index 000000000..159cace25 --- /dev/null +++ b/guacamole/src/main/webapp/app/index/styles/loading.css @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2013 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +.loading { + position: relative; + min-height: 200px; +} + +.loading * { + visibility: hidden; +} + +.loading::before { + + display: block; + position: absolute; + content: ''; + + /* Dictated by size of image */ + width: 96px; + height: 96px; + margin-left: -48px; + margin-top: -48px; + + top: 50%; + left: 50%; + + background-image: url('images/cog.png'); + background-size: 96px 96px; + background-position: center center; + background-repeat: no-repeat; + + animation: spinning-cog 4s linear infinite; + -moz-animation: spinning-cog 4s linear infinite; + -webkit-animation: spinning-cog 4s linear infinite; + +} + +@keyframes spinning-cog { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +@-moz-keyframes spinning-cog { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +@-webkit-keyframes spinning-cog { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} diff --git a/guacamole/src/main/webapp/app/index/styles/ui.css b/guacamole/src/main/webapp/app/index/styles/ui.css index 3b2513a20..211a46bfa 100644 --- a/guacamole/src/main/webapp/app/index/styles/ui.css +++ b/guacamole/src/main/webapp/app/index/styles/ui.css @@ -423,14 +423,3 @@ div.logout-panel { .button.back { background-image: url('images/action-icons/guac-back.png'); } - -.loading { - background-image: url(images/spinner.gif); - background-position: center; - background-repeat: no-repeat; - min-height: 200px; -} - -.loading * { - visibility: hidden; -} \ No newline at end of file diff --git a/guacamole/src/main/webapp/images/cog.png b/guacamole/src/main/webapp/images/cog.png new file mode 100644 index 0000000000000000000000000000000000000000..f5eb681a05fc5316a82bcb5bcf3f262f80c21b1a GIT binary patch literal 4651 zcmZ`-X*3i7*Pa;@#+I>f!`KaC?2%=%Z-a)hgb-6ml6^NMB*qx~z9dV?R-|N$v1TfS z6hgLSCrak?zUTY<{dpQ8Apiih z!$kk8P3V_jMP81MMxPSy)#JrbjBL5Moh=Vz&4z}MGpc-UyQWEphwf$*?7_oe)&ekT z<-xCMUb=CkZ$YY)`{|4`=F=p z7I;q6&z7Ej5s7{LcZ5UZ*x<-fhwT_Cg(`6Fw|_zruu`xUsE^BFrAYI3aXFi7@b8$> zAXFrTSiZ68fW?^NtIJk)W=Rv7fR;Oen|HyBrg#A}i;^~d3kdSfUmdaryclfUxN(|S zyW4U3u_SQVqew@|%;CIA3vV@q6TpL3&@kVJDQs{CV)JJO#Wz7 z^RX#@<{PzX0=WBnS*me}`5I=`IG_iqZN`L)pi_{nNE=r7Ht+2}QcB71`LZ{lTuA@V3YdBPKH|D);yz{YL`T}Jl z%2SF+UvsRJ_fYk2`115EaosuWHWUF1>-nIR5%+Nw!!rbfl^O_aDPp8*rb{ zq#w3-QNC6nfJ+E8{V0a(JO2fY^w~@$%Cui+mczK__;vvZ!AbS8hCf{_xyw*tbJ~KA z%}kDIMG!H&6x9nJeJ{!vxrr0WqweA#Y{Lw2SRDO_)R2ft6ta>Z2BLqvX|CsKZ8GDn z0)jeR6Yox8M?G^qCPuGqtQi*ilMz);iZ}a`%nVV<$_Pw_afavssQm-h{P5|s^iOdq z%yd8rfsaeX44IrA(ujO?wm3!6AX}G|B2sxx9O9?6U~r|a*9 zXix|kU;^EFp}mZMAoHo^ZGI{X3{H`*1r;TZB6n<*mmnmDEp0W>PPXGjf8htVJF)ue z^SfpT%77P965UBrbIIAhA?qYuMo`JcM{(NN>w)d3W~-eZXh5tmU_N9+o1HYH~u3>*8LUQ6=sUwhsqx*A>GZn3TykSufh1b z4;@87%ge61JjgPmG!juYYQQZMg1qUxY=2-qcwL$KGMp0Eo#8TgB$gr3P2?wpkmIS1 z{JrrR3e02^ylMj#Q)jIoO zgL}M+6^pWGv)lNSGGHMW>T$o<{r38-d)VudM5O?N@#j@Zqp~?L@5&$vN03E&bQ6VX z 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 Q)(*hLz(W7Iu4~-?0h>T@mjD0& literal 0 HcmV?d00001 diff --git a/guacamole/src/main/webapp/images/spinner.gif b/guacamole/src/main/webapp/images/spinner.gif deleted file mode 100644 index 48f9928b5956cdc3eb7f69a92dcd19a19f1bbbde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1924 zcmciDSx{3~90u?RH>$=Sx5pEl!}Qm1Op}@wBiC-99$q24Fm*1s0L(_HEh9z zEI67j|{yVeg| z=h~qx%6FjIxn_PGd+V;iq^~J zQkg&)E*4l7m-O_lb*Q&0a~Qiot!CWEH<6~;b;RjY4~c60#Ivpu?!3-O)Gha!h{Sb? z>-UeYC zPXn_uP%$BnsZ;=hX3>i%C0=|1facN*sl4(4UnmQjYy~ZZC~A~V%_@>9h9-mnfzQOl zBtS=y4?!(~W3SoYA>S40N3a$4TEWo$YQk+vAE&dZ+qcKMwaq}AR1PnVD__2zZuxP? zy28=_LP*`uTL^s|@@a+*%Qpv|N6SZM(TmY(G=8#Bv~~~=fgxlFI5vO;W>sTL@G@fn zo~MaQii&xw6$oY%8mY~}avPHvWsHH2XhjS)Li9A42GDT^H1Oo_$cEYE$E`D*hnh#6 zQRTR(fAA%4UEh0yCbIG0H~0@ekm=9G2r3yNgvlvYt^v5~bpYIzjZslTy|C?M&1r0N z-K|))U9GAiR*AbISD;LZ_)29%)?n5H;XOG-)IO&Y%~GEUjRAOJ-at~(QQxD+EImSIOiWmqkB$aUDx2#RjNL$#0@&GsVo&Gs?%l4`Mi;rYt? zW9EY!Oye?~uiozpqi19W2Qu7Xjm>T;+i9OWV?X;L)jj-V6w4~@K}V9y)<*(A-HeTN z@%e3hV9=MrCzywF@(T)!ii1rZ@Q~mbvbm6cB*ls!1i5|=9Yrtms0pvTh^nT_X`H=i zXuUb~n9LSh4e1v3zq=~7_c)B;+A0|e&-0{C{1kB-J3%tw$B1*o`SSx$wND0@UQFtY OK*AP~``R67T7Ll4`y{ad