[ARVADOS] updated: 79577fec16a8f43c0d00ce693e06fcd3770bf2bf
git at public.curoverse.com
git at public.curoverse.com
Tue Aug 26 01:49:09 EDT 2014
Summary of changes:
.../assets/stylesheets/pipeline_instances.css.scss | 20 ++++++++++++++++++++
.../views/pipeline_instances/_show_compare.html.erb | 17 ++---------------
.../views/pipeline_instances/_show_graph.html.erb | 11 -----------
3 files changed, 22 insertions(+), 26 deletions(-)
via 79577fec16a8f43c0d00ce693e06fcd3770bf2bf (commit)
from 7e891a82816a2eadea59b0233b8d93efed85b5c4 (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 79577fec16a8f43c0d00ce693e06fcd3770bf2bf
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 01:41:53 2014 -0400
Move styles out of tab partial. No issue #
diff --git a/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss b/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss
index aa58dcc..16d1879 100644
--- a/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss
+++ b/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss
@@ -1,3 +1,23 @@
// Place all the styles related to the PipelineInstances controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
+
+.pipeline-compare-headrow div {
+ padding-top: .5em;
+ padding-bottom: .5em;
+}
+.pipeline-compare-headrow:first-child {
+ border-bottom: 1px solid black;
+}
+.pipeline-compare-row .notnormal {
+ background: #ffffaa;
+}
+
+.pipeline_color_legend {
+ margin-top: 0.2em;
+ padding: 0.2em 1em;
+ border: 1px solid #000;
+}
+.pipeline_color_legend a {
+ color: #000;
+}
diff --git a/apps/workbench/app/views/pipeline_instances/_show_compare.html.erb b/apps/workbench/app/views/pipeline_instances/_show_compare.html.erb
index 018384b..567bc31 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_compare.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_compare.html.erb
@@ -1,19 +1,6 @@
-<% content_for :css do %>
-.notnormal {
- background: #ffffaa;
-}
-.headrow div {
- padding-top: .5em;
- padding-bottom: .5em;
-}
-.headrow:first-child {
- border-bottom: 1px solid black;
-}
-<% end %>
-
<% pi_span = [(10.0/[@objects.count,1].max).floor,1].max %>
-<div class="headrow">
+<div class="headrow pipeline-compare-headrow">
<div class="row">
<div class="col-sm-2">
<%# label %>
@@ -30,7 +17,7 @@
</div>
<% @rows.each do |row| %>
-<div class="row">
+<div class="row pipeline-compare-row">
<div class="col-sm-2">
<%= row[:name] %>
</div>
diff --git a/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb b/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
index e96ff16..5034b28 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
@@ -1,14 +1,3 @@
-<% content_for :css do %>
- .pipeline_color_legend {
- margin-top: 0.2em;
- padding: 0.2em 1em;
- border: 1px solid #000;
- }
- .pipeline_color_legend a {
- color: #000;
- }
-<% end %>
-
<% if @pipelines.count > 1 %>
<div style="text-align: center; padding-top: 0.5em">
<span class="pipeline_color_legend" style="background: #aaffaa"><%= link_to_if_arvados_object @pipelines[0], friendly_name: true %></span>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list