More style shuffling, deleting redundant styles

seek4science · Mar 23, 2022 · 7e6459a · 7e6459a
1 parent 0bb546a
commit 7e6459a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 31 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -25,7 +25,7 @@
 *= require jstree
 *= require openbis
 *= require eonasdan-bootstrap-datetimepicker
-*= require cytoscape_isa_graph
+*= require isa_graph
 *= require multi-step-wizard
 *= require lightbox2
 *= require simplemde-markdown-editor-1.11.2/simplemde.min

diff --git a/app/assets/stylesheets/associations.scss b/app/assets/stylesheets/associations.scss
@@ -1,5 +1,16 @@
 @import 'variables';
 
+ul.associations-list {
+  padding-left: 5px;
+  margin-bottom: 0;
+}
+
+li.association-list-item {
+  white-space: normal;
+  list-style-type: none;
+  list-style-position: inside;
+}
+
 a.remove-association {
   text-decoration: none;
   vertical-align: middle;
@@ -19,7 +30,3 @@ a.remove-association {
   }
 }
 
-[data-role="seek-associations-list"] ul {
-  max-height: 250px;
-  overflow-y: auto;
-}
diff --git a/app/assets/stylesheets/cytoscape_isa_graph.css b/app/assets/stylesheets/cytoscape_isa_graph.css
diff --git a/app/assets/stylesheets/isa_graph.scss b/app/assets/stylesheets/isa_graph.scss
@@ -1,3 +1,7 @@
+/*
+*= require cytoscape.js-panzoom-2.4.0/cytoscape.js-panzoom
+*/
+
 @import 'variables';
 @import 'mixins';
 

diff --git a/app/assets/stylesheets/landing_page.css b/app/assets/stylesheets/landing_page.css
@@ -1,3 +1,4 @@
+/* Styles for static landing pages, e.g. error pages */
 div.landing_page {
     text-align: center;
 }

diff --git a/app/assets/stylesheets/styles.scss b/app/assets/stylesheets/styles.scss
@@ -136,17 +136,6 @@ a.asset img.avatar {
   min-height: 3em;
 }
 
-ul.related_asset_list {
-  padding-left: 5px;
-  margin-bottom: 0;
-}
-
-ul.related_asset_list li, li.association-list-item {
-  white-space: normal;
-  list-style-type: none;
-  list-style-position: inside;
-}
-
 div.error_div h2 {
   font-size: inherit;
   font-weight: bold;
@@ -161,10 +150,6 @@ div.asset_form {
   padding-right: 1em;
 }
 
-div.sharing_summary {
-  text-align: center;
-}
-
 p.import_details {
   font-style: italic;
 }
@@ -193,10 +178,6 @@ p#logging_started {
   text-align: center;
 }
 
-.none_text {
-  font-style: italic;
-}
-
 ul.model_scales_list {
   margin-left:1em;
 }
@@ -410,6 +391,10 @@ div.renderer {
   font-size: 80%;
 }
 
+.none_text {
+  font-style: italic;
+}
+
 .none_text, .subtle, .pale_text {
   color: if(lightness($text-color) > 50, darken($text-color, 20%), lighten($text-color, 30%));
 }

diff --git a/app/helpers/associations_helper.rb b/app/helpers/associations_helper.rb
@@ -9,7 +9,7 @@ def associations_list(id, template_name, existing, options = {})
                            'data-template-name' => template_name)
 
     content_tag(:div, options) do
-      content = content_tag(:ul, '', class: 'associations-list related_asset_list') +
+      content = content_tag(:ul, '', class: 'associations-list') +
           content_tag(:span, empty_text, class: 'none_text no-item-text') +
           content_tag(:script, existing.html_safe, :type => 'application/json', 'data-role' => 'seek-existing-associations')
       # Add an empty hidden field to allow removal of all items

diff --git a/app/views/general/_item_title.html.erb b/app/views/general/_item_title.html.erb
@@ -41,7 +41,7 @@ col_width = buttons_partial.nil? && !content_for?(:buttons) ? 12 : 6
       <% end %>
     </h1>
     <% if @action=="show" && item.respond_to?(:private?) && item.respond_to?(:public?) && item.try(:can_manage?) %>
-        <div class="sharing_summary">
+        <div class="text-center">
           <%= sharing_text(item) %>
         </div>
     <% end %>

diff --git a/app/views/projects/_project_selector.html.erb b/app/views/projects/_project_selector.html.erb
@@ -45,7 +45,7 @@
         association association_ids= methods, which reject 'blank' values automatically.%>
       <%= hidden_field_tag field_name, '' %>
       <div class="box_editing_inner">
-        <ul class="related_asset_list">
+        <ul class="associations-list">
           <span v-if="selected.length == 0" class="none_text">None</span>
           <li class="association-list-item" v-for="(project, index) in selected">
             <span :title="project.title">{{ project.title }}</span>