From: Ian Weller Date: Tue, 10 May 2016 20:11:17 +0000 (-0400) Subject: adding blog feed to glmTheme and other changes I've had to do when starting X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bc4e9e4932802cbff601c6f100981f396f442965;p=web%2FGruntInit%2FglmTheme.git adding blog feed to glmTheme and other changes I've had to do when starting --- diff --git a/root/parts/blog-feed-front.php b/root/parts/blog-feed-front.php new file mode 100644 index 0000000..ba35dbb --- /dev/null +++ b/root/parts/blog-feed-front.php @@ -0,0 +1,27 @@ + 4);?> +
+ +
+
+ ID )) { ?> +
+ ID, array(190, 190), array('class' => 'blog-excerpt-img-wrap')); ?> +
+
+ +
+ + +

+ +
+
+
+
+
+ + +
\ No newline at end of file diff --git a/root/parts/glm-blocks.php b/root/parts/glm-blocks.php index 8f92ed5..16eedfd 100644 --- a/root/parts/glm-blocks.php +++ b/root/parts/glm-blocks.php @@ -17,7 +17,7 @@ url):?> -

post_content . $block->post_excerpt;?>

+

post_content) . $block->post_excerpt;?>

url):?> diff --git a/root/scss/_blog.scss b/root/scss/_blog.scss index dcfc6aa..39a8879 100644 --- a/root/scss/_blog.scss +++ b/root/scss/_blog.scss @@ -1,11 +1,11 @@ .home-feed-post { padding-bottom: 25px; - @media #{$small-only} { - > * { - text-align: center; - } - } +// @media #{$small-only} { +// > * { +// text-align: center; +// } +// } } input[type="submit"].blogbutton { border-radius: 3px; diff --git a/root/scss/_slideshow.scss b/root/scss/_slideshow.scss index 8ac6032..81aff90 100644 --- a/root/scss/_slideshow.scss +++ b/root/scss/_slideshow.scss @@ -1,6 +1,4 @@ #slideshow { - border-bottom: 5px solid $d-blue; - margin-top: -10px; #caption { background: rgba(0, 0, 0, 0.75); color: $white; diff --git a/root/scss/_topbar.scss b/root/scss/_topbar.scss index 002ab83..43fbd78 100644 --- a/root/scss/_topbar.scss +++ b/root/scss/_topbar.scss @@ -23,125 +23,103 @@ line-height: 1; ul{ li { - background: none; - padding: 12px 0; - border-left: 2px solid $white; - max-width: 166.5px; - line-height: 1.25; - &:first-child { - border: none; - } - &:hover { - background: $white; - } + a { - text-align: center; - padding: 0 20px; - font-size: 20px; - font-weight: bold; - color: $white; - &:hover { - color: $d-blue; - text-shadow: 0 0 1px $d-blue; - text-shadow: 1 0 1px $d-blue; - text-shadow: 0 1 1px $d-blue; - text-shadow: -1 0 1px $d-blue; - text-shadow: 0 -1 1px $d-blue; - } + } &:not(.has-form):not(.active) { & > a:not(.button) { background: transparent; } } - &.drop-left { - ul.dropdown { - padding-left: 21px; - padding-right: 250px; - top: 74px; - background: $white; - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; - min-width: 500px; - box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -ms-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -webkit-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - li { - white-space: nowrap; - border-bottom: 1px solid #e7e7e8; - padding: 5px 0; - &.nav-img-container { - img { - position: absolute; - right: 20px; - top: 23px; - border: 6px solid #fdefd4; - } - border: none; - } - a { - padding-left: 0; - text-align: left; - font-size: 18px; - &:hover { - color: $d-blue; - text-shadow: 0 0 1px $green; - text-shadow: 1 0 1px $green; - text-shadow: 0 1 1px $green; - text-shadow: -1 0 1px $green; - text-shadow: 0 -1 1px $green; - } - } - } - } - } - &.drop-right { - ul.dropdown { - padding-left: 250px; - padding-right: 21px; - right: -1%; - left: auto; - top: 74px; - background: $white; - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; - min-width: 500px; - box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -ms-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - -webkit-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); - li { - white-space: nowrap; - background: $white; - text-align: right; - border-bottom: 1px solid #e7e7e8; - padding: 5px 0; - &.nav-img-container { - img { - position: absolute; - left: 20px; - top: 23px; - border: 6px solid #fdefd4; - } - border: none; - } - a { - padding-left: 0; - text-align: left; - font-size: 18px; - &:hover { - color: $d-blue; - text-shadow: 0 0 1px $green; - text-shadow: 1 0 1px $green; - text-shadow: 0 1 1px $green; - text-shadow: -1 0 1px $green; - text-shadow: 0 -1 1px $green; - } - } - } - } - } +// &.drop-left { +// ul.dropdown { +// padding-left: 21px; +// padding-right: 250px; +// top: 74px; +// background: $white; +// border-bottom-left-radius: 10px; +// border-bottom-right-radius: 10px; +// min-width: 500px; +// box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -ms-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -moz-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -webkit-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// li { +// white-space: nowrap; +// border-bottom: 1px solid #e7e7e8; +// padding: 5px 0; +// &.nav-img-container { +// img { +// position: absolute; +// right: 20px; +// top: 23px; +// border: 6px solid #fdefd4; +// } +// border: none; +// } +// a { +// padding-left: 0; +// text-align: left; +// font-size: 18px; +// &:hover { +// color: $d-blue; +// text-shadow: 0 0 1px $green; +// text-shadow: 1 0 1px $green; +// text-shadow: 0 1 1px $green; +// text-shadow: -1 0 1px $green; +// text-shadow: 0 -1 1px $green; +// } +// } +// } +// } +// } +// &.drop-right { +// ul.dropdown { +// padding-left: 250px; +// padding-right: 21px; +// right: -1%; +// left: auto; +// top: 74px; +// background: $white; +// border-bottom-left-radius: 10px; +// border-bottom-right-radius: 10px; +// min-width: 500px; +// box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -ms-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -moz-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// -webkit-box-shadow: 0 8px 10px -5px rgba(0, 0, 0, 0.5); +// li { +// white-space: nowrap; +// background: $white; +// text-align: right; +// border-bottom: 1px solid #e7e7e8; +// padding: 5px 0; +// &.nav-img-container { +// img { +// position: absolute; +// left: 20px; +// top: 23px; +// border: 6px solid #fdefd4; +// } +// border: none; +// } +// a { +// padding-left: 0; +// text-align: left; +// font-size: 18px; +// &:hover { +// color: $d-blue; +// text-shadow: 0 0 1px $green; +// text-shadow: 1 0 1px $green; +// text-shadow: 0 1 1px $green; +// text-shadow: -1 0 1px $green; +// text-shadow: 0 -1 1px $green; +// } +// } +// } +// } +// } } } }