Skip to content
This repository was archived by the owner on Oct 26, 2024. It is now read-only.

Commit d0196b1

Browse files
authored
Merge pull request #10 from javaBin/reskin-2018
Reskin 2018
2 parents df549c7 + 47a7745 commit d0196b1

23 files changed

+7272
-44
lines changed

frontend/package-lock.json

+4,232
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
"author": "",
2020
"license": "ISC",
2121
"devDependencies": {
22+
"elm": "^0.18.0",
2223
"elm-live": "^2.6.0",
2324
"less": "^2.7.1",
2425
"npm-run-all": "^3.1.1",
25-
"watch": "^1.0.1",
26-
"onchange": "^3.2.1"
26+
"onchange": "^3.2.1",
27+
"watch": "^1.0.1"
2728
}
2829
}

frontend/src/View/Login.elm

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ import Json.Decode
1010

1111
view : Model -> Html Msg
1212
view model =
13-
div [ class "wrapper login" ]
14-
[ div [ class "logo-wrapper" ]
15-
[ img [ src "assets/neon-logo.svg", class "logo" ] [] ]
16-
, h1 [] [ text "Get ready to speak at", br [] [], text "JavaZone 2018" ]
13+
div [ class "login" ]
14+
[ div [ class "header" ]
15+
[ div [ class "logo-wrapper" ]
16+
[ img [ src "assets/logo.svg", class "logo" ] [] ]
17+
, h1 [] [ text "Get ready to speak at JavaZone 2018" ]
18+
]
19+
, div [ class "pixel-border-bottom" ] []
1720
, div [ class "email-wrapper" ]
1821
[ input [ value model.email, onInput LoginEmail, onEnter LoginSubmitEmail, type_ "email", class "email", id "email-address", placeholder "Your email address" ] []
1922
, if model.loading then

frontend/src/View/Submission.elm

+8-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ view model =
3434
viewLoading : Html Msg
3535
viewLoading =
3636
div [ class "wrapper" ]
37-
[ div [ class "logo-wrapper" ] [ img [ src "assets/neon-logo.svg", class "logo" ] [] ]
37+
[ div [ class "header" ]
38+
[ div [ class "logo-wrapper" ] [ img [ src "assets/logo.svg", class "logo" ] [] ]
39+
]
40+
, div [ class "pixel-border-bottom" ] []
3841
, div [ class "edit-submission" ]
3942
[ div [ class "edit-submission loading" ] [ text "Loading ..." ] ]
4043
]
@@ -76,7 +79,10 @@ viewFooter submission model =
7679
viewSubmissionDetails : Submission -> Model -> Html SubmissionField
7780
viewSubmissionDetails submission model =
7881
div []
79-
[ div [ class "logo-wrapper" ] [ img [ src "assets/neon-logo.svg", class "logo" ] [] ]
82+
[ div [ class "header" ]
83+
[ div [ class "logo-wrapper" ] [ img [ src "assets/logo.svg", class "logo" ] [] ]
84+
]
85+
, div [ class "pixel-border-bottom" ] []
8086
, div [ class <| "edit-intro " ++ hideIfNotEditable submission.editable ]
8187
[ h1 [] [ text "Ready? Let's make your talk a reality!" ]
8288
, p [ class "ingress" ] [ text "JavaZone takes place in Oslo, Norway, on September 12th-13th 2018 (plus a day of workshops on the 11th September). Do YOU want to be one of the great speakers at our conference? Fantastic! That's what this thing is for! Let's get you started!" ]

frontend/src/View/Submissions.elm

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ view model =
3030
viewWrapper : List (Html Msg) -> Html Msg
3131
viewWrapper content =
3232
div [ class "wrapper" ]
33-
[ div [ class "logo-wrapper" ] [ img [ src "assets/neon-logo.svg", class "logo" ] [] ]
33+
[ div [ class "header" ]
34+
[ div [ class "logo-wrapper" ] [ img [ src "assets/logo.svg", class "logo" ] [] ]
35+
]
36+
, div [ class "pixel-border-bottom" ] []
3437
, div [ class "submissions-list" ]
3538
content
3639
]

frontend/src/View/Thanks.elm

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ import Messages exposing (Msg(..))
77

88
view : Html Msg
99
view =
10-
div [ class "wrapper login " ]
11-
[ div [ class "logo-wrapper" ]
12-
[ img [ src "assets/neon-logo.svg", class "logo" ] []
10+
div [ class "login" ]
11+
[ div [ class "header" ]
12+
[ div [ class "logo-wrapper" ]
13+
[ img [ src "assets/logo.svg", class "logo" ] []
14+
]
15+
, h1 [] [ text "Awesome!", br [] [], text " We are on it!" ]
1316
]
14-
, h1 [] [ text "Awesome!", br [] [], text " We are on it!" ]
17+
, div [ class "pixel-border-bottom" ] []
1518
, div [ class "success-image-wrapper" ]
1619
[ img [ src "/assets/plane2.png", class "success-image" ] []
1720
]
Binary file not shown.

frontend/static/assets/fonts/upheaval/upheavtt.svg

+513
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

frontend/static/assets/icons-light/back.svg

+2-2
Loading

frontend/static/assets/icons-light/new.svg

+2-2
Loading

frontend/static/assets/icons-light/save.svg

+2-2
Loading

0 commit comments

Comments
 (0)