From: Ian Weller Date: Fri, 13 Feb 2015 20:24:56 +0000 (-0500) Subject: may be complete X-Git-Tag: v1.0.0^2~34 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=facad383e66e397240c192feca2f436fe66aa581;p=web%2FTroutCreek.git may be complete --- diff --git a/.gitignore b/.gitignore index e47da98..4da6b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /bower_components/* /node_modules/* compiled +compile \ No newline at end of file diff --git a/Toolkit/Videos/templates/webDecorator.html b/Toolkit/Videos/templates/webDecorator.html index 8746ffb..de4b6ca 100644 --- a/Toolkit/Videos/templates/webDecorator.html +++ b/Toolkit/Videos/templates/webDecorator.html @@ -1,6 +1,6 @@ -
- - - - -
+
+ + + + +
diff --git a/assets/btn_blue-extend.jpg b/assets/btn_blue-extend.jpg index 82b9ae1..1ec41ef 100644 Binary files a/assets/btn_blue-extend.jpg and b/assets/btn_blue-extend.jpg differ diff --git a/assets/btn_green-extend.jpg b/assets/btn_green-extend.jpg index 51729c0..9540a2d 100644 Binary files a/assets/btn_green-extend.jpg and b/assets/btn_green-extend.jpg differ diff --git a/assets/btn_yellow-extend.jpg b/assets/btn_yellow-extend.jpg index 64c1adf..85e2310 100644 Binary files a/assets/btn_yellow-extend.jpg and b/assets/btn_yellow-extend.jpg differ diff --git a/css/app.css b/css/app.css index 2efba8b..8117e30 100644 --- a/css/app.css +++ b/css/app.css @@ -6370,7 +6370,7 @@ iframe { .right-small .show-for-small-only { top: 125px; } -a.number { +span.number { color: #fff; margin-top: 10px; } @@ -6664,6 +6664,7 @@ ul#mainnav li a:hover { background: -webkit-gradient(linear, left top, left middle, left bottom, color-stop(0.05, #a5c6e5), color-stop(0.5, #c9e8fd), color-stop(1, #a5c6e5)); background: -moz-linear-gradient(center top, #a5c6e5 5%, #c9e8fd 50%, #a5c6e5 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a5c6e5', middleColorstr='#c9e8fd', endColorstr='#a5c6e5'); + background-color: #a5c6e5; border-bottom: 1px solid #4d78a2; border-top: 1px solid #4d78a2; } @@ -6741,7 +6742,7 @@ ul#mainnav li a:hover { #action_wrapper { width: 100%; overflow: hidden; - padding: 10px 0; } + padding: 10px 60px; } ul#actionlinks { display: block; @@ -6759,6 +6760,7 @@ ul#actionlinks li a { margin: 0 auto; font-size: 19px; margin-bottom: 0; + padding-left: 20px; font-weight: bold; color: #EEEEEE; text-decoration: none; @@ -6846,16 +6848,17 @@ ul#actionlinks a#lodging_specials:hover { /* Homepage Video */ #home_video_wrapper { - width: 930px; margin: 0 auto; padding: 14px 0 8px 0; /*min-height: 200px;*/ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0.05, #8fa864), color-stop(1, #90a965)); - background: -moz-linear-gradient(center top, #8fa864 5%, #90a965 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8fa864', endColorstr='#90a965'); + background: -webkit-gradient(linear, left top, left middle, left bottom, color-stop(0.05, #8fa864), color-stop(0.5, #a1bb74), color-stop(1, #8fa864)); + background: -moz-linear-gradient(center top, #8fa864 5%, #a1bb74 50%, #8fa864 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8fa864', middleColorstr='#a1bb74', endColorstr='#8fa864'); + background-color: #a1bb74; border: 3px solid #B4C98E; border-radius: 10px; - overflow: hidden; } + overflow: hidden; + width: 88%; } #home_video_wrapper h2 { display: block; @@ -6865,10 +6868,16 @@ ul#actionlinks a#lodging_specials:hover { padding: 4px 2% 8px 2%; color: #365303; } +#home_video_wrapper > .row { + margin: 0; } + +#home_video_wrapper > .row > .large-3 { + margin: 0 1%; + width: 23%; } + .hBox { + padding: 0; float: left; - width: 21%; - margin: 0 2% 10px 2%; height: 150px; overflow: hidden; background: #CCC; @@ -6888,8 +6897,8 @@ ul#actionlinks a#lodging_specials:hover { display: block; width: 184%; overflow: hidden; - margin-top: -30%; - margin-left: -30%; } + height: 175%; + margin-top: -32%; } .hBox a span.vidoverlay { display: block; @@ -7064,6 +7073,13 @@ ul#videoGallery li:hover a span#vidtitle span#play { @media only screen and (max-width: 64em) { #slideshow_wrapper { height: 169px; } + + #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) { @@ -7073,7 +7089,11 @@ ul#videoGallery li:hover a span#vidtitle span#play { #reservation_wrapper form .small-12 input[type="submit"] { float: none; margin-left: auto; - margin-right: 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 9a88fcf..55cacf2 100755 --- a/scss/_structure.scss +++ b/scss/_structure.scss @@ -269,7 +269,7 @@ iframe { .right-small .show-for-small-only { top: 125px; } -a.number { +span.number { color: #fff; margin-top: 10px; } @@ -565,6 +565,7 @@ ul#mainnav li a:hover { // height: 59px; /*padding: 16px 35px;*/ @include gradient_1st(#a5c6e5, #c9e8fd); + background-color: #a5c6e5; border-bottom: 1px solid #4d78a2; border-top: 1px solid #4d78a2; } @@ -636,7 +637,7 @@ ul#mainnav li a:hover { #action_wrapper { width: 100%; overflow: hidden; - padding: 10px 0; + padding: 10px 60px; } ul#actionlinks { display: block; @@ -654,6 +655,7 @@ ul#actionlinks li a { margin: 0 auto; font-size: 19px; margin-bottom: 0; + padding-left: 20px; font-weight: bold; color: #EEEEEE; text-decoration: none; @@ -742,14 +744,15 @@ ul#actionlinks a#lodging_specials:hover { /* Homepage Video */ #home_video_wrapper { - width: 930px; margin: 0 auto; padding: 14px 0 8px 0; /*min-height: 200px;*/ - @include gradient_2nd(#8fa864, #90a965); + @include gradient_1st(#8fa864, #a1bb74); + background-color: #a1bb74; border: 3px solid #B4C98E; border-radius: 10px; overflow: hidden; + width: 88%; } #home_video_wrapper h2 { display: block; @@ -759,10 +762,16 @@ ul#actionlinks a#lodging_specials:hover { padding: 4px 2% 8px 2%; color: #365303; } +#home_video_wrapper > .row { + margin: 0; +} +#home_video_wrapper > .row > .large-3 { + margin: 0 1%; + width: 23%; +} .hBox { + padding: 0; float: left; - width: 21%; - margin: 0 2% 10px 2%; height: 150px; overflow: hidden; background: #CCC; @@ -782,8 +791,8 @@ ul#actionlinks a#lodging_specials:hover { display: block; width: 184%; overflow: hidden; - margin-top: -30%; - margin-left: -30%; + height: 175%; + margin-top: -32%; } .hBox a span.vidoverlay { display: block; @@ -959,6 +968,13 @@ ul#videoGallery li:hover a span#vidtitle span#play { #slideshow_wrapper { height: 169px; } + #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) { #slideshow_wrapper { @@ -968,8 +984,11 @@ ul#videoGallery li:hover a span#vidtitle span#play { float: none; margin-left: auto; margin-right: auto; + margin-bottom: 10px; + } + .hBox a img { + margin-top: -27%; } - } /* toggle class for off-canvas menu*/ aside.right-off-canvas-menu ul.off-canvas-list li { diff --git a/templates/template.html b/templates/template.html index 0bf3857..0450057 100755 --- a/templates/template.html +++ b/templates/template.html @@ -96,7 +96,7 @@
{end:}

Watch Our Videos

- {if:video}{video:h}{end:} +
+ {if:video}{video:h}{end:} +
@@ -141,6 +143,7 @@
+
{end:}