From: Ove Klykken <klykken@gmail.com>
Date: Wed, 11 Jun 2014 15:25:15 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
X-Git-Tag: v1.0^2~72
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f6a376d26ac1640058005a58bd0c2985ba147b16;p=web%2FSooLocks.git

Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop

Conflicts:
	.gitignore
---

f6a376d26ac1640058005a58bd0c2985ba147b16
diff --cc .gitignore
index cb47cd1,c97ebdb..9951a1d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,5 @@@
- templates/compiled/template.html.en.php
- templates/compiled/template.html.gettext.serial
++compiled/
 +.htaccess
+ /nbproject/private/
+ /nbproject/project.xml
+ /nbproject/project.properties
diff --cc Toolkit/Template/Image/Left.php
index 6fb37f1,6fb37f1..db621d9
--- a/Toolkit/Template/Image/Left.php
+++ b/Toolkit/Template/Image/Left.php
@@@ -45,7 -45,7 +45,7 @@@ class Toolkit_Template_Image_Left exten
  	{
  		$imageData = $this->_adapter->getImageSize($size . $this->_src);
  
--		$html  = '<div class="imageleft" style="width: ' . $imageData[0] . 'px;">';
++		$html  = '<div class="left toolboximg" style="width: ' . $imageData[0] . 'px;">';
  		$html .=	parent::getImage($size);
  		if (!empty($this->_caption)) {
  			$html .=	'<div class="imagecaption">';
diff --cc Toolkit/Template/Image/Right.php
index f1ef03b,f1ef03b..829ba94
--- a/Toolkit/Template/Image/Right.php
+++ b/Toolkit/Template/Image/Right.php
@@@ -45,7 -45,7 +45,7 @@@ class Toolkit_Template_Image_Right exte
  	{
  		$imageData = $this->_adapter->getImageSize($size . $this->_src);
  
--		$html  = '<div class="imageright" style="width: ' . $imageData[0] . 'px;">';
++		$html  = '<div class="right toolboximg" style="width: ' . $imageData[0] . 'px;">';
  		$html .=	parent::getImage($size);
  		if (!empty($this->_caption)) {
  			$html .=	'<div class="imagecaption">';
diff --cc styles.css
index e3014e2,e3014e2..f49c6ee
--- a/styles.css
+++ b/styles.css
@@@ -174,6 -174,6 +174,17 @@@ body 
  #toolbox h1 {
      text-transform: uppercase;
      }
++.right.toolboximg {
++    padding: 0 0 20px 20px;
++    }
++.left.toolboximg {
++    padding: 0 20px 20px 0;
++    }
++.imagecaption {
++    padding: 10px;
++    font-size: 12px;
++    font-style: italic;
++    }
  /* Block / Home Page Headlines */
  #hHlines ul, #hHlines li {
      list-style-type: none;