diff --git a/docs/README.md b/docs/README.md index 0c52a8c4..29c2538b 100755 --- a/docs/README.md +++ b/docs/README.md @@ -225,8 +225,6 @@ dist By default, Pages will include the surrounding Drizzle UI elements in their layout: -![](./drizzle_default_layout.png) - To use a different [layout template](#layouts), you can assign one in the Page [front-matter](#front-matter): ```yaml diff --git a/docs/drizzle_default_layout.png b/docs/drizzle_default_layout.png deleted file mode 100755 index 90977875..00000000 Binary files a/docs/drizzle_default_layout.png and /dev/null differ diff --git a/gulp/config.js b/gulp/config.js index 16755e5a..69373892 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -118,7 +118,10 @@ module.exports = { dest: `${dest}/protocol` }, img: { - src: `${src}/img/**/*`, + src: [ + `${src}/img/**/*`, + `./node_modules/@mozilla-protocol/assets/**/*` + ], dest: `${dest}/protocol/protocol/img/` }, fonts: { diff --git a/package.json b/package.json index 0b665f0d..a1f12981 100755 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "devDependencies": { "@cloudfour/gulp-tasks": "^2.0.1", "@cloudfour/hbs-helpers": "^0.9.0", + "@mozilla-protocol/assets": "0.0.3", "@mozilla-protocol/colors": "^2.1.0", "bower": "^1.8.4", "doctoc": "^1.1.1", diff --git a/src/assets/img/card/card-tag-audio.svg b/src/assets/img/card/card-tag-audio.svg deleted file mode 100644 index 324d112c..00000000 --- a/src/assets/img/card/card-tag-audio.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/img/card/card-tag-video.svg b/src/assets/img/card/card-tag-video.svg deleted file mode 100644 index 1e1fa8fe..00000000 --- a/src/assets/img/card/card-tag-video.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/sass/docs/site.scss b/src/assets/sass/docs/site.scss index 29c32a81..0b10ae8e 100644 --- a/src/assets/sass/docs/site.scss +++ b/src/assets/sass/docs/site.scss @@ -52,15 +52,8 @@ } .protosite-js-nav-toggle { - @include image-replaced; - background: #000 url('/static/img/icon-menu-white.svg') center center no-repeat; - @include background-size(30px auto); cursor: pointer; display: block; - height: 2.2em; - overflow: hidden; - position: relative; - width: 2.2em; @media #{$media-md} { display: none; @@ -296,8 +289,3 @@ width: 1.5em; } } - - - - - diff --git a/src/assets/sass/protocol/components/_card.scss b/src/assets/sass/protocol/components/_card.scss index 2e02e7a7..9b3000c2 100644 --- a/src/assets/sass/protocol/components/_card.scss +++ b/src/assets/sass/protocol/components/_card.scss @@ -60,11 +60,11 @@ } &.mzp-has-video .mzp-c-card-tag { - background: url('#{$image-path}/card/card-tag-video.svg') center left no-repeat; + background: url('#{$image-path}/icons/ui/video.svg') center left no-repeat; } &.mzp-has-audio .mzp-c-card-tag { - background: url('#{$image-path}/card/card-tag-audio.svg') center left no-repeat; + background: url('#{$image-path}/icons/ui/audio.svg') center left no-repeat; } .mzp-c-card-title { diff --git a/src/pages/fundamentals/principles.md b/src/pages/fundamentals/principles.md index 03f17940..74dc23d7 100644 --- a/src/pages/fundamentals/principles.md +++ b/src/pages/fundamentals/principles.md @@ -7,9 +7,6 @@ These are the guiding principles that inform our design decisions. The components, pages, and websites we create should be: - - - ### Meaningful Design should reinforce the meaning of content, not distract from it. We prioritize worthwhile communication over decoration. If an aspect of the design doesn’t enhance the content, we should remove it. diff --git a/src/pages/index.hbs b/src/pages/index.hbs index ee9cced3..adc30b8c 100755 --- a/src/pages/index.hbs +++ b/src/pages/index.hbs @@ -9,5 +9,3 @@ order: 0 websites. This system will evolve and expand as we define more pieces of it, but we gotta start somewhere.

- - diff --git a/src/static/img/construction-sm.gif b/src/static/img/construction-sm.gif deleted file mode 100644 index 2d641dec..00000000 Binary files a/src/static/img/construction-sm.gif and /dev/null differ diff --git a/src/static/img/icon-menu-white.svg b/src/static/img/icon-menu-white.svg deleted file mode 100644 index f002b9e2..00000000 --- a/src/static/img/icon-menu-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/static/img/mozilla-icon.png b/src/static/img/mozilla-icon.png deleted file mode 100644 index 08884b41..00000000 Binary files a/src/static/img/mozilla-icon.png and /dev/null differ diff --git a/src/static/img/mozilla-wordmark-black.svg b/src/static/img/mozilla-wordmark-black.svg deleted file mode 100644 index 9b0c1259..00000000 --- a/src/static/img/mozilla-wordmark-black.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/src/static/img/mozilla-wordmark-white.svg b/src/static/img/mozilla-wordmark-white.svg deleted file mode 100644 index 30b5f433..00000000 --- a/src/static/img/mozilla-wordmark-white.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/src/static/img/skinner.png b/src/static/img/skinner.png deleted file mode 100644 index 9e1c553b..00000000 Binary files a/src/static/img/skinner.png and /dev/null differ diff --git a/src/templates/drizzle/nav.hbs b/src/templates/drizzle/nav.hbs index ef33d397..9d23359a 100755 --- a/src/templates/drizzle/nav.hbs +++ b/src/templates/drizzle/nav.hbs @@ -8,7 +8,7 @@