diff --git a/Gemfile b/Gemfile index 9f624d853..da8b3aa14 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' group :development, :test do - gem 'jekyll', '~> 3.7.0' + gem 'jekyll', '~> 3.8.0' gem 'jekyll-redirect-from', '~> 0.13.0' gem 'jekyll-sitemap', '~> 1.2.0' gem 'jekyll-toc', '~> 0.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index b4e2cccb3..c2fac1783 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -56,7 +56,7 @@ GEM rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -66,7 +66,7 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.7.0) + jekyll (~> 3.8.0) jekyll-redirect-from (~> 0.13.0) jekyll-sitemap (~> 1.2.0) jekyll-toc (~> 0.5.1) diff --git a/README.md b/README.md index 24c11c613..8a60c4e49 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Because these components will require additional markup (some may require additi - [Content](#content) - [Documentation](#documentation) - [Quick start](#quick-start) -- [Roadmap](#roadmap) ## Content @@ -83,17 +82,3 @@ Several quick start options are available: - Download the [latest release](https://github.com/Daemonite/material/releases) - Install with [bower](https://bower.io/): `bower install daemonite-material` - Install with [npm](https://www.npmjs.com/): `npm install daemonite-material` - -## Roadmap - -### Near-term - -Bug fixes and updates alongside Bootstrap 4's continuous releases. - -### Mid-term - -Add missing support for some Google Material Design components (e.g. snackbars). - -### Long-term - -Rewrite all JavaScript plugins in ES6 to take advantage of the newest JavaScript enhancements. diff --git a/_config.yml b/_config.yml index d21c3bee8..45e99388a 100644 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,11 @@ kramdown: auto_ids: true markdown: kramdown +# minify +compress_html: + blanklines: true + clippings: all + # permalinks permalink: pretty @@ -52,24 +57,24 @@ toc: # vars cdn: - bs_css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" - bs_css_docs: "https://getbootstrap.com/assets/css/docs.min.css" - bs_css_hash: "sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" - bs_js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" - bs_js_docs: "https://getbootstrap.com/assets/js/docs.min.js" - bs_js_hash: "sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" + bs_css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" + bs_css_docs: "https://getbootstrap.com/docs/4.1/assets/css/docs.min.css" + bs_css_hash: "sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" + bs_js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" + bs_js_hash: "sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js" jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" md_font: "https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i|Roboto+Mono:300,400,700|Roboto+Slab:300,400,700" md_icon: "https://fonts.googleapis.com/icon?family=Material+Icons" - popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" - popper_hash: "sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" -current_version: "4.1.0" + popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" + popper_hash: "sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" +current_version: "4.1.1" docs_version: "4.1" download: - source: "https://github.com/Daemonite/material/archive/v4.1.0.zip" - dist: "https://github.com/Daemonite/material/releases/download/v4.1.0/material-4.1.0-dist.zip" + source: "https://github.com/Daemonite/material/archive/v4.1.1.zip" + dist: "https://github.com/Daemonite/material/releases/download/v4.1.1/material-4.1.1-dist.zip" id: + main: "doc-main-h1" navbar: "doc-navbar" navdrawer: "doc-navdrawer" repo: "https://github.com/Daemonite/material" diff --git a/_data/breakpoints.yml b/_data/breakpoints.yml new file mode 100644 index 000000000..3c8cfe293 --- /dev/null +++ b/_data/breakpoints.yml @@ -0,0 +1,29 @@ +- breakpoint: xs + abbr: "" + name: Extra small + min-width: 0px + container: "" + +- breakpoint: sm + abbr: -sm + name: Small + min-width: 576px + container: 540px + +- breakpoint: md + abbr: -md + name: Medium + min-width: 768px + container: 720px + +- breakpoint: lg + abbr: -lg + name: Large + min-width: 992px + container: 960px + +- breakpoint: xl + abbr: -xl + name: Extra large + min-width: 1200px + container: 1140px diff --git a/_data/nav.yml b/_data/nav.yml index 4e6fec3b9..0cacf1d6a 100644 --- a/_data/nav.yml +++ b/_data/nav.yml @@ -71,6 +71,7 @@ - title: Colours - title: Data tables - title: Dialogs + - title: Elevation and shadows - title: Expansion panels - title: Icons - title: Menu @@ -78,7 +79,6 @@ - title: Pickers - title: Progress - title: Selection controls - - title: Shadows - title: Snackbars - title: Steppers - title: Tabs diff --git a/_includes/callout-danger-async-methods.md b/_includes/callout-danger-async-methods.md index 5f83c2d8e..ea04a6326 100644 --- a/_includes/callout-danger-async-methods.md +++ b/_includes/callout-danger-async-methods.md @@ -1,8 +1,6 @@ {% capture callout %} -#### Asynchronous methods and transitions +##### 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**. - -[See our Javascript documentation for more informations.]({{ site.baseurl }}/getting-started/javascript/#content) {% endcapture %} {% include callout.html content=callout type="danger" %} \ No newline at end of file diff --git a/_includes/callout-info-mediaqueries-breakpoints.md b/_includes/callout-info-mediaqueries-breakpoints.md index 732102f37..d3988ce1a 100644 --- a/_includes/callout-info-mediaqueries-breakpoints.md +++ b/_includes/callout-info-mediaqueries-breakpoints.md @@ -1,4 +1,4 @@ {% capture callout %} Note that since browsers do not currently support [range context queries](https://www.w3.org/TR/mediaqueries-4/#range-context), we work around the limitations of [`min-` and `max-` prefixes](https://www.w3.org/TR/mediaqueries-4/#mq-min-max) and viewports with fractional widths (which can occur under certain conditions on high-dpi devices, for instance) by using values with higher precision for these comparisons. {% endcapture %} -{% include callout.html content=callout type="info" %} \ No newline at end of file +{% include callout.html content=callout type="info" %} diff --git a/_includes/callout-warning-color-assistive-technologies.md b/_includes/callout-warning-color-assistive-technologies.md index 46d987a5f..98214eb58 100644 --- a/_includes/callout-warning-color-assistive-technologies.md +++ b/_includes/callout-warning-color-assistive-technologies.md @@ -1,6 +1,6 @@ {% capture callout %} -### Conveying meaning to assistive technologies +##### 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. {% endcapture %} -{% include callout.html content=callout type="info" %} \ No newline at end of file +{% include callout.html content=callout type="warning" %} diff --git a/_includes/footer.html b/_includes/footer.html index b3d137b15..b996753f0 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,3 +1,4 @@ + @@ -7,5 +8,5 @@ - + diff --git a/_includes/header.html b/_includes/header.html index ca593e514..505ea8f54 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,3 +1,4 @@ + {% if page.title %}{{ page.title }} · {% endif %}{{ site.title }} @@ -11,6 +12,7 @@ + diff --git a/_includes/nav-navdrawer.html b/_includes/nav-navdrawer.html index 3a73d566e..c02fdb75f 100644 --- a/_includes/nav-navdrawer.html +++ b/_includes/nav-navdrawer.html @@ -9,50 +9,58 @@