Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Reduce liquid's whitespace for a few pages and move about menu to the end. #23457

Merged
merged 2 commits into from
Aug 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions _data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
# - title: Approach
- title: Icons

- title: Migration

- title: About
pages:
- title: History
- title: Team
- title: Brand
- title: License
- title: Translations

- title: Migration
2 changes: 1 addition & 1 deletion _includes/callout-danger-async-methods.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% callout danger %}
#### Asynchronous methods and transitions

All API methods are **asynchronous** and start a **transition**. They returns to the caller as soon as the transition is started but **before it ends**. In addition, a method call on a **transitioning component will be ignored**.
All API methods are **asynchronous** and start a **transition**. They return to the caller as soon as the transition is started but **before it ends**. In addition, a method call on a **transitioning component will be ignored**.

[See our JavaScript documentation for more information.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
{% endcallout %}
2 changes: 1 addition & 1 deletion _includes/callout-warning-color-assistive-technologies.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#### Conveying meaning to assistive technologies

Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (e.g. the visible text), or is included through alternative means, such as additional text hidden with the `.sr-only` class.
{% endcallout %}
{% endcallout %}
40 changes: 20 additions & 20 deletions _includes/docs-sidebar.html
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<form class="bd-search d-flex align-items-center">
<input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off">
<button class="btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs avigation">
<button class="btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation">
{% include icons/menu.svg class="" width="30" height="30" %}
</button>
</form>

<nav class="collapse bd-links" id="bd-docs-nav">
{% assign page_slug = page.url | split: '/' | last %}
{% for group in site.data.nav %}
{% assign link = group.pages | first %}
{% assign link_slug = link.title | slugify %}
{% assign group_slug = group.title | slugify %}
{% assign active = nil %}
{%- assign page_slug = page.url | split: '/' | last -%}
{%- for group in site.data.nav -%}
{%- assign link = group.pages | first -%}
{%- assign link_slug = link.title | slugify -%}
{%- assign group_slug = group.title | slugify -%}
{%- assign active = nil -%}

{% if page.group == group_slug %}
{% assign active = 'active' %}
{% endif %}
{%- if page.group == group_slug -%}
{%- assign active = 'active' -%}
{%- endif -%}

<div class="bd-toc-item {{ active }}">
<div class="bd-toc-item{% unless active == nil %} {{ active }}{% endunless %}">
<a class="bd-toc-link" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}">
{{ group.title }}
</a>

<ul class="nav bd-sidenav">
{% for doc in group.pages %}
{% assign doc_slug = doc.title | slugify %}
{% assign active = nil %}
{%- for doc in group.pages -%}
{%- assign doc_slug = doc.title | slugify -%}
{%- assign active = nil -%}

{% if page.group == group_slug and page_slug == doc_slug %}
{% assign active = 'active bd-sidenav-active' %}
{% endif %}
{%- if page.group == group_slug and page_slug == doc_slug -%}
{%- assign active = 'active bd-sidenav-active' -%}
{%- endif -%}

<li class="{{ active }}">
<li{% unless active == nil %} class="{{ active }}"{% endunless %}>
<a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ doc_slug }}/">
{{ doc.title }}
</a>
Expand All @@ -50,8 +50,8 @@
{% endunless %}
{% endcomment %}
</li>
{% endfor %}
{%- endfor -%}
</ul>
</div>
{% endfor %}
{%- endfor -%}
</nav>
10 changes: 5 additions & 5 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<meta name="generator" content="Jekyll v{{ jekyll.version }}">

<title>
{% if page.title %}
{%- if page.title -%}
{{ page.title }} &middot; {{ site.title }}
{% else %}
{%- else -%}
{{ site.title }} &middot; {{ site.description }}
{% endif %}
{%- endif -%}
</title>

{% include social.html %}

<!-- Bootstrap core CSS -->
{% if site.github %}
<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
Expand All @@ -25,6 +23,8 @@
{% endif %}
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">

{% include social.html %}

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
2 changes: 1 addition & 1 deletion _includes/scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
fg: 'rgba(255,255,255,.75)',
font: 'Helvetica',
fontweight: 'normal'
})
});
</script>
8 changes: 4 additions & 4 deletions _includes/social.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!-- Meta -->
<meta name="description" content="{{ site.description }}">
<meta name="author" content="{{ site.authors }}">

<!-- Twitter -->
<meta name="twitter:site" content="@{{ site.twitter }}">
<meta name="twitter:creator" content="@{{ site.twitter }}">
Expand Down Expand Up @@ -30,7 +34,3 @@
<meta property="og:image:type" content="image/png">
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">

<!-- Meta -->
<meta name="description" content="{{ site.description }}">
<meta name="author" content="{{ site.authors }}">