Skip to content

Commit ac9afd3

Browse files
authored
Merge pull request #182 from Daemonite/v4-dev
v4.1.1
2 parents 0add79f + ad4101f commit ac9afd3

File tree

113 files changed

+5022
-3518
lines changed

Some content is hidden

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

113 files changed

+5022
-3518
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
group :development, :test do
4-
gem 'jekyll', '~> 3.7.0'
4+
gem 'jekyll', '~> 3.8.0'
55
gem 'jekyll-redirect-from', '~> 0.13.0'
66
gem 'jekyll-sitemap', '~> 1.2.0'
77
gem 'jekyll-toc', '~> 0.5.1'

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GEM
1414
http_parser.rb (0.6.0)
1515
i18n (0.9.5)
1616
concurrent-ruby (~> 1.0)
17-
jekyll (3.7.3)
17+
jekyll (3.8.0)
1818
addressable (~> 2.4)
1919
colorator (~> 1.0)
2020
em-websocket (~> 0.5)
@@ -56,7 +56,7 @@ GEM
5656
rouge (3.1.1)
5757
ruby_dep (1.5.0)
5858
safe_yaml (1.0.4)
59-
sass (3.5.5)
59+
sass (3.5.6)
6060
sass-listen (~> 4.0.0)
6161
sass-listen (4.0.0)
6262
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -66,7 +66,7 @@ PLATFORMS
6666
ruby
6767

6868
DEPENDENCIES
69-
jekyll (~> 3.7.0)
69+
jekyll (~> 3.8.0)
7070
jekyll-redirect-from (~> 0.13.0)
7171
jekyll-sitemap (~> 1.2.0)
7272
jekyll-toc (~> 0.5.1)

README.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Because these components will require additional markup (some may require additi
2020
- [Content](#content)
2121
- [Documentation](#documentation)
2222
- [Quick start](#quick-start)
23-
- [Roadmap](#roadmap)
2423

2524
## Content
2625

@@ -83,17 +82,3 @@ Several quick start options are available:
8382
- Download the [latest release](https://github.com/Daemonite/material/releases)
8483
- Install with [bower](https://bower.io/): `bower install daemonite-material`
8584
- Install with [npm](https://www.npmjs.com/): `npm install daemonite-material`
86-
87-
## Roadmap
88-
89-
### Near-term
90-
91-
Bug fixes and updates alongside Bootstrap 4's continuous releases.
92-
93-
### Mid-term
94-
95-
Add missing support for some Google Material Design components (e.g. snackbars).
96-
97-
### Long-term
98-
99-
Rewrite all JavaScript plugins in ES6 to take advantage of the newest JavaScript enhancements.

_config.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ kramdown:
44
auto_ids: true
55
markdown: kramdown
66

7+
# minify
8+
compress_html:
9+
blanklines: true
10+
clippings: all
11+
712
# permalinks
813
permalink: pretty
914

@@ -52,24 +57,24 @@ toc:
5257

5358
# vars
5459
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"
60+
bs_css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css"
61+
bs_css_docs: "https://getbootstrap.com/docs/4.1/assets/css/docs.min.css"
62+
bs_css_hash: "sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB"
63+
bs_js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"
64+
bs_js_hash: "sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T"
6165
jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js"
6266
jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
6367
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"
6468
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"
69+
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
70+
popper_hash: "sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
71+
current_version: "4.1.1"
6872
docs_version: "4.1"
6973
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"
74+
source: "https://github.com/Daemonite/material/archive/v4.1.1.zip"
75+
dist: "https://github.com/Daemonite/material/releases/download/v4.1.1/material-4.1.1-dist.zip"
7276
id:
77+
main: "doc-main-h1"
7378
navbar: "doc-navbar"
7479
navdrawer: "doc-navdrawer"
7580
repo: "https://github.com/Daemonite/material"

_data/breakpoints.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
- breakpoint: xs
2+
abbr: ""
3+
name: Extra small
4+
min-width: 0px
5+
container: ""
6+
7+
- breakpoint: sm
8+
abbr: -sm
9+
name: Small
10+
min-width: 576px
11+
container: 540px
12+
13+
- breakpoint: md
14+
abbr: -md
15+
name: Medium
16+
min-width: 768px
17+
container: 720px
18+
19+
- breakpoint: lg
20+
abbr: -lg
21+
name: Large
22+
min-width: 992px
23+
container: 960px
24+
25+
- breakpoint: xl
26+
abbr: -xl
27+
name: Extra large
28+
min-width: 1200px
29+
container: 1140px

_data/nav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
- title: Colours
7272
- title: Data tables
7373
- title: Dialogs
74+
- title: Elevation and shadows
7475
- title: Expansion panels
7576
- title: Icons
7677
- title: Menu
7778
- title: Navigation drawer
7879
- title: Pickers
7980
- title: Progress
8081
- title: Selection controls
81-
- title: Shadows
8282
- title: Snackbars
8383
- title: Steppers
8484
- title: Tabs
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% capture callout %}
2-
#### Asynchronous methods and transitions
2+
##### 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**.
5-
6-
[See our Javascript documentation for more informations.]({{ site.baseurl }}/getting-started/javascript/#content)
75
{% endcapture %}
86
{% include callout.html content=callout type="danger" %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% 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.
33
{% endcapture %}
4-
{% include callout.html content=callout type="info" %}
4+
{% include callout.html content=callout type="info" %}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% capture callout %}
2-
### Conveying meaning to assistive technologies
2+
##### 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.
55
{% endcapture %}
6-
{% include callout.html content=callout type="info" %}
6+
{% include callout.html content=callout type="warning" %}

_includes/footer.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
<!-- JavaScript -->
23
<script crossorigin="anonymous" integrity="{{ site.cdn.jquery_hash }}" src="{{ site.cdn.jquery }}"></script>
34
<script crossorigin="anonymous" integrity="{{ site.cdn.popper_hash }}" src="{{ site.cdn.popper }}"></script>
@@ -7,5 +8,5 @@
78
<script src="{{ site.baseurl }}/js/material.min.js"></script>
89

910
<!-- Additional JavaScript for documentation site -->
10-
<script src="{{ site.cdn.bs_js_docs }}"></script>
11+
<script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
1112
<script src="{{ site.baseurl }}/docs/js/docs.min.js"></script>

0 commit comments

Comments
 (0)