Skip to content
Permalink
Browse files

Theme: initial integration of CSS for base WET Theme

- Partial cleanup up of base SCSS

- Changed dist/demo directory to dist/demos to align with existing v3.1 folder structure

- Now generating license files and update generated home files

- Updated build to move assets and plugin files to the new dist/demos directory

- Corrected duplication of accessiblity placeholders

- Removed sr-only trailing reference

Removed redundant accessiblity file
  • Loading branch information...
masterbee authored and nschonni committed Oct 17, 2013
1 parent 7800386 commit ec312234c0991ea9cfbb538edca38050c3a1adab
Showing with 544 additions and 222 deletions.
  1. +7 −0 Gruntfile.coffee
  2. +1 −1 site/includes/brand.hbs
  3. +9 −8 site/includes/breadcrumbs.hbs
  4. +39 −35 site/includes/footer.hbs
  5. +12 −8 site/includes/languagetoggle.hbs
  6. +15 −11 site/includes/sitemenu.hbs
  7. +9 −3 site/includes/sitesearch.hbs
  8. +26 −11 site/layouts/default.hbs
  9. +24 −1 src/index-en.hbs
  10. +5 −3 src/plugins/data-picture/data-picture-en.hbs
  11. +4 −2 src/plugins/feedback/feedback-en.hbs
  12. +3 −1 src/plugins/footnotes/footnotes-en.hbs
  13. +3 −1 src/plugins/formvalid/formvalid-en.hbs
  14. +8 −6 src/plugins/lightbox/lightbox-en.hbs
  15. +32 −30 src/plugins/mediaplayer/mediaplayer-en.hbs
  16. +13 −0 src/plugins/menu/assets/mobmenu-en.html
  17. +44 −0 src/plugins/menu/assets/sitemenu-en.html
  18. +3 −1 src/plugins/menu/menu-en.hbs
  19. +3 −1 src/plugins/prettify/prettify-en.hbs
  20. +3 −1 src/plugins/session-timeout/session-timeout-en.hbs
  21. +2 −0 src/plugins/share/share-en.hbs
  22. +3 −3 src/plugins/tables/tables-en.hbs
  23. +8 −15 src/plugins/toggle/toggle-en.hbs
  24. +3 −1 src/plugins/twitter/twitter-en.hbs
  25. +2 −0 src/plugins/webfeeds/webfeeds-en.hbs
  26. +14 −0 theme/assets/logo.svg
  27. +28 −25 theme/layouts/theme.hbs
  28. +21 −0 theme/sass/includes/_defaults.scss
  29. +23 −0 theme/sass/parts/_banner.scss
  30. +24 −0 theme/sass/parts/_breadcrumb.scss
  31. +34 −0 theme/sass/parts/_language.scss
  32. +14 −0 theme/sass/parts/_main.scss
  33. +6 −0 theme/sass/parts/_search.scss
  34. +29 −0 theme/sass/parts/_sitenav.scss
  35. +51 −0 theme/sass/parts/_skipnav.scss
  36. +19 −54 theme/sass/theme.scss
@@ -117,6 +117,7 @@ module.exports = (grunt) ->
"INTERNAL: Process non-CSS/JS assets to dist",
[
"copy:misc"
"copy:themeAssets"
]
)

@@ -442,6 +443,12 @@ module.exports = (grunt) ->
expand: true
flatten: true

themeAssets:
cwd: "theme/"
src: "**/assets/*.*"
dest: "dist"
expand: true

clean:
dist: "dist"

@@ -1 +1 @@
<a href="index-{{language}}.html"><object type="image/svg+xml" tabindex="-1" role="img" data="{{assets}}/images/logo.svg" aria-label="{{sitetitle}}"></object><span>{{sitetitle}}<small>{{tagline}}</small></span></a>
<a href="index-{{language}}.html"><object type="image/svg+xml" tabindex="-1" role="img" data="{{assets}}/assets/logo.svg" aria-label="{{sitetitle}}"></object><span>{{sitetitle}}<small>{{tagline}}</small></span></a>
@@ -1,8 +1,9 @@
<ol>
<li>
<a href="../index-{{language}}.html">{{#i18n "%tmpl-home"}}{{/i18n}}</a>
</li>
<li>
{{#i18n "%tmpl-work-examples"}}{{/i18n}}
</li>
</ol>
<div class="container">
<div class="row">
<ol class="breadcrumb">
<li>
<a href="{{assets}}/index-{{language}}.html">{{#i18n "%tmpl-home"}}{{/i18n}}</a>
</li>
</ol>
</div>
</div>
@@ -1,35 +1,39 @@
<section class="col-sm-3 col-lg-3">
<h3>About</h3>
<ul>
<li>
<a href="#">About the Web Experience Toolkit</a>
</li>
<li>
<a href="#">About the Web Standards</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>Contact us</h3>
<ul>
<li>
<a href="#">Questions or comments?</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>News</h3>
<ul>
<li>
<a href="#">Recent project activity</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>Stay Connected</h3>
<ul>
<li>
<a href="#">Twitter</a>
</li>
</ul>
</section>
<div class="container">
<div class="row">
<section class="col-sm-3 col-lg-3">
<h3>About</h3>
<ul class="list-unstyled">
<li>
<a href="#">About the Web Experience Toolkit</a>
</li>
<li>
<a href="#">About the Web Standards</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>Contact us</h3>
<ul class="list-unstyled">
<li>
<a href="#">Questions or comments?</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>News</h3>
<ul class="list-unstyled">
<li>
<a href="#">Recent project activity</a>
</li>
</ul>
</section>
<section class="col-sm-3 col-lg-3">
<h3>Stay Connected</h3>
<ul class="list-unstyled">
<li>
<a href="#">Twitter</a>
</li>
</ul>
</section>
</div>
</div>
@@ -1,8 +1,12 @@
<ul>
<li class="current">
{{#i18n "%lang-native"}}{{/i18n}}{{#i18n "%interword-space"}}{{/i18n}}<span>{{#i18n "%current"}}{{/i18n}}</span>
</li>
<li>
<a lang="fr" href="#">Français</a>
</li>
</ul>
<div class="container">
<div class="row text-right">
<ul data-ajax-before="{{assets}}/js/assets/mobmenu-{{language}}.html" class="visible-md visible-lg">
<li class="current">
{{#i18n "%lang-native"}}{{/i18n}}{{#i18n "%interword-space"}}{{/i18n}}<span>{{#i18n "%current"}}{{/i18n}}</span>
</li>
<li>
<a lang="fr" href="#">Français</a>
</li>
</ul>
</div>
</div>
@@ -1,11 +1,15 @@
<ul class="mb-menu">
<li>
<a href="http://wet-boew.github.io/wet-boew/index-en.html">WET project</a>
</li>
<li>
<a href="https://github.com/wet-boew/wet-boew/wiki/Implementing-WET">Implement WET</a>
</li>
<li>
<a href="https://github.com/wet-boew/wet-boew/wiki/Contributor-guidelines">Contribute to WET</a>
</li>
</ul>
<div class="container">
<div class="row">
<ul class="mb-menu">
<li>
<a href="http://wet-boew.github.io/wet-boew/index-en.html">WET project</a>
</li>
<li>
<a href="https://github.com/wet-boew/wet-boew/wiki/Implementing-WET">Implement WET</a>
</li>
<li>
<a href="https://github.com/wet-boew/wet-boew/wiki/Contributor-guidelines">Contribute to WET</a>
</li>
</ul>
</div>
</div>
@@ -1,7 +1,13 @@
<form action="#" method="post" role="search" class="form-inline">
<div id="wet-srchbx-in">
<label for="wb-srch-txt">{{#i18n "%tmpl-search-site"}}{{/i18n}}</label>
<input id="wb-srch-txt" class="wb-srch-txt form-control" name="wb-srch-txt" type="search" value="" size="27" maxlength="150" />

<div class="form-group">
<label for="wb-srch-txt">{{#i18n "%tmpl-search-site"}}{{/i18n}}</label>
<input id="wb-srch-txt" class="wb-srch-txt form-control" name="wb-srch-txt" type="search" value="" size="27" maxlength="150" />
</div>

<button type="submit" id="wb-srch-submit" class="wb-srch-submit btn btn-primary btn-small" name="wb-srch-submit">{{#i18n "%tmpl-search"}}{{/i18n}}</button>


</div>
</form>
</form>
@@ -34,17 +34,26 @@
</ul>
<header role="banner">
<div id="wb-banner">
{{>brand}}

<section id="wb-lang">
<h2>{{#i18n "%tmpl-lang-select"}}{{/i18n}}</h2>
{{>languagetoggle}}
</section>

<section id="wb-srch">
<h2>{{#i18n "%tmpl-search"}}{{/i18n}}</h2>
{{>sitesearch}}
</section>
<div class="container">
<div class="row">

<section id="wb-sitetitle" class="col-md-8">
{{>brand}}
</section>

<section id="wb-srch" class="col-md-4 visible-md visible-lg">
<h2>{{#i18n "%tmpl-search"}}{{/i18n}}</h2>
{{>sitesearch}}
</section>

</div>
</div>

</div>

<nav role="navigation" id="wb-sm" typeof="SiteNavigationElement">
@@ -58,16 +67,22 @@
</nav>
</header>

<main role="main" property="mainContentOfPage">
<h1 id="wb-cont" property="name">{{title}}</h1>
{{>body}}
<main role="main" property="mainContentOfPage" class="container">
<div class="row">
<div class="col-md-12">
<h1 id="wb-cont" property="name">{{title}}</h1>
{{>body}}
</div>

</div>
</main>

<!-- Secondary Menu [optional] -->
<!-- Secondary Menu
<nav role="navigation" id="wb-sec" typeof="SiteNavigationElement">
<h2>{{#i18n "%tmpl-sec-menu"}}{{/i18n}}</h2>
{{>supporting}}
</nav>
[optional] -->

<footer role="contentinfo" id="wb-nav">
<nav role="navigation">
@@ -79,7 +94,7 @@
<script src="{{assets}}/js/jquery.min.js"></script>
<script src="{{assets}}/js/vapour{{environment.suffix}}.js"></script>
<!--<![endif]-->
<script src="{{assets}}/js/wet-boew{{environment.suffix}}.js"></script>
<script src="{{assets}}/js/wet-boew{{environment.suffix}}.js"></script>
{{#if environment.test}}{{>test}}{{/if}}
</body>
</html>
@@ -1,8 +1,10 @@
---
title: Web Experience Toolkit (WET)
language: en
sitetitle: Web Experience Toolkit (WET)
tagline: Collaborative open source project led by the Government of Canada
---
<section>

<h2 id="about">What is the Web Experience Toolkit?</h2>
<ul>
<li>Collaborative open source project led by the Government of Canada</li>
@@ -174,6 +176,27 @@ language: en
</ul>
</section>

<section><h3>v3.0</h3>
<ul>
<li><a href="https://github.com/wet-boew/wet-boew/wiki/v3.0-changelog">v3.0 changelog</a></li>
<li><strong>WET v3.0.10 was released on September 17, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.10-release-notes">v3.0.10 release notes</a>)</li>
<li><strong>WET v3.0.9 was released on August 6, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.9-release-notes">v3.0.9 release notes</a>)</li>
<li><strong>WET v3.0.8 was released on June 27, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.8-release-notes">v3.0.8 release notes</a>)</li>
<li><strong>WET v3.0.7 was released on May 16, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.7-release-notes">v3.0.7 release notes</a>)</li>
<li><strong>WET v3.0.6 was released on April 11, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.6-release-notes">v3.0.6 release notes</a>)</li>
<li><strong>WET v3.0.5 was released on February 15, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.5-release-notes">v3.0.5 release notes</a>)</li>
<li><strong>WET v3.0.4 was released on January 24, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.4-release-notes">v3.0.4 release notes</a>)</li>
<li><strong>WET v3.0.3 was released on December 21, 2012</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.3-release-notes">v3.0.3 release notes</a>)</li>
<li><strong>WET v3.0.2 was released on November 15, 2012</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.2-release-notes">v3.0.2 release notes</a>)</li>
<li><strong>WET v3.0.1 was released on October 9, 2012</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.0.1-release-notes">v3.0.1 release notes</a>)</li>
<li><strong>WET v3.0 was released on September 17, 2012</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/V3.0-release-notes">v3.0 release notes</a>)</li>
</ul>
<li><strong>WET v3.1.0 Release Candidate 1 was released on April 3, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.1.0-Release-Candidate-1-release-notes">v3.1.0 Release Candidate 1 release notes</a>)</li>
<li><strong>WET v3.1.0 Beta 2 was released on February 15, 2013</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.1.0-Beta-2-release-notes">v3.1.0 Beta 2 release notes</a>)</li>
<li><strong>WET v3.1.0 Beta 1 was released on December 21, 2012</strong> (<a href="https://github.com/wet-boew/wet-boew/wiki/v3.1.0-Beta-1-release-notes">v3.1.0 Beta 1 release notes</a>)</li>
</ul>
</section>

<section><h3>v3.0</h3>
<ul>
<li><a href="https://github.com/wet-boew/wet-boew/wiki/v3.0-changelog">v3.0 changelog</a></li>
@@ -1,11 +1,13 @@
---
title: Picturefill
language: en
sitetitle: Web Experience Toolkit (WET)
tagline: Collaborative open source project led by the Government of Canada
---

<section>
<h2>Picturefill</h2>
<h2>Features</h2>

<h3>Browser Width</h3>
<p>This example uses <a href="http://www.w3.org/TR/css3-mediaqueries/#width">min-width</a> to determine which image should be displayed. Resize the browser window to see the different images load.</p>
<span data-picture data-alt="Parliament Hill">
@@ -68,5 +70,5 @@ language: en
&lt;noscript&gt;&lt;img src="img/cave-low-res.jpg" alt="False Kiva in the Canyonlands"/&gt;&lt;/noscript&gt;
&lt;/span&gt;</pre>
</details>

</section>
@@ -1,6 +1,8 @@
---
title: Feedback form
language: en
sitetitle: Web Experience Toolkit (WET)
tagline: Collaborative open source project led by the Government of Canada
---
<div class="wb-formvalid wb-feedback">
<p>If you have difficulty with the following form, you can use any of our <a href="#osc-avs">other service channels</a> to contact us. Please read the <a href="#pics-ecrp">Personal Information Collection Statement</a> before completing this form.</p>
@@ -65,7 +67,7 @@ language: en
<input type="text" id="dbrowser" name="dbrowser" size="20" maxlength="100" />
<label for="daad">Adaptive or assistive device</label>
<input type="text" id="daad" name="daad" size="20" maxlength="100" />
</fieldset>
</fieldset>
</section>

<section id="mobile">
@@ -154,4 +156,4 @@ language: en
<dd><em>[teletypewriter number]</em></dd>
</dl>
</address>
</noscript>
</noscript>
@@ -1,6 +1,8 @@
---
title: Footnotes
language: en
sitetitle: Web Experience Toolkit (WET)
tagline: Collaborative open source project led by the Government of Canada
---
<section>
<h2>Overview</h2>
@@ -61,4 +63,4 @@ language: en
</dd>
</dl>
</section>
</div>
</div>
@@ -1,6 +1,8 @@
---
title: Form validation
language: en
sitetitle: Web Experience Toolkit (WET)
tagline: Collaborative open source project led by the Government of Canada
---
<div class="wb-formvalid">
<form action="#" method="get" id="validation-example">
@@ -70,4 +72,4 @@ language: en
<li>Method 2</li>
<li>Method n</li>
</ul>
</noscript>
</noscript>
Oops, something went wrong.

0 comments on commit ec31223

Please sign in to comment.
You can’t perform that action at this time.