Rely on symlinks less

eleventy.config.js

@@ -78,7 +78,6 @@ export default function (eleventyConfig) {
   eleventyConfig.addPassthroughCopy('src/content/assets/dash');
   eleventyConfig.addPassthroughCopy('src/content/assets/js');
   eleventyConfig.addPassthroughCopy('src/content/assets/img', {expand: true});
-  eleventyConfig.addPassthroughCopy('src/content/assets/shared', {expand: true, filter: /^(?!_).+/});
   eleventyConfig.addPassthroughCopy('src/content/f', {expand: true, filter: /^(?!_).+/});
   eleventyConfig.addPassthroughCopy('src/content/guides/language/specifications');
 

firebase.json

@@ -74,8 +74,8 @@
       { "source": "/articles/using-future-based-apis{,/**}", "destination": "/codelabs/async-await", "type": 301 },
       { "source": "/articles/why-dart-types", "destination": "/resources/faq#types", "type": 301 },
       { "source": "/articles/zones", "destination": "/articles/archive/zones", "type": 301 },
-      { "source": "/assets/dart-logo-for-shares*.png", "destination": "/assets/shared/dart-logo-for-shares.png?2", "type": 301 },
-      { "source": "/assets/dart-logo-wordmark*.png", "destination": "/assets/shared/dart-logo-for-shares.png?2", "type": 301 },
+      { "source": "/assets/dart-logo-for-shares*.png", "destination": "/assets/img/logo/dart-logo-for-shares.png", "type": 301 },
+      { "source": "/assets/dart-logo-wordmark*.png", "destination": "/assets/img/logo/dart-logo-for-shares.png", "type": 301 },
       { "source": "/books", "destination": "/resources/books", "type": 301 },
       { "source": "/bug", "destination": "https://dartbug.com", "type": 301 },
       { "source": "/bug/:rest*", "destination": "https://dartbug.com/:rest*", "type": 301 },

src/_includes/head.html

@@ -29,7 +29,7 @@
   {% endif -%}
 
   <!-- Favicon / Touch Icons -->
-  <link rel="icon" sizes="64x64" href="/assets/shared/dart/icon/64.png">
+  <link rel="icon" sizes="64x64" href="/assets/img/logo/dart-64.png">
   <link href="/assets/img/touch-icon-iphone.png" rel="apple-touch-icon">
   <link href="/assets/img/touch-icon-ipad.png" rel="apple-touch-icon" sizes="152x152">
   <link href="/assets/img/touch-icon-iphone-retina.png" rel="apple-touch-icon" sizes="180x180">
@@ -46,7 +46,7 @@
   <meta property="og:description" content="{{desc}}">
   <meta property="og:url" content="{{ page.url }}">
 
-  {% assign og_image_path = page.og_image | default: '/assets/shared/dart-logo-for-shares.png' -%}
+  {% assign og_image_path = page.og_image | default: '/assets/img/logo/dart-logo-for-shares.png' -%}
   {% assign og_type = page.og_type -%}
 
   {% comment %} Add page URL to page relative paths {% endcomment -%}

src/_includes/navigation-main.html

@@ -3,7 +3,7 @@
 <nav id="mainnav" class="site-header">
   <div id="menu-toggle"><i class="material-icons">menu</i></div>
   <a href="/" class="brand" title="{{site.title}}">
-    <img src="/assets/img/shared/dart/logo+text/horizontal/white.svg" alt="{{site.title}}">
+    <img src="/assets/img/logo/logo-white-text.svg" alt="{{site.title}}">
   </a>
   <ul class="navbar">
     {%- comment -%}

src/_includes/page-footer.html

@@ -1,7 +1,7 @@
 <footer id="page-footer">
   <div class="footer-section footer-main">
     <a href="/" class="brand" title="Dart">
-      <img src="/assets/img/shared/dart/logo+text/horizontal/white.svg" alt="Dart" width="164">
+      <img src="/assets/img/logo/logo-white-text.svg" alt="Dart" width="164">
     </a>
     <div class="footer-social-links">
       <a href="https://medium.com/dartlang" target="_blank" rel="noopener" title="Medium blog">

src/content/multiplatform-apps.md

@@ -27,7 +27,7 @@ fast production code for any platform.
 
 <p class="text-center"> 
   <a href="{{site.flutter-docs}}/get-started" class="btn btn-primary btn-lg">
-    <img src="/assets/img/shared/flutter/icon/64.png" width="32px" alt="Flutter">
+    <img src="/assets/img/logo/flutter-64.png" width="32px" alt="Flutter">
     Get started
   </a>
 </p>

src/content/terms.md

@@ -10,7 +10,7 @@ you consent to be bound by Google's general [Terms of Service][]
 and Google's general [Privacy Policy.][Privacy Policy]
 
 The "Dart" name and the Dart logo
-<img src="/assets/shared/dart/icon/64.png" width="32" alt="Dart logo" class="align-baseline">
+<img src="/assets/img/logo/dart-64.png" width="32" alt="Dart logo" class="align-baseline">
 (the "Dart Marks") are trademarks owned by Google and are not included
 within the assets licensed under the Creative Commons Attribution 4.0
 International License.  Google grants you a non-transferable,

src/content/web/debugging.md

@@ -118,7 +118,7 @@ but you'll need to adjust the instructions to match your app.
    * If Dart Debug Extension is installed and
      you used the `--debug-extension` flag to `webdev`,
      click the Dart logo
-     <img src="/assets/shared/dart/icon/64.png" width="16" alt="Dart logo" class="align-baseline">
+     <img src="/assets/img/logo/dart-64.png" width="16" alt="Dart logo" class="align-baseline">
      at the top right of the browser window.
      
    * If you used the `--debug` flag to `webdev`,