From 8e1ac7dd01956e6c080f1c6e3ccdf76dc7622f0b Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 12 Feb 2015 10:17:19 -0500 Subject: [PATCH] Update the toolbox section Give margin left to breadcrumbs and the headers fix issue with figure margin. --- Toolkit/Photos/css/gallery.css | 5 +- Toolkit/Template/Image/Left.php | 32 ++++---- Toolkit/Template/Image/Right.php | 32 ++++---- Toolkit/Template/Page/Toolbox.php | 16 ++-- css/app.css | 31 +++++++- scss/_structure.scss | 25 ++++++- templates/template.html | 120 +++++++++++++++--------------- 7 files changed, 156 insertions(+), 105 deletions(-) diff --git a/Toolkit/Photos/css/gallery.css b/Toolkit/Photos/css/gallery.css index c947848..7480028 100755 --- a/Toolkit/Photos/css/gallery.css +++ b/Toolkit/Photos/css/gallery.css @@ -43,12 +43,13 @@ div.thumb { height: 0; visibility: hidden; } -.gallery li { +#toolbox ul#Gallery li { background: none repeat scroll 0 0 #F5F5F5; float: left; margin: 0 2% 26px 0; overflow: hidden; position: relative; + padding: 0; width: 23% } .gallery li img { @@ -351,7 +352,7 @@ p.captionDescWrapper { margin-bottom: 5px; } @media only screen and (max-width: 40em) { - ul#gallery li { + ul#Gallery li { width: 45% !important; } ul.gallery li:nth-child(4n-1) { diff --git a/Toolkit/Template/Image/Left.php b/Toolkit/Template/Image/Left.php index 6494e50..9397a6a 100644 --- a/Toolkit/Template/Image/Left.php +++ b/Toolkit/Template/Image/Left.php @@ -31,32 +31,32 @@ */ class Toolkit_Template_Image_Left extends Toolkit_Template_Image_ImageAbstract { - // {{{ getImage() + // {{{ getImage() /** * Gets the image markup * - * @param string $size constant path to image size + * @param string $size constant path to image size * * @return string Html image element * @access public */ - public function getImage($size) - { - $imageData = $this->_adapter->getImageSize($size . $this->_src); + public function getImage($size) + { + $imageData = $this->_adapter->getImageSize($size . $this->_src); - $html = '
'; - $html .= parent::getImage($size); - if (!empty($this->_caption)) { - $html .= '
'; - $html .= $this->_caption; - $html .= '
'; - } - $html .= '
'; + $html = '
'; + $html .= parent::getImage($size); + if (!empty($this->_caption)) { + $html .= '
'; + $html .= $this->_caption; + $html .= '
'; + } + $html .= '
'; - return $html; - } + return $html; + } - // }}} + // }}} } ?> diff --git a/Toolkit/Template/Image/Right.php b/Toolkit/Template/Image/Right.php index 86974f4..046ebb0 100644 --- a/Toolkit/Template/Image/Right.php +++ b/Toolkit/Template/Image/Right.php @@ -31,32 +31,32 @@ */ class Toolkit_Template_Image_Right extends Toolkit_Template_Image_ImageAbstract { - // {{{ getImage() + // {{{ getImage() /** * Gets the image markup * - * @param string $size constant path to image size + * @param string $size constant path to image size * * @return string Html image element * @access public */ - public function getImage($size) - { - $imageData = $this->_adapter->getImageSize($size . $this->_src); + public function getImage($size) + { + $imageData = $this->_adapter->getImageSize($size . $this->_src); - $html = '
'; - $html .= parent::getImage($size); - if (!empty($this->_caption)) { - $html .= '
'; - $html .= $this->_caption; - $html .= '
'; - } - $html .= '
'; + $html = '
'; + $html .= parent::getImage($size); + if (!empty($this->_caption)) { + $html .= '
'; + $html .= $this->_caption; + $html .= '
'; + } + $html .= '
'; - return $html; - } + return $html; + } - // }}} + // }}} } ?> diff --git a/Toolkit/Template/Page/Toolbox.php b/Toolkit/Template/Page/Toolbox.php index e367ec7..1e49f67 100644 --- a/Toolkit/Template/Page/Toolbox.php +++ b/Toolkit/Template/Page/Toolbox.php @@ -328,12 +328,17 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody } $html = '
'; - $html .= "

{$page['title']}

"; if ($page['paragraph_links']) { $html .= $this->getParagraphLinks(); } - $html .= $this->getParagraphImage($page, $side); - $html .= '
'; + $html .= "

{$page['title']}

"; + $image = $this->getParagraphImage($page, $side); + if ($image) { + $html .= $image; + $html .= '
'; + } else { + $html .= '
'; + } $html .= $this->keywordReplacement->findAndReplace($page['description']); $html .= '
'; $html .= '
'; @@ -397,10 +402,11 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody foreach ($paragraphs as $paragraph) { if ($paragraph['active']) { $html .= '
'; - $html .= "

{$paragraph['title']}

"; $image = $this->getParagraphImage($paragraph, $side[$key]); + $html .= "

{$paragraph['title']}

"; if ($image) { - $html .= '
'; + $html .= $image; + $html .= '
'; } else { $html .= '
'; } diff --git a/css/app.css b/css/app.css index 3587bca..7f3eeae 100644 --- a/css/app.css +++ b/css/app.css @@ -6128,6 +6128,21 @@ img { padding: 0 0 2px 20px; background: url(../assets/bullet.png) 0 4px no-repeat; } +#toolbox h1 { + margin-left: 15px; } + +#toolbox h2 { + margin-left: 15px; } + +#toolbox h3 { + margin-left: 15px; } + +#toolbox h4 { + margin-left: 15px; } + +#toolbox #breadcrumbs { + margin-left: 15px; } + .webform table { margin: 10px 0 0 0; clear: both; } @@ -6146,7 +6161,10 @@ img { float: left; margin: 12px 15px 15px 2px; } -.imageright img, .imageleft img, figure img { +#toolbox figure { + margin: 0; } + +.imageright img, .imageleft img, #toolbox figure > img { display: block; width: 100%; border: 10px solid #355675; @@ -6225,7 +6243,12 @@ iframe { overflow: hidden; clear: both; font-size: 14px; - padding: 0 30px; } + padding: 0; + margin: 0; } + +#toolbox { + margin: 0; + padding: 0; } /* Page */ #wrapper { @@ -6247,7 +6270,9 @@ iframe { #content { display: block; width: 100%; - padding: 10px 30px; } + /*padding: 10px 30px;*/ + padding: 0; + margin: 0; } #leftcol { /*float: left;*/ diff --git a/scss/_structure.scss b/scss/_structure.scss index 9d45bb3..c9b07e5 100755 --- a/scss/_structure.scss +++ b/scss/_structure.scss @@ -80,6 +80,15 @@ img { padding: 0 0 2px 20px; background: url(../assets/bullet.png) 0 4px no-repeat; } +@for $i from 1 through 4 { + #toolbox h#{$i} { + margin-left: 15px; + } +} +#toolbox #breadcrumbs { + margin-left: 15px; +} + .webform table { margin: 10px 0 0 0; clear: both; @@ -98,7 +107,10 @@ img { float: left; margin: 12px 15px 15px 2px; } -.imageright img, .imageleft img, figure img { +#toolbox figure { + margin: 0; +} +.imageright img, .imageleft img, #toolbox figure > img { display: block; width: 100%; border: 10px solid #355675; @@ -148,7 +160,12 @@ iframe { overflow: hidden; clear: both; font-size: 14px; - padding: 0 30px; + padding: 0; + margin: 0; +} +#toolbox { + margin: 0; + padding: 0; } /* Page */ #wrapper { @@ -170,7 +187,9 @@ iframe { #content { display: block; width: 100%; - padding: 10px 30px; + /*padding: 10px 30px;*/ + padding: 0; + margin: 0; } #leftcol { /*float: left;*/ diff --git a/templates/template.html b/templates/template.html index 6e519e9..1420413 100755 --- a/templates/template.html +++ b/templates/template.html @@ -32,7 +32,7 @@
  • Find Us on Facebook
  • Follow us on Twitter
    • - +
  • 800-748-0245
  • Sign Up for Enews
  • Contact Us
    • @@ -47,7 +47,7 @@
  • Golf Packages
    • - +