Skip to content

Commit

Permalink
Upgrade to MDL 1.3.0
Browse files Browse the repository at this point in the history
Fixes #244.
  • Loading branch information
debois committed Dec 29, 2016
1 parent 8fa6990 commit af3ffd4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ list](https://github.com/debois/elm-mdl/issues?utf8=%E2%9C%93&q=is%3Aissue+label
## Implement new components

The library presently implements all components of Google's Material Design
Lite 1.2.0. But you could contribute a component _not_ covered by MDL.
Lite 1.3.0. But you could contribute a component _not_ covered by MDL.

See the [missing component list](https://github.com/debois/elm-mdl/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent).

Expand Down
5 changes: 4 additions & 1 deletion demo/Demo.elm
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ view_ model =
([], [])
, main = [ stylesheet, top ]
}
{- ** The following lines are not necessary when you manually set up
{- ** Begin
The following lines are not necessary when you manually set up
your html, as done with page.html. Removing it will then
fix the flicker you see on load.
-}
Expand All @@ -337,6 +339,7 @@ view_ model =
div [] []
]
)
{- ** End -}


-- ROUTING
Expand Down
2 changes: 1 addition & 1 deletion demo/Demo/Layout.elm
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ view model =
, explain "To use this colour scheme (and to use elm-mdl in general), you must load custom CSS."
, [ "<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500|Roboto+Mono|Roboto+Condensed:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>"
, "<link rel='stylesheet' href='https://fonts.googleapis.com/icon?family=Material+Icons'>"
, "<link rel='stylesheet' href='https://code.getmdl.io/1.2.0/" ++ Color.scheme model.primary model.accent
, "<link rel='stylesheet' href='https://code.getmdl.io/1.3.0/" ++ Color.scheme model.primary model.accent
++ "'>"
]
|> String.join "\n"
Expand Down
2 changes: 1 addition & 1 deletion demo/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
-->
<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500|Roboto+Mono|Roboto+Condensed:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.0/material.teal-red.min.css" />
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.teal-red.min.css" />

<!-- Dialogs
Expand Down
4 changes: 2 additions & 2 deletions src/Material/Scheme.elm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To load CSS manually, add the following to your main html file.
<!-- MDL -->
<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500|Roboto+Mono|Roboto+Condensed:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.0/material.min.css" />
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.min.css" />
You may find the [elm-mdl demo's
html](https://github.com/debois/elm-mdl/blob/master/demo/page.html) helpful.
Expand All @@ -39,7 +39,7 @@ import Material.Color exposing (Hue(..), Color)

scheme : Hue -> Hue -> String
scheme primary accent =
[ "https://code.getmdl.io/1.2.0/" ++ Material.Color.scheme primary accent
[ "https://code.getmdl.io/1.3.0/" ++ Material.Color.scheme primary accent
, "https://fonts.googleapis.com/icon?family=Material+Icons"
, "https://fonts.googleapis.com/css?family=Roboto:400,300,500|Roboto+Mono|Roboto+Condensed:400,700&subset=latin,latin-ext"
]
Expand Down

0 comments on commit af3ffd4

Please sign in to comment.