diff --git a/config.yml b/config.yml index c12db38..24c5b56 100755 --- a/config.yml +++ b/config.yml @@ -6,6 +6,8 @@ description: This is the WVU Brand Patterns theme built for CleanSlate. Original custom_site_attributes: # For Google Search Console - google_site_verification + # For defining an external blog feed for your site + - cross_site_blog_url ## Template Config # Specify which templates show up by default when creating a page diff --git a/mock_data.yml b/mock_data.yml index 4237c30..d806217 100644 --- a/mock_data.yml +++ b/mock_data.yml @@ -182,6 +182,9 @@ editable_region: article-body: |

<%= Faker::Lorem.paragraph(15) %>

+ article-image: | + + wvu-profile__name: "<%= Faker::Name.name %>" @@ -211,6 +214,7 @@ site: name: "Brand Patterns" data: google_site_verification: "meta-tag-content-goes-here" + cross_site_blog_url: http://feeds.feedburner.com/wvu/ilPI?format=xml page: id: 1 @@ -244,6 +248,7 @@ pages: wvu-profile__short-description: "This is a short description for this profile. <%= Faker::Lorem.paragraph(4) %>" wvu-profile__photo: |  + - id: 3 name: "Profile Index" updated_at: "now" @@ -296,6 +301,8 @@ blog: first_name: "<%= Faker::Name.first_name %>" last_name: "<%= Faker::Name.last_name %>" content: + article-image: | + article-body: |

<%= Faker::Lorem.paragraph(2) %>

<%= Faker::Lorem.paragraph(5) %>

@@ -308,6 +315,8 @@ blog: first_name: "<%= Faker::Name.first_name %>" last_name: "<%= Faker::Name.last_name %>" content: + article-image: | + article-body: |

<%= Faker::Lorem.paragraph(2) %>

<%= Faker::Lorem.paragraph(5) %>

@@ -320,6 +329,8 @@ blog: first_name: "<%= Faker::Name.first_name %>" last_name: "<%= Faker::Name.last_name %>" content: + article-image: | + article-body: |

<%= Faker::Lorem.paragraph(2) %>

<%= Faker::Lorem.paragraph(5) %>

diff --git a/scss/1-base/_wvu-blog.scss b/scss/1-base/_wvu-blog.scss index 02eb0c4..01ba06c 100644 --- a/scss/1-base/_wvu-blog.scss +++ b/scss/1-base/_wvu-blog.scss @@ -9,6 +9,7 @@ .wvu-article--individual { border-bottom: 0; } // Remove stuff for individual articles .wvu-article__title { margin-bottom: 20px; } .wvu-article__meta { font-size: .8em; margin-top: 0; margin-bottom: 0; color: $pms-warm-gray-7; } +.wvu-article__image { margin-top: 20px; margin-bottom: 20px;} // Older/newer articles buttons .wvu-pagination { float: left; padding-top: 10px; padding-left: 0; list-style-type: none; } diff --git a/scss/1-base/_wvu-masthead__search-and-submit.scss b/scss/1-base/_wvu-masthead__search-and-submit.scss new file mode 100644 index 0000000..51bc83c --- /dev/null +++ b/scss/1-base/_wvu-masthead__search-and-submit.scss @@ -0,0 +1,42 @@ +@mixin masthead-search-submit-background { + @if $wvu-masthead-background == 'blue' { + .wvu-masthead__link { + color: white; + text-decoration: none; + background-color: $wvu-blue; + &:visited { color: white; } + &:hover { color: white; text-decoration: underline; } + } + .form-search__search-type{ + label{ + color: white; + background-color: $wvu-blue; + cursor: pointer; + text-decoration: none; + &:visited { color: white; } + &:hover { color: white; text-decoration: underline; } + } + } + } + @else { + .wvu-masthead__link { + color: $wvu-base-link-color; + text-decoration: none; + &:visited { color: $wvu-visited-link-color; } + &:hover { color: $wvu-base-link-color; text-decoration: underline; } + } + .form-search__search-type{ + label{ + color: $wvu-base-link-color; + cursor: pointer; + text-decoration: none; + &:visited { color: $wvu-visited-link-color; } + &:hover { color: $wvu-base-link-color; text-decoration: underline; } + } + } + } +} + +.wvu-masthead__search-and-submit{ + @include masthead-search-submit-background; +} diff --git a/scss/1-base/_wvu-search.scss b/scss/1-base/_wvu-search.scss index 8f2df04..49a3397 100644 --- a/scss/1-base/_wvu-search.scss +++ b/scss/1-base/_wvu-search.scss @@ -24,6 +24,9 @@ input[type="search"] { } .form-search__search-type { clear: both; font-weight: bold; padding-top: .5em; + fieldset{ + legend{ position: absolute; top: -99999em } + } @include mq($bp-medium) { padding-top: 0; } input { &:last-child { margin-left: 1em; } diff --git a/scss/1-base/base-dir.scss b/scss/1-base/base-dir.scss index bc86626..d0daca3 100644 --- a/scss/1-base/base-dir.scss +++ b/scss/1-base/base-dir.scss @@ -11,6 +11,7 @@ @import 'wvu-forms'; @import 'wvu-search'; @import 'wvu-masthead'; +@import "wvu-masthead__search-and-submit"; @import 'wvu-header'; @import 'wvu-blog'; @import 'wvu-buttons'; diff --git a/stylesheets/ie8.css b/stylesheets/ie8.css index 76f714c..a0da140 100644 --- a/stylesheets/ie8.css +++ b/stylesheets/ie8.css @@ -1102,7 +1102,7 @@ select { .form-search__search-type label { float: left; - margin: 0 1em 0 0.5em; + margin: 0 1em 0 .5em; } .form-search__search-type input { @@ -1139,6 +1139,11 @@ input[type="search"].wvu-search__search-box { padding-top: .5em; } +.form-search__search-type fieldset legend { + position: absolute; + top: -99999em; +} + @media (min-width: 48em) { .form-search__search-type { padding-top: 0; @@ -1512,6 +1517,11 @@ input[type="submit"].form-search__submit { color: #968C83; } +.wvu-article__image { + margin-top: 20px; + margin-bottom: 20px; +} + .wvu-pagination { float: left; padding-top: 10px; @@ -1551,7 +1561,7 @@ input[type="submit"] { font-size: 1em; font-weight: bold; line-height: 1; - padding: 0.75em 1em; + padding: .75em 1em; text-decoration: none; } @@ -1621,7 +1631,7 @@ input[type="submit"] { .button--small { font-size: .9em; - padding: 0.35em 0.45em; + padding: .35em .45em; } .button--big { @@ -2335,7 +2345,7 @@ input[type="submit"] { } } -@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx), (min-resolution: 120dpi) { +@media print, (-o-min-device-pixel-ratio: 5 / 4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx), (min-resolution: 120dpi) { .wvu-social a { -webkit-background-size: contain; background-size: contain; diff --git a/stylesheets/styles.css b/stylesheets/styles.css index e82f496..f201324 100755 --- a/stylesheets/styles.css +++ b/stylesheets/styles.css @@ -264,7 +264,8 @@ select { * `input` and others. */ button, -html input[type="button"], input[type="reset"], +html input[type="button"], +input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ @@ -397,9 +398,7 @@ html { box-sizing: border-box; } -*, -*::after, -*::before { +*, *::after, *::before { box-sizing: inherit; } @@ -1537,7 +1536,7 @@ select { .form-search__search-type label { float: left; - margin: 0 1em 0 0.5em; + margin: 0 1em 0 .5em; } .form-search__search-type input { @@ -1574,6 +1573,11 @@ input[type="search"].wvu-search__search-box { padding-top: .5em; } +.form-search__search-type fieldset legend { + position: absolute; + top: -99999em; +} + @media (min-width: 48em) { .form-search__search-type { padding-top: 0; @@ -1947,6 +1951,11 @@ input[type="submit"].form-search__submit { color: #968C83; } +.wvu-article__image { + margin-top: 20px; + margin-bottom: 20px; +} + .wvu-pagination { float: left; padding-top: 10px; @@ -1986,7 +1995,7 @@ input[type="submit"] { font-size: 1em; font-weight: bold; line-height: 1; - padding: 0.75em 1em; + padding: .75em 1em; text-decoration: none; } @@ -2056,7 +2065,7 @@ input[type="submit"] { .button--small { font-size: .9em; - padding: 0.35em 0.45em; + padding: .35em .45em; } .button--big { @@ -2770,7 +2779,7 @@ input[type="submit"] { } } -@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx), (min-resolution: 120dpi) { +@media print, (-o-min-device-pixel-ratio: 5 / 4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx), (min-resolution: 120dpi) { .wvu-social a { -webkit-background-size: contain; background-size: contain; diff --git a/util/blog_index.xslt b/util/blog_index.xslt new file mode 100644 index 0000000..c895f30 --- /dev/null +++ b/util/blog_index.xslt @@ -0,0 +1,35 @@ + + + + +
    + +
+
+ + + + +
diff --git a/views/blog_article.html b/views/blog_article.html index 08dc8df..0c680a5 100644 --- a/views/blog_article.html +++ b/views/blog_article.html @@ -16,6 +16,9 @@

|

+
+ +
diff --git a/views/blog_index.html b/views/blog_index.html index 0d0db2f..d72986a 100644 --- a/views/blog_index.html +++ b/views/blog_index.html @@ -28,8 +28,13 @@

|

+
+ + + +
- +
diff --git a/views/blog_index.xml b/views/blog_index.xml new file mode 100644 index 0000000..86d06ee --- /dev/null +++ b/views/blog_index.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/views/cross-site-blog.html b/views/cross-site-blog.html new file mode 100644 index 0000000..3b28570 --- /dev/null +++ b/views/cross-site-blog.html @@ -0,0 +1,30 @@ +--- +layout: default +--- + + + +
+ + + + +
+

+ +
+
+ +
+
+ +
+ + + +
diff --git a/views/patterns/_wvu-search--wvu-tech.html b/views/patterns/_wvu-search--wvu-tech.html index 2f166cf..691aad7 100644 --- a/views/patterns/_wvu-search--wvu-tech.html +++ b/views/patterns/_wvu-search--wvu-tech.html @@ -14,10 +14,13 @@
- - - - +
+ Choose to search this site or search all WVU sites + + + + +
diff --git a/views/patterns/_wvu-search.html b/views/patterns/_wvu-search.html index 3ca2b63..df4fef9 100644 --- a/views/patterns/_wvu-search.html +++ b/views/patterns/_wvu-search.html @@ -14,10 +14,13 @@
- - - - +
+ Choose to search this site or search all WVU sites + + + + +