From 2cbdf58db339c0c937600b331bdff58856c24095 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sun, 3 Apr 2016 08:57:26 -0700 Subject: [PATCH] swap 12 and 13 --- {part13/part12 => part12}/Component/ElmHub.elm | 0 .../part12 => part12}/Component/SearchResult.elm | 0 part12/Main.elm | 2 +- part12/README.md | 6 ------ part12/elm-package.json | 5 +---- part12/style.css | 9 --------- {part12 => part13}/ElmHub.elm | 0 {part12 => part13}/ElmHub/Css.elm | 0 part13/{part12 => }/Main.elm | 2 +- part13/{part12 => }/README.md | 6 ++++++ {part12 => part13}/SearchResult.elm | 0 {part12 => part13}/Stylesheets.elm | 0 part13/{part12 => asdf}/elm-package.json | 4 +++- part13/{part12 => asdf}/style.css | 9 +++++++++ part13/{part12 => }/elm-hub.png | Bin part13/{part12 => }/index.html | 0 part13/{part12 => }/test/TestRunner.elm | 0 part13/{part12 => }/test/Tests.elm | 0 part13/{part12 => }/test/elm-package.json | 0 19 files changed, 21 insertions(+), 22 deletions(-) rename {part13/part12 => part12}/Component/ElmHub.elm (100%) rename {part13/part12 => part12}/Component/SearchResult.elm (100%) rename {part12 => part13}/ElmHub.elm (100%) rename {part12 => part13}/ElmHub/Css.elm (100%) rename part13/{part12 => }/Main.elm (91%) rename part13/{part12 => }/README.md (83%) rename {part12 => part13}/SearchResult.elm (100%) rename {part12 => part13}/Stylesheets.elm (100%) rename part13/{part12 => asdf}/elm-package.json (86%) rename part13/{part12 => asdf}/style.css (90%) rename part13/{part12 => }/elm-hub.png (100%) rename part13/{part12 => }/index.html (100%) rename part13/{part12 => }/test/TestRunner.elm (100%) rename part13/{part12 => }/test/Tests.elm (100%) rename part13/{part12 => }/test/elm-package.json (100%) diff --git a/part13/part12/Component/ElmHub.elm b/part12/Component/ElmHub.elm similarity index 100% rename from part13/part12/Component/ElmHub.elm rename to part12/Component/ElmHub.elm diff --git a/part13/part12/Component/SearchResult.elm b/part12/Component/SearchResult.elm similarity index 100% rename from part13/part12/Component/SearchResult.elm rename to part12/Component/SearchResult.elm diff --git a/part12/Main.elm b/part12/Main.elm index fa4bada..5b8e88e 100644 --- a/part12/Main.elm +++ b/part12/Main.elm @@ -1,7 +1,7 @@ module Main (..) where import StartApp -import ElmHub exposing (..) +import Component.ElmHub exposing (..) import Effects exposing (Effects) import Task exposing (Task) import Html exposing (Html) diff --git a/part12/README.md b/part12/README.md index 7fcc3c3..deddbd0 100644 --- a/part12/README.md +++ b/part12/README.md @@ -15,9 +15,3 @@ to fail; in that case, just run `elm package install` again.) ```bash elm live Main.elm --open -- --output=elm.js ``` - -## Compiling CSS - -```bash -elm css Stylesheets.elm -``` diff --git a/part12/elm-package.json b/part12/elm-package.json index 2f19503..ba40466 100644 --- a/part12/elm-package.json +++ b/part12/elm-package.json @@ -4,17 +4,14 @@ "repository": "https://github.com/rtfeldman/elm-workshop.git", "license": "BSD-3-Clause", "source-directories": [ - ".", - ".." + ".", ".." ], "exposed-modules": [], "dependencies": { - "NoRedInk/elm-decode-pipeline": "1.0.0 <= v < 2.0.0", "elm-lang/core": "3.0.0 <= v < 4.0.0", "evancz/elm-effects": "2.0.0 <= v < 3.0.0", "evancz/elm-html": "4.0.0 <= v < 5.0.0", "evancz/elm-http": "3.0.0 <= v < 4.0.0", - "rtfeldman/elm-css": "1.0.0 <= v < 2.0.0", "evancz/start-app": "2.0.0 <= v < 3.0.0" }, "elm-version": "0.16.0 <= v < 0.17.0" diff --git a/part12/style.css b/part12/style.css index d030733..64c74d7 100644 --- a/part12/style.css +++ b/part12/style.css @@ -90,12 +90,3 @@ a:hover { button:focus, input:focus { outline: none; } - -.error { - background-color: #FF9632; - padding: 20px; - box-sizing: border-box; - overflow-x: auto; - font-family: monospace; - font-size: 18px; -} diff --git a/part12/ElmHub.elm b/part13/ElmHub.elm similarity index 100% rename from part12/ElmHub.elm rename to part13/ElmHub.elm diff --git a/part12/ElmHub/Css.elm b/part13/ElmHub/Css.elm similarity index 100% rename from part12/ElmHub/Css.elm rename to part13/ElmHub/Css.elm diff --git a/part13/part12/Main.elm b/part13/Main.elm similarity index 91% rename from part13/part12/Main.elm rename to part13/Main.elm index 5b8e88e..fa4bada 100644 --- a/part13/part12/Main.elm +++ b/part13/Main.elm @@ -1,7 +1,7 @@ module Main (..) where import StartApp -import Component.ElmHub exposing (..) +import ElmHub exposing (..) import Effects exposing (Effects) import Task exposing (Task) import Html exposing (Html) diff --git a/part13/part12/README.md b/part13/README.md similarity index 83% rename from part13/part12/README.md rename to part13/README.md index 3b4c4bb..3a709ab 100644 --- a/part13/part12/README.md +++ b/part13/README.md @@ -15,3 +15,9 @@ to fail; in that case, just run `elm package install` again.) ```bash elm live Main.elm --open -- --output=elm.js ``` + +## Compiling CSS + +```bash +elm css Stylesheets.elm +``` diff --git a/part12/SearchResult.elm b/part13/SearchResult.elm similarity index 100% rename from part12/SearchResult.elm rename to part13/SearchResult.elm diff --git a/part12/Stylesheets.elm b/part13/Stylesheets.elm similarity index 100% rename from part12/Stylesheets.elm rename to part13/Stylesheets.elm diff --git a/part13/part12/elm-package.json b/part13/asdf/elm-package.json similarity index 86% rename from part13/part12/elm-package.json rename to part13/asdf/elm-package.json index ba40466..6968946 100644 --- a/part13/part12/elm-package.json +++ b/part13/asdf/elm-package.json @@ -4,10 +4,12 @@ "repository": "https://github.com/rtfeldman/elm-workshop.git", "license": "BSD-3-Clause", "source-directories": [ - ".", ".." + ".", + ".." ], "exposed-modules": [], "dependencies": { + "NoRedInk/elm-decode-pipeline": "1.0.0 <= v < 2.0.0", "elm-lang/core": "3.0.0 <= v < 4.0.0", "evancz/elm-effects": "2.0.0 <= v < 3.0.0", "evancz/elm-html": "4.0.0 <= v < 5.0.0", diff --git a/part13/part12/style.css b/part13/asdf/style.css similarity index 90% rename from part13/part12/style.css rename to part13/asdf/style.css index 64c74d7..d030733 100644 --- a/part13/part12/style.css +++ b/part13/asdf/style.css @@ -90,3 +90,12 @@ a:hover { button:focus, input:focus { outline: none; } + +.error { + background-color: #FF9632; + padding: 20px; + box-sizing: border-box; + overflow-x: auto; + font-family: monospace; + font-size: 18px; +} diff --git a/part13/part12/elm-hub.png b/part13/elm-hub.png similarity index 100% rename from part13/part12/elm-hub.png rename to part13/elm-hub.png diff --git a/part13/part12/index.html b/part13/index.html similarity index 100% rename from part13/part12/index.html rename to part13/index.html diff --git a/part13/part12/test/TestRunner.elm b/part13/test/TestRunner.elm similarity index 100% rename from part13/part12/test/TestRunner.elm rename to part13/test/TestRunner.elm diff --git a/part13/part12/test/Tests.elm b/part13/test/Tests.elm similarity index 100% rename from part13/part12/test/Tests.elm rename to part13/test/Tests.elm diff --git a/part13/part12/test/elm-package.json b/part13/test/elm-package.json similarity index 100% rename from part13/part12/test/elm-package.json rename to part13/test/elm-package.json