From d794d95bb1d2d54c2c33508d01898c77df9a0534 Mon Sep 17 00:00:00 2001 From: Ian Weller Date: Fri, 13 Feb 2015 16:48:34 -0500 Subject: [PATCH] ready for review, finally --- Toolkit/Videos/templates/webDecorator.html | 4 ++-- css/app.css | 13 +++---------- scss/_structure.scss | 21 +++++++++++---------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Toolkit/Videos/templates/webDecorator.html b/Toolkit/Videos/templates/webDecorator.html index de4b6ca..2ff94f2 100644 --- a/Toolkit/Videos/templates/webDecorator.html +++ b/Toolkit/Videos/templates/webDecorator.html @@ -1,6 +1,6 @@ -
+ diff --git a/css/app.css b/css/app.css index 8117e30..fd6d98c 100644 --- a/css/app.css +++ b/css/app.css @@ -6174,7 +6174,7 @@ img { margin-left: 15px; } #home #toolbox { - padding: 0 45px; } + padding: 0 20px; } .webform table { margin: 10px 0 0 0; @@ -6742,7 +6742,7 @@ ul#mainnav li a:hover { #action_wrapper { width: 100%; overflow: hidden; - padding: 10px 60px; } + padding: 10px 5%; } ul#actionlinks { display: block; @@ -6858,7 +6858,7 @@ ul#actionlinks a#lodging_specials:hover { border: 3px solid #B4C98E; border-radius: 10px; overflow: hidden; - width: 88%; } + width: 94%; } #home_video_wrapper h2 { display: block; @@ -6878,7 +6878,6 @@ ul#actionlinks a#lodging_specials:hover { .hBox { padding: 0; float: left; - height: 150px; overflow: hidden; background: #CCC; border: 3px solid #7A954B; @@ -7077,9 +7076,6 @@ ul#videoGallery li:hover a span#vidtitle span#play { #home_video_wrapper > .row > .small-6 { width: 45%; margin: 1% 2.5%; } - - .hBox a img { - margin-top: -16%; } } @media only screen and (max-width: 40em) { @@ -7091,9 +7087,6 @@ ul#videoGallery li:hover a span#vidtitle span#play { margin-left: auto; margin-right: auto; margin-bottom: 10px; } - - .hBox a img { - margin-top: -27%; } } /* toggle class for off-canvas menu*/ diff --git a/scss/_structure.scss b/scss/_structure.scss index 55cacf2..2a0bbfc 100755 --- a/scss/_structure.scss +++ b/scss/_structure.scss @@ -101,7 +101,7 @@ img { margin-left: 15px; } #home #toolbox { - padding: 0 45px; + padding: 0 20px; } .webform table { @@ -637,7 +637,7 @@ ul#mainnav li a:hover { #action_wrapper { width: 100%; overflow: hidden; - padding: 10px 60px; + padding: 10px 5%; } ul#actionlinks { display: block; @@ -752,7 +752,7 @@ ul#actionlinks a#lodging_specials:hover { border: 3px solid #B4C98E; border-radius: 10px; overflow: hidden; - width: 88%; + width: 94%; } #home_video_wrapper h2 { display: block; @@ -772,7 +772,6 @@ ul#actionlinks a#lodging_specials:hover { .hBox { padding: 0; float: left; - height: 150px; overflow: hidden; background: #CCC; border: 3px solid #7A954B; @@ -972,9 +971,10 @@ ul#videoGallery li:hover a span#vidtitle span#play { width: 45%; margin: 1% 2.5%; } - .hBox a img { - margin-top: -16%; - } +// .hBox a img { +// margin-top: -28%; +// height: 215% +// } } @media only screen and (max-width: 40em) { #slideshow_wrapper { @@ -986,9 +986,10 @@ ul#videoGallery li:hover a span#vidtitle span#play { margin-right: auto; margin-bottom: 10px; } - .hBox a img { - margin-top: -27%; - } +// .hBox a img { +// margin-top: -60%; +// height: 190% +// } } /* toggle class for off-canvas menu*/ aside.right-off-canvas-menu ul.off-canvas-list li { -- 2.17.1