Skip to content

Commit

Permalink
Merge pull request #178 from Daemonite/v4-dev
Browse files Browse the repository at this point in the history
v4.1.0
  • Loading branch information
sesemaya authored Apr 10, 2018
2 parents 929f815 + 5884027 commit ed9c86b
Show file tree
Hide file tree
Showing 168 changed files with 11,239 additions and 6,868 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ source 'https://rubygems.org'
group :development, :test do
gem 'jekyll', '~> 3.7.0'
gem 'jekyll-redirect-from', '~> 0.13.0'
gem 'jekyll-sitemap', '~> 1.1.1'
gem 'jekyll-sitemap', '~> 1.2.0'
gem 'jekyll-toc', '~> 0.5.1'
end
24 changes: 12 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.5)
ffi (1.9.18)
ffi (1.9.23)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.0)
jekyll (3.7.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -29,11 +29,11 @@ GEM
safe_yaml (~> 1.0)
jekyll-redirect-from (0.13.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.1)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-sitemap (1.1.1)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-toc (0.5.1)
jekyll-toc (0.5.2)
nokogiri (~> 1.6)
jekyll-watch (2.0.0)
listen (~> 3.0)
Expand All @@ -45,15 +45,15 @@ GEM
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.1)
rb-fsevent (0.10.2)
public_suffix (3.0.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.0)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.5)
Expand All @@ -68,8 +68,8 @@ PLATFORMS
DEPENDENCIES
jekyll (~> 3.7.0)
jekyll-redirect-from (~> 0.13.0)
jekyll-sitemap (~> 1.1.1)
jekyll-sitemap (~> 1.2.0)
jekyll-toc (~> 0.5.1)

BUNDLED WITH
1.16.0
1.16.1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ daemonite-material/
│ ├── material.min.css
│ └── material.min.css.map
├── docs/
│ └── 4.0/
│ └── 4.1/
└── js/
├── material.js
├── material.js.map
Expand All @@ -69,7 +69,7 @@ Material's documentation, included in this repo in the root directory, is built

### Running documentation locally

1. Run through the [tooling setup](http://daemonite.github.io/material/docs/4.0/getting-started/tooling/#getting-started) to install Jekyll and other Ruby dependencies with `bundle install`.
1. Run through the [tooling setup](http://daemonite.github.io/material/docs/4.1/getting-started/tooling/#getting-started) to install Jekyll and other Ruby dependencies with `bundle install`.
2. Run `npm install` to install Node.js dependencies.
3. Run `npm run dist` and `npm run docs` to rebuild distributed CSS and JavaScript files, as well as docs assets.
4. From the root `/daemonite-material` directory, run `npm run docs-serve` in the command line.
Expand Down
121 changes: 64 additions & 57 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,75 @@
# dependencies
highlighter: rouge
kramdown:
auto_ids: true
markdown: kramdown
highlighter: rouge
kramdown:
auto_ids: true
markdown: kramdown

# permalinks
permalink: pretty
permalink: pretty

# plugins
plugins:
- jekyll-redirect-from
- jekyll-sitemap
- jekyll-toc
plugins:
- jekyll-redirect-from
- jekyll-sitemap
- jekyll-toc

# server
baseurl: "/material" # workaround for our GitHub Pages hosting
destination: "gh-pages/material" # workaround for our GitHub Pages hosting
encoding: "UTF-8"
exclude:
- .babelrc.js
- .eslintignore
- .git
- .gitignore
- .sass-cache/
- assets/
- bower.json
- build/
- docs-assets/
- Gemfile
- Gemfile.lock
- gh-pages/
- lint-vars.sh
- node_modules/
- package.json
- package-lock.json
- README.md
host: 0.0.0.0
port: 9999
source: "."
url: "http://daemonite.github.io/material"
baseurl: "/material" # workaround for our GitHub Pages hosting
destination: "gh-pages/material" # workaround for our GitHub Pages hosting
encoding: "UTF-8"
exclude:
- .babelrc.js
- .eslintignore
- .git
- .gitignore
- .sass-cache/
- assets/
- bower.json
- build/
- docs-assets/
- Gemfile
- Gemfile.lock
- gh-pages/
- lint-vars.sh
- node_modules/
- package.json
- package-lock.json
- README.md
host: 0.0.0.0
port: 9999
source: "."
url: "http://daemonite.github.io/material"

# social
authors: "Daemonite"
description: "Daemonite's Material UI is a cross-platform and fully responsive front-end interface based on Google Material Design developed using Bootstrap 4."
title: "Material"
authors: "Daemonite"
description: "Daemonite's Material UI is a cross-platform and fully responsive front-end interface based on Google Material Design developed using Bootstrap 4."
title: "Material"

# toc
toc:
max_level: 4
min_level: 2

# vars
cdn:
bs_css: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
bs_css_docs: "https://getbootstrap.com/assets/css/docs.min.css"
bs_js: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
bs_js_docs: "https://getbootstrap.com/assets/js/docs.min.js"
jquery: "https://code.jquery.com/jquery-3.2.1.slim.min.js"
jquery_hash: "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
md_font: "https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i"
md_icon: "https://fonts.googleapis.com/icon?family=Material+Icons"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
popper_hash: "sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
current_version: "4.0.0"
docs_version: "4.0"
download:
source: "https://github.com/Daemonite/material/archive/v4.0.0.zip"
dist: "https://github.com/Daemonite/material/releases/download/v4.0.0/material-4.0.0-dist.zip"
id:
navbar: "doc-navbar"
navdrawer: "doc-navdrawer"
repo: "https://github.com/Daemonite/material"
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"
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"
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"
id:
navbar: "doc-navbar"
navdrawer: "doc-navdrawer"
repo: "https://github.com/Daemonite/material"
5 changes: 5 additions & 0 deletions _data/nav.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- title: Getting started
pages:
- title: Introduction
- title: Migration
- title: Theming
- title: Tooling

Expand Down Expand Up @@ -55,6 +56,7 @@
- title: Image replacement
- title: Position
- title: Screenreaders
- title: Shadows
- title: Sizing
- title: Spacing
- title: Text
Expand All @@ -66,6 +68,7 @@
- title: Buttons
- title: Cards
- title: Chips
- title: Colours
- title: Data tables
- title: Dialogs
- title: Expansion panels
Expand All @@ -75,6 +78,8 @@
- title: Pickers
- title: Progress
- title: Selection controls
- title: Shadows
- title: Snackbars
- title: Steppers
- title: Tabs
- title: Text fields
Expand Down
5 changes: 3 additions & 2 deletions _includes/callout-danger-async-methods.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{% callout danger %}
{% capture callout %}
#### 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)
{% endcallout %}
{% endcapture %}
{% include callout.html content=callout type="danger" %}
5 changes: 3 additions & 2 deletions _includes/callout-info-mediaqueries-breakpoints.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% callout info %}
{% 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.
{% endcallout %}
{% endcapture %}
{% include callout.html content=callout type="info" %}
5 changes: 3 additions & 2 deletions _includes/callout-warning-color-assistive-technologies.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% callout warning %}
{% capture callout %}
### 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 %}
{% endcapture %}
{% include callout.html content=callout type="info" %}
9 changes: 9 additions & 0 deletions _includes/callout.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{%- comment -%}
Usage: {% include callout.html content=callout type="type" %},
where content is a capture with the content
and type is one of: info (default), danger, warning
{%- endcomment -%}
{%- assign css_class = include.type | default: "info" -%}
<div class="bd-callout bd-callout-{{ css_class }}">
{{- include.content | markdownify -}}
</div>
23 changes: 23 additions & 0 deletions _includes/example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{%- comment -%}
Usage: {% include example.html content=markup %},
where content is a capture with the HTML content
id - null (default)
class - "bd-example" (default)
optional: hide_preview - disabled (default)
optional: hide_markup - disabled (default)
{%- endcomment -%}

{%- assign preview_id = include.id -%}
{%- assign preview_class = include.class -%}

{%- if include.hide_preview == null -%}
<div{% if preview_id %} id="{{ preview_id }}"{% endif %} class="bd-example{% if preview_class %} {{ preview_class }}{% endif %}">
{{- include.content -}}
</div>
{%- endif -%}

{%- if include.hide_markup == null -%}
{%- highlight html -%}
{{- include.content | replace: 'data-src="holder.js', 'src="...' -}}
{%- endhighlight -%}
{%- endif -%}
6 changes: 3 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- JavaScript -->
<script src="{{ site.cdn.jquery }}"></script>
<script src="{{ site.cdn.popper }}"></script>
<script src="{{ site.cdn.bs_js }}"></script>
<script crossorigin="anonymous" integrity="{{ site.cdn.jquery_hash }}" src="{{ site.cdn.jquery }}"></script>
<script crossorigin="anonymous" integrity="{{ site.cdn.popper_hash }}" src="{{ site.cdn.popper }}"></script>
<script crossorigin="anonymous" integrity="{{ site.cdn.bs_js_hash }}" src="{{ site.cdn.bs_js }}"></script>

<!-- Add Material JavaScript on top of Bootstrap JavaScript -->
<script src="{{ site.baseurl }}/js/material.min.js"></script>
Expand Down
Loading

0 comments on commit ed9c86b

Please sign in to comment.