Minor fixes to images formatting

evildmp · May 2, 2015 · 8300788 · 8300788
1 parent 5e63b22
commit 8300788
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/arkestra_image_plugin/templates/arkestra_image_plugin/lightbox.html b/arkestra_image_plugin/templates/arkestra_image_plugin/lightbox.html
@@ -1,24 +1,14 @@
 {% spaceless %}
 {% load sekizai_tags %}
 
-{% addtoblock "css" %}      
+{% addtoblock "css" %}
 	<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}fancybox/css/jquery.fancybox-1.3.4.css" media="screen" />
 {% endaddtoblock %}
 
-{% if imageset.kind == "lightbox" %}
-	{% addtoblock "css" %}      
-		<style>
-			ul.imageset li.image.link {
-			    padding: {{ imageset.padding }}px; 
-		    }
-		</style>
-	{% endaddtoblock %}
-{% endif %}
-
 {% addtoblock "js" %}
 	<script src="{{ STATIC_URL }}jquery/jquery.min.js"></script>
 	<script src="{{ STATIC_URL }}fancybox/js/jquery.mousewheel.min.js"></script>
-	<script src="{{ STATIC_URL }}fancybox/js/jquery.fancybox-1.3.4.pack.js"></script> 
+	<script src="{{ STATIC_URL }}fancybox/js/jquery.fancybox-1.3.4.pack.js"></script>
     <script src="{{ STATIC_URL }}fancybox/js/jquery.easing-1.3.pack.js"></script>
     <script type="text/javascript">
     var fancyBOX = jQuery.noConflict();
@@ -34,11 +24,11 @@
 	        });
 		});
 	</script>
-        
+
 {% endaddtoblock %}
 <ul class="imageset multiple lightbox" style="width: {{ imageset.container_width }}px;">
 	{% for item in imageset.items %}
-		<li class="image link {% if item.lastinrow %}lastinrow{% endif %}">      
+		<li class="image link {% if item.lastinrow %}lastinrow{% endif %}">
 			{% include "arkestra_image_plugin/includes/imageset_item.html" %}
 		</li>
 	{% endfor %}

diff --git a/arkestra_utilities/templates/arkestra.html b/arkestra_utilities/templates/arkestra.html
@@ -50,7 +50,7 @@
 
 <body {% block body_attributes %}{% endblock body_attributes %}>
     {% cms_toolbar %}
-    {% with thumbnail_quality=95 placeholder_width=960 generic_main_width=628 sidebar_image_size="294x294" entity_image_size="445x384" entity_map_size="445x100" person_map_size="445x100" sidebar_map_size="296x100" person_image_size="460x460" person_thumbnail_size="60x60" lightbox_max_dimension=600 plugin_thumbnail_size="75x75" place_main_width=627 place_image_size="627x418" place_map_size="294x182" body_heading_level=2 %}
+    {% with thumbnail_quality=95 placeholder_width=960 generic_main_width=628 sidebar_image_size="294x294" entity_image_size="445x384" entity_map_size="445x100" person_map_size="445x100" sidebar_map_size="296x100" person_image_size="460x460" person_thumbnail_size="60x60" lightbox_max_dimension=700 plugin_thumbnail_size="75x75" place_main_width=627 place_image_size="627x418" place_map_size="294x182" body_heading_level=2 %}
     	{% block body_content %}
     		<div id="outer-wrapper">
 				{% block outer_wrapper_top %}{% endblock %}