[ARVADOS] updated: be60b02bc5c56afaaec808d9e259eba51d951998

git at public.curoverse.com git at public.curoverse.com
Tue Feb 25 13:49:26 EST 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |   55 ++++++++++++++++++++
 .../app/assets/stylesheets/application.css.scss    |   18 ++++++
 apps/workbench/app/assets/stylesheets/loading.css  |   29 +++++-----
 .../app/controllers/application_controller.rb      |    4 +-
 .../app/controllers/collections_controller.rb      |    4 +-
 .../app/views/collections/_index_tbody.html.erb    |   21 +++++--
 .../app/views/collections/_show_recent.html.erb    |    6 +-
 7 files changed, 111 insertions(+), 26 deletions(-)

       via  be60b02bc5c56afaaec808d9e259eba51d951998 (commit)
       via  324dc9f33d95cdeacf23c0570607900be945d20f (commit)
       via  e76ee382d79d6726dcf6315dbae0e0f5aef09a86 (commit)
       via  b8ee617ec8af73120b427f7591744d0f4883a63f (commit)
       via  00af5ad16232b856ef1f3620a4f62f0946c681a7 (commit)
       via  6812b3350f48ed977ea2e3e788e49e1008a3b244 (commit)
       via  78a1683680177da480dc3ffaea2d4f2b79ab793d (commit)
       via  50567a15ccfdc5e73289227e343bfce946974ecd (commit)
       via  603517c58cb2a57961de70c7b67f9856206515da (commit)
       via  a23b909256ae2ee222036d91d6e46faccfe13542 (commit)
       via  3c6f8001fb5d63ef92da36e662ac58396f18a9d0 (commit)
       via  6ecd3b6f76a1dbb39a56fc81d306969dc0a3f6af (commit)
       via  7024cc159936593350aaf7939d700102f6510787 (commit)
       via  579300424ef50990ff9414f2eabf8f371f278d99 (commit)
      from  c315a459778181e207034ae5385fdf34fec51fa7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit be60b02bc5c56afaaec808d9e259eba51d951998
Merge: 324dc9f e76ee38
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 25 10:48:08 2014 -0800

    Merge branch '2060-edit-tags-in-workbench'
    
    closes #2060
    closes #1981


commit 324dc9f33d95cdeacf23c0570607900be945d20f
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 25 10:46:11 2014 -0800

    Turn off CSS animation on loading graphic; make it red instead.

diff --git a/apps/workbench/app/assets/stylesheets/loading.css b/apps/workbench/app/assets/stylesheets/loading.css
index 7a0736a..640f702 100644
--- a/apps/workbench/app/assets/stylesheets/loading.css
+++ b/apps/workbench/app/assets/stylesheets/loading.css
@@ -3,21 +3,22 @@
 }
 
 .rotating {
-    animation-name: rotateThis;
-    animation-duration: 2s;
-    animation-iteration-count: infinite;
-    animation-timing-function: linear;
-    -moz-animation-name: rotateThis;
-    -moz-animation-duration: 2s;
-    -moz-animation-iteration-count: infinite;
-    -moz-animation-timing-function: linear;
-    -ms-animation-name: rotateThis;
-    -ms-animation-duration: 2s;
-    -ms-animation-iteration-count: infinite;
-    -ms-animation-timing-function: linear;
-    /* Chrome, at least in Linux, renders a horrible shaky mess -- better
-       not to bother.
+    color: #f00;
+    /* Chrome and Firefox, at least in Linux, render a horrible shaky
+       mess -- better not to bother.
 
+      animation-name: rotateThis;
+      animation-duration: 2s;
+      animation-iteration-count: infinite;
+      animation-timing-function: linear;
+      -moz-animation-name: rotateThis;
+      -moz-animation-duration: 2s;
+      -moz-animation-iteration-count: infinite;
+      -moz-animation-timing-function: linear;
+      -ms-animation-name: rotateThis;
+      -ms-animation-duration: 2s;
+      -ms-animation-iteration-count: infinite;
+      -ms-animation-timing-function: linear;
       -webkit-animation-name: rotateThis;
       -webkit-animation-duration: 2s;
       -webkit-animation-iteration-count: infinite;

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list