[ARVADOS] updated: caf3ebfb538efbfc0b2e3b360186d68bdb78b744

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/stylesheets/application.css.scss | 8 --------
 apps/workbench/app/views/projects/show.html.erb            | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

       via  caf3ebfb538efbfc0b2e3b360186d68bdb78b744 (commit)
      from  1701a77ed3bfbdf226d5877153f0ec393a8ec2e7 (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 caf3ebfb538efbfc0b2e3b360186d68bdb78b744
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Dec 4 16:00:03 2014 -0500

    3781: Fix up dropdown: match appearance of other buttons, tweak wording,
    remove min-width style (which was added for clippy, but has been
    affecting all dropdowns).

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index e814832..cd862e0 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -204,14 +204,6 @@ table.table-fixed-header-row tbody {
     top:1.5em;
 }
 
-/* Setting the height needs to be fixed with javascript. */
-.dropdown-menu {
-    padding-right: 20px;
-    max-height: 440px;
-    width: 400px;
-    overflow-y: auto;
-}
-
 .row-fill-height, .row-fill-height>div[class*='col-'] {
     display: flex;
 }
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 02e34d8..070a2a1 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -7,8 +7,8 @@
 <% content_for :tab_line_buttons do %>
   <% if @object.editable? %>
     <div class="btn-group btn-group-sm">
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Add data <span class="caret"></span></button>
-      <ul class="dropdown-menu" role="menu">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-plus"></i> Add data <span class="caret"></span></button>
+      <ul class="dropdown-menu pull-right" role="menu">
         <li>
           <%= link_to(
                 choose_collections_path(
@@ -19,7 +19,7 @@
                   action_method: 'post',
                   action_data: {selection_param: 'selection[]', copy_selections_into_project: @object.uuid, success: 'page-refresh'}.to_json),
                 { remote: true, title: "Copy a collection from another project into this one", data: {'event-after-select' => 'page-refresh', 'toggle' => 'dropdown'} }) do %>
-            <i class="fa fa-fw fa-clipboard"></i> ...from a different project
+            <i class="fa fa-fw fa-clipboard"></i> Copy data from a different project
           <% end %>
         </li>
         <li>
@@ -27,7 +27,7 @@
               method: 'post',
               title: "Upload files into a new collection",
               data: {toggle: 'dropdown'}}) do %>
-            <i class="fa fa-fw fa-upload"></i> ...from your computer
+            <i class="fa fa-fw fa-upload"></i> Upload files from my computer
           <% end %>
         </li>
       </ul>

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


hooks/post-receive
--