Skip to content

Commit

Permalink
Merge pull request TheSeamau5#2 from hossameldeenfci/master
Browse files Browse the repository at this point in the history
Updated to Elm 0.15. Didn't update version.
  • Loading branch information
TheSeamau5 committed May 13, 2015
2 parents 9720f07 + 2584ac1 commit be3bc6b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Example.elm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Html (Html, div, text)
import Html.Attributes (style)
import Flex (..)
import Html exposing (Html, div, text)
import Html.Attributes exposing (style)
import Flex exposing (..)


----------------------------
Expand Down
9 changes: 5 additions & 4 deletions elm-package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.1",
"version": "1.0.0",
"summary": "Flexbox layout for elm-html",
"repository": "https://github.com/TheSeamau5/flex-html.git",
"license": "BSD3",
Expand All @@ -10,7 +10,8 @@
"Flex"
],
"dependencies": {
"elm-lang/core": "1.1.1 <= v < 2.0.0",
"evancz/elm-html": "2.0.0 <= v < 3.0.0"
}
"elm-lang/core": "2.0.0 <= v < 3.0.0",
"evancz/elm-html": "3.0.0 <= v < 4.0.0"
},
"elm-version": "0.15.0 <= v < 0.16.0"
}
4 changes: 2 additions & 2 deletions src/Flex.elm
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ module Flex
-}

import Html (Html, div, Attribute, node)
import Html.Attributes (style)
import Html exposing (Html, div, Attribute, node)
import Html.Attributes exposing (style)

{-| Analog of `node`. Creates a node (of given name), with a list of styles,
a list of attributes, and a list of children
Expand Down

0 comments on commit be3bc6b

Please sign in to comment.