From 79577fec16a8f43c0d00ce693e06fcd3770bf2bf Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 26 Aug 2014 01:41:53 -0400 Subject: [PATCH] Move styles out of tab partial. No issue # --- .../stylesheets/pipeline_instances.css.scss | 20 +++++++++++++++++++ .../pipeline_instances/_show_compare.html.erb | 17 ++-------------- .../pipeline_instances/_show_graph.html.erb | 11 ---------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss b/apps/workbench/app/assets/stylesheets/pipeline_instances.css.scss index aa58dccfbf..16d1879d61 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 018384b37e..567bc31b1e 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 %> -
+
<%# label %> @@ -30,7 +17,7 @@
<% @rows.each do |row| %> -
+
<%= row[:name] %>
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 e96ff16240..5034b28b11 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 %>
<%= link_to_if_arvados_object @pipelines[0], friendly_name: true %> -- 2.39.5