Skip to content

Commit ed9c86b

Browse files
authored
Merge pull request #178 from Daemonite/v4-dev
v4.1.0
2 parents 929f815 + 5884027 commit ed9c86b

File tree

168 files changed

+11239
-6868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+11239
-6868
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ source 'https://rubygems.org'
33
group :development, :test do
44
gem 'jekyll', '~> 3.7.0'
55
gem 'jekyll-redirect-from', '~> 0.13.0'
6-
gem 'jekyll-sitemap', '~> 1.1.1'
6+
gem 'jekyll-sitemap', '~> 1.2.0'
77
gem 'jekyll-toc', '~> 0.5.1'
88
end

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ GEM
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0.6.0)
1111
eventmachine (1.2.5)
12-
ffi (1.9.18)
12+
ffi (1.9.23)
1313
forwardable-extended (2.6.0)
1414
http_parser.rb (0.6.0)
15-
i18n (0.9.1)
15+
i18n (0.9.5)
1616
concurrent-ruby (~> 1.0)
17-
jekyll (3.7.0)
17+
jekyll (3.7.3)
1818
addressable (~> 2.4)
1919
colorator (~> 1.0)
2020
em-websocket (~> 0.5)
@@ -29,11 +29,11 @@ GEM
2929
safe_yaml (~> 1.0)
3030
jekyll-redirect-from (0.13.0)
3131
jekyll (~> 3.3)
32-
jekyll-sass-converter (1.5.1)
32+
jekyll-sass-converter (1.5.2)
3333
sass (~> 3.4)
34-
jekyll-sitemap (1.1.1)
34+
jekyll-sitemap (1.2.0)
3535
jekyll (~> 3.3)
36-
jekyll-toc (0.5.1)
36+
jekyll-toc (0.5.2)
3737
nokogiri (~> 1.6)
3838
jekyll-watch (2.0.0)
3939
listen (~> 3.0)
@@ -45,15 +45,15 @@ GEM
4545
ruby_dep (~> 1.2)
4646
mercenary (0.3.6)
4747
mini_portile2 (2.3.0)
48-
nokogiri (1.8.1)
48+
nokogiri (1.8.2)
4949
mini_portile2 (~> 2.3.0)
5050
pathutil (0.16.1)
5151
forwardable-extended (~> 2.6)
52-
public_suffix (3.0.1)
53-
rb-fsevent (0.10.2)
52+
public_suffix (3.0.2)
53+
rb-fsevent (0.10.3)
5454
rb-inotify (0.9.10)
5555
ffi (>= 0.5.0, < 2)
56-
rouge (3.1.0)
56+
rouge (3.1.1)
5757
ruby_dep (1.5.0)
5858
safe_yaml (1.0.4)
5959
sass (3.5.5)
@@ -68,8 +68,8 @@ PLATFORMS
6868
DEPENDENCIES
6969
jekyll (~> 3.7.0)
7070
jekyll-redirect-from (~> 0.13.0)
71-
jekyll-sitemap (~> 1.1.1)
71+
jekyll-sitemap (~> 1.2.0)
7272
jekyll-toc (~> 0.5.1)
7373

7474
BUNDLED WITH
75-
1.16.0
75+
1.16.1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ daemonite-material/
5555
│ ├── material.min.css
5656
│ └── material.min.css.map
5757
├── docs/
58-
│ └── 4.0/
58+
│ └── 4.1/
5959
└── js/
6060
├── material.js
6161
├── material.js.map
@@ -69,7 +69,7 @@ Material's documentation, included in this repo in the root directory, is built
6969

7070
### Running documentation locally
7171

72-
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`.
72+
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`.
7373
2. Run `npm install` to install Node.js dependencies.
7474
3. Run `npm run dist` and `npm run docs` to rebuild distributed CSS and JavaScript files, as well as docs assets.
7575
4. From the root `/daemonite-material` directory, run `npm run docs-serve` in the command line.

_config.yml

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,75 @@
11
# dependencies
2-
highlighter: rouge
3-
kramdown:
4-
auto_ids: true
5-
markdown: kramdown
2+
highlighter: rouge
3+
kramdown:
4+
auto_ids: true
5+
markdown: kramdown
66

77
# permalinks
8-
permalink: pretty
8+
permalink: pretty
99

1010
# plugins
11-
plugins:
12-
- jekyll-redirect-from
13-
- jekyll-sitemap
14-
- jekyll-toc
11+
plugins:
12+
- jekyll-redirect-from
13+
- jekyll-sitemap
14+
- jekyll-toc
1515

1616
# server
17-
baseurl: "/material" # workaround for our GitHub Pages hosting
18-
destination: "gh-pages/material" # workaround for our GitHub Pages hosting
19-
encoding: "UTF-8"
20-
exclude:
21-
- .babelrc.js
22-
- .eslintignore
23-
- .git
24-
- .gitignore
25-
- .sass-cache/
26-
- assets/
27-
- bower.json
28-
- build/
29-
- docs-assets/
30-
- Gemfile
31-
- Gemfile.lock
32-
- gh-pages/
33-
- lint-vars.sh
34-
- node_modules/
35-
- package.json
36-
- package-lock.json
37-
- README.md
38-
host: 0.0.0.0
39-
port: 9999
40-
source: "."
41-
url: "http://daemonite.github.io/material"
17+
baseurl: "/material" # workaround for our GitHub Pages hosting
18+
destination: "gh-pages/material" # workaround for our GitHub Pages hosting
19+
encoding: "UTF-8"
20+
exclude:
21+
- .babelrc.js
22+
- .eslintignore
23+
- .git
24+
- .gitignore
25+
- .sass-cache/
26+
- assets/
27+
- bower.json
28+
- build/
29+
- docs-assets/
30+
- Gemfile
31+
- Gemfile.lock
32+
- gh-pages/
33+
- lint-vars.sh
34+
- node_modules/
35+
- package.json
36+
- package-lock.json
37+
- README.md
38+
host: 0.0.0.0
39+
port: 9999
40+
source: "."
41+
url: "http://daemonite.github.io/material"
4242

4343
# social
44-
authors: "Daemonite"
45-
description: "Daemonite's Material UI is a cross-platform and fully responsive front-end interface based on Google Material Design developed using Bootstrap 4."
46-
title: "Material"
44+
authors: "Daemonite"
45+
description: "Daemonite's Material UI is a cross-platform and fully responsive front-end interface based on Google Material Design developed using Bootstrap 4."
46+
title: "Material"
47+
48+
# toc
49+
toc:
50+
max_level: 4
51+
min_level: 2
4752

4853
# vars
49-
cdn:
50-
bs_css: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
51-
bs_css_docs: "https://getbootstrap.com/assets/css/docs.min.css"
52-
bs_js: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
53-
bs_js_docs: "https://getbootstrap.com/assets/js/docs.min.js"
54-
jquery: "https://code.jquery.com/jquery-3.2.1.slim.min.js"
55-
jquery_hash: "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
56-
md_font: "https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i"
57-
md_icon: "https://fonts.googleapis.com/icon?family=Material+Icons"
58-
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
59-
popper_hash: "sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
60-
current_version: "4.0.0"
61-
docs_version: "4.0"
62-
download:
63-
source: "https://github.com/Daemonite/material/archive/v4.0.0.zip"
64-
dist: "https://github.com/Daemonite/material/releases/download/v4.0.0/material-4.0.0-dist.zip"
65-
id:
66-
navbar: "doc-navbar"
67-
navdrawer: "doc-navdrawer"
68-
repo: "https://github.com/Daemonite/material"
54+
cdn:
55+
bs_css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css"
56+
bs_css_docs: "https://getbootstrap.com/assets/css/docs.min.css"
57+
bs_css_hash: "sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4"
58+
bs_js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"
59+
bs_js_docs: "https://getbootstrap.com/assets/js/docs.min.js"
60+
bs_js_hash: "sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm"
61+
jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js"
62+
jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
63+
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"
64+
md_icon: "https://fonts.googleapis.com/icon?family=Material+Icons"
65+
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"
66+
popper_hash: "sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ"
67+
current_version: "4.1.0"
68+
docs_version: "4.1"
69+
download:
70+
source: "https://github.com/Daemonite/material/archive/v4.1.0.zip"
71+
dist: "https://github.com/Daemonite/material/releases/download/v4.1.0/material-4.1.0-dist.zip"
72+
id:
73+
navbar: "doc-navbar"
74+
navdrawer: "doc-navdrawer"
75+
repo: "https://github.com/Daemonite/material"

_data/nav.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
- title: Getting started
22
pages:
33
- title: Introduction
4+
- title: Migration
45
- title: Theming
56
- title: Tooling
67

@@ -55,6 +56,7 @@
5556
- title: Image replacement
5657
- title: Position
5758
- title: Screenreaders
59+
- title: Shadows
5860
- title: Sizing
5961
- title: Spacing
6062
- title: Text
@@ -66,6 +68,7 @@
6668
- title: Buttons
6769
- title: Cards
6870
- title: Chips
71+
- title: Colours
6972
- title: Data tables
7073
- title: Dialogs
7174
- title: Expansion panels
@@ -75,6 +78,8 @@
7578
- title: Pickers
7679
- title: Progress
7780
- title: Selection controls
81+
- title: Shadows
82+
- title: Snackbars
7883
- title: Steppers
7984
- title: Tabs
8085
- title: Text fields
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
{% callout danger %}
1+
{% capture callout %}
22
#### Asynchronous methods and transitions
33

44
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**.
55

66
[See our Javascript documentation for more informations.]({{ site.baseurl }}/getting-started/javascript/#content)
7-
{% endcallout %}
7+
{% endcapture %}
8+
{% include callout.html content=callout type="danger" %}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
{% callout info %}
1+
{% capture callout %}
22
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.
3-
{% endcallout %}
3+
{% endcapture %}
4+
{% include callout.html content=callout type="info" %}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{% callout warning %}
1+
{% capture callout %}
22
### Conveying meaning to assistive technologies
33

44
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.
5-
{% endcallout %}
5+
{% endcapture %}
6+
{% include callout.html content=callout type="info" %}

_includes/callout.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{%- comment -%}
2+
Usage: {% include callout.html content=callout type="type" %},
3+
where content is a capture with the content
4+
and type is one of: info (default), danger, warning
5+
{%- endcomment -%}
6+
{%- assign css_class = include.type | default: "info" -%}
7+
<div class="bd-callout bd-callout-{{ css_class }}">
8+
{{- include.content | markdownify -}}
9+
</div>

_includes/example.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{%- comment -%}
2+
Usage: {% include example.html content=markup %},
3+
where content is a capture with the HTML content
4+
id - null (default)
5+
class - "bd-example" (default)
6+
optional: hide_preview - disabled (default)
7+
optional: hide_markup - disabled (default)
8+
{%- endcomment -%}
9+
10+
{%- assign preview_id = include.id -%}
11+
{%- assign preview_class = include.class -%}
12+
13+
{%- if include.hide_preview == null -%}
14+
<div{% if preview_id %} id="{{ preview_id }}"{% endif %} class="bd-example{% if preview_class %} {{ preview_class }}{% endif %}">
15+
{{- include.content -}}
16+
</div>
17+
{%- endif -%}
18+
19+
{%- if include.hide_markup == null -%}
20+
{%- highlight html -%}
21+
{{- include.content | replace: 'data-src="holder.js', 'src="...' -}}
22+
{%- endhighlight -%}
23+
{%- endif -%}

0 commit comments

Comments
 (0)