Skip to content

[IGNORE/WIP] Investigation #10617

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 2 commits into from
Closed

[IGNORE/WIP] Investigation #10617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb205c
Begin site redesign
parlough May 17, 2024
8097e8c
Merge branch 'main' into feat/redesign
parlough May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
"build-site-for-staging": "PRODUCTION=false eleventy",
"build-site-for-production": "PRODUCTION=true eleventy"
},
"dependencies": {
"bootstrap-scss": "^4.6.2"
},
"devDependencies": {
"@11ty/eleventy": "3.0.0-alpha.10",
"diff2html": "^3.4.48",
Expand Down
9 changes: 0 additions & 9 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 71 additions & 13 deletions src/_layouts/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@
</head>
<body{% if body_class %} class="{{ body_class }}"{% endif %}>

{% render cookie-notice.html %}

{%- if isProduction == true -%}
<noscript>
<iframe
Expand All @@ -88,19 +86,79 @@
</noscript>
{% endif -%}

<div id="overlay-under-drawer"></div>

{% include header.html %}

{% render banner.html %}

{{ content }}

{% render footer.html %}
<header id="site-header">
<div id="header-leading">
<div id="menu-button">
<button class="header-button">
<span class="material-symbols-outlined">menu</span>
</button>
</div>
<a class="flutter-logo" href="https://flutter.dev">
<img src="/assets/images/branding/flutter/logo/default.svg" alt="Flutter logo">
<span>Flutter</span>
</a>
<a id="docs-button" href="">Docs</a>
</div>
<div id="header-center">
<search id="header-search">
<button class="header-button">
<span class="material-symbols-outlined">search</span>
</button>
<input type="search" placeholder="Search Flutter docs...">
</search>
</div>
<div id="header-trailing">
<button id="open-search" class="header-button">
<span class="material-symbols-outlined">search</span>
</button>
<button id="theme-switcher" class="header-button">
<span class="material-symbols-outlined">dark_mode</span>
</button>
</div>
</header>

<div id="site-below-header">
<div id="site-banner">

</div>
<div id="site-primary">
{{ content }}
</div>
<footer id="site-footer">
<div class="footer-main">
<a class="flutter-logo" href="https://flutter.dev">
<img src="/assets/images/branding/flutter/logo/default.svg" alt="Flutter logo">
<span>Flutter</span>
</a>
<div class="footer-social-links">
<a href="https://medium.com/flutter" target="_blank" rel="noopener" title="Medium blog">
<svg><use href="/assets/images/social/medium.svg#medium"></use></svg>
</a>
<a href="https://youtube.com/@flutterdev" target="_blank" rel="noopener" title="YouTube">
<svg><use href="/assets/images/social/youtube.svg#youtube"></use></svg>
</a>
<a href="https://github.com/flutter" target="_blank" rel="noopener" title="GitHub">
<svg><use href="/assets/images/social/github.svg#github"></use></svg>
</a>
<a href="https://twitter.com/FlutterDev" target="_blank" rel="noopener" title="X (Twitter)">
<svg><use href="/assets/images/social/x.svg#x"></use></svg>
</a>
</div>
</div>
<div class="footer-section footer-tray">
<div class="footer-licenses">Except as otherwise noted, this site is licensed under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>, and code samples are licensed under the <a href="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</a>.</div>
<div class="footer-utility-links">
<ul>
<li><a href="/tos" title="Terms of use">Terms</a></li>
<li><a href="https://policies.google.com/privacy" target="_blank" rel="noopener" title="Privacy policy">Privacy</a></li>
<li><a href="/security" title="Security philosophy and practices">Security</a></li>
</ul>
</div>
</div>
</footer>
</div>

<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.1/umd/popper.min.js" integrity="sha512-ubuT8Z88WxezgSqf3RLuNi5lmjstiJcyezx34yIU2gAHonIi27Na7atqzUZCOoY4CExaoFumzOsFQ2Ch+I/HCw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/js/bootstrap.min.js" integrity="sha512-7rusk8kGPFynZWu26OKbTeI+QPoYchtxsmPeBqkHIEXJxeun4yJ4ISYe7C6sz9wdxeE1Gk3VxsIWgCZTc+vX3g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.min.js" integrity="sha512-nlp9/l96/EpjYBx7EP7pGASVXNe80hGhYAUrjeXnu/fyF5Py0/RXav4BBNs7n5Hx1WFhOEOWSAVjGeC3oKxDVQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

<script src="{{ '/assets/js/tabs.js' | append: cache_bust }}"></script>
Expand Down
60 changes: 14 additions & 46 deletions src/_layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,23 @@
layout: base
---

{% if toc != false -%}
{% assign tocContents = content | generate_toc %}
{% if tocContents == null or tocContents == '' -%}
{% assign toc = false %}
{% endif -%}
{% endif -%}
<nav id="sidenav-inline">

{% assign sidebar-col = 'col-12 col-md-3 col-xl-2' -%}
{% if toc != false -%}
{% assign main-col = 'col-12 col-md-9 offset-md-3 col-xl-8 offset-xl-2 col-xxl-8 offset-xxl-2' -%}
{% comment %}Side toc is col-xl-2{% endcomment -%}
{% else -%}
{% assign main-col = 'col-12 col-md-9 offset-md-3 col-xl-10 offset-xl-2 col-xxl-8 offset-xxl-2' -%}
{% endif -%}
</nav>
<main id="site-content">
<header>
<h1>{{title}}</h1>
<div id="site-breadcrumbs">

<div class="container-fluid position-relative">
<div class="row flex-xl-nowrap">
<div class="fixed-col site-sidebar site-sidebar--fixed {{sidebar-col}} d-none d-md-block" data-fixed-column>
{% assign route = page.url | regex_replace:'/index$|/index\.html$|\.html$|/$' %}
{% render sidenav-level-1.html, url:page.url, nav:sidenav, base_id:"fixed", active_nav:activeNav %}
</div>
<nav id="toc-inline">

<main class="site-content {{main-col}}">
{% if toc != false -%}
{% include side-toc.html tocContents=tocContents %}
{% endif -%}
<div class="container">
</nav>

{% if deprecated %}
{% render snackbar.html, class:"snackbar--dismissible", label:"This page is deprecated and its content may be out of date.", action:"Dismiss" %}
{% endif %}
{{ content }}
</header>
<p class="text-sm dark:opacity-70"><span>Page last updated on 2023-07-13:13:43. </span><a href="" class="text-primary-500 focus-visible:ring-2 focus-visible:ring-primary-500 hover:underline hover:text-primary-600 active:text-primary-700 rounded-sm">View source</a><span> or </span><a href="" class="text-primary-500 focus-visible:ring-2 focus-visible:ring-primary-500 hover:underline hover:text-primary-600 active:text-primary-700 rounded-sm">report an issue.</a></p>
</main>
<nav id="toc-side">

{% include next-prev-nav.html prev=prev next=next %}

<header class="site-content__title">
{% include page-github-links.html %}
<h1>{{ title }}</h1>
{% if show_breadcrumbs != false -%}
{% include breadcrumbs.html %}
{% endif -%}
</header>

{% if toc != false -%}
{% include inline-toc.html tocContents=tocContents -%}
{% endif -%}
{{ content }}

{% include next-prev-nav.html prev=prev, next=next %}
</div>
</main>
</div>
</div>
</nav>
Loading