ac71122 · warden · git.iko.soy

frontend/Main.elm+2−2

compare with master

unifiedsplit

@@ -82,7 +82,7 @@ showPage :

82 String

83 -> PageModel

84 ->

85− { title : String

85+ { title : List (Html Msg)

86 , body : List (Html Msg)

87 , topButton : Maybe (Navigation.TopButton Msg)

88 }

@@ -113,7 +113,7 @@ showPage email page =

113 }

114

115 LoadingPage ->

116− { title = ""

116+ { title = []

117 , body = [ loader ]

118 , topButton = Just (BackButton PopView)

119 }

frontend/Page.elm+1−1

@@ -18,5 +18,5 @@ type alias InitializedPage init model imsg emsg =

18 , view : model -> List (Html emsg)

19 , update : imsg -> model -> ( Result String model, Cmd emsg )

20 , subscriptions : model -> Sub emsg

21− , title : model -> String

21+ , title : model -> List (Html emsg)

22 }

frontend/Pages/Captcha.elm+1−1

@@ -29,7 +29,7 @@ page callbacks liftMsg =

29 , view = \model -> view model |> List.map (Html.map liftMsg)

30 , update = \msg model -> update callbacks liftMsg msg model

31 , subscriptions = \model -> subscriptions model |> Sub.map liftMsg

32− , title = always "Captcha"

32+ , title = always [ text "Captcha" ]

33 }

34

35

frontend/Pages/Cipher.elm+1−1

@@ -32,7 +32,7 @@ page callbacks liftMsg =

32 , view = \model -> view model |> List.map (Html.map liftMsg)

33 , update = \msg model -> update callbacks liftMsg msg model

34 , subscriptions = \model -> subscriptions model |> Sub.map liftMsg

35− , title = \{ cipher } -> cipher.name

35+ , title = \{ cipher } -> [ text cipher.name, span [ Attr.class "u-float-right" ] [ iconButton "edit" (callbacks.copy "") ] ]

36 }

37

38

frontend/Pages/Ciphers.elm+16−13

@@ -98,23 +98,26 @@ page callbacks liftMsg =

98 , subscriptions = \model -> subscriptions model |> Sub.map liftMsg

99 , title =

100 \{ ciphersListFilter } ->

101+ [ text

101− case ciphersListFilter of

102+ (case ciphersListFilter of

102− AllCiphers ->

103+ AllCiphers ->

103− "All items"

104+ "All items"

104

105

105− SpecificCiphers cipherType ->

106+ SpecificCiphers cipherType ->

106− case cipherType of

107+ case cipherType of

107− Bridge.CardType ->

108+ Bridge.CardType ->

108− "Cards"

109+ "Cards"

109

110

110− Bridge.IdentityType ->

111+ Bridge.IdentityType ->

111− "Identities"

112+ "Identities"

112

113

113− Bridge.LoginType ->

114+ Bridge.LoginType ->

114− "Passwords"

115+ "Passwords"

115

116

116− Bridge.NoteType ->

117+ Bridge.NoteType ->

117− "Notes"

118+ "Notes"

119+ )

120+ ]

118 }

121 }

119

122

120

123

frontend/Pages/Login.elm+1−1

@@ -32,7 +32,7 @@ page callbacks liftMsg =

32 , view = \model -> view model |> List.map (Html.map liftMsg)

33 , update = \msg model -> update callbacks liftMsg msg model

34 , subscriptions = \model -> subscriptions model |> Sub.map liftMsg

35− , title = always "Log into bitwarden"

35+ , title = always [ text "Log into bitwarden" ]

36 }

37

38

frontend/Pages/MasterPassword.elm+1−1

@@ -32,7 +32,7 @@ page callbacks liftMsg =

32 , view = \model -> view model |> List.map (Html.map liftMsg)

33 , update = \msg model -> update callbacks liftMsg msg model

34 , subscriptions = \model -> subscriptions model |> Sub.map liftMsg

35− , title = always "Enter master password"

35+ , title = always [ text "Enter master password" ]

36 }

37

38

frontend/Pages/Navigation.elm+6−5

@@ -24,7 +24,7 @@ type TopButton msg

24

25type alias Config msg =

26 { topButton : Maybe (TopButton msg)

27− , title : String

27+ , title : List (Html msg)

28 }

29

30

@@ -40,7 +40,7 @@ navigation { topButton, title } =

40 )

41 ++ [ nav [ Attr.class "p-tabs p-tabs__list no-scroll-bar" ]

42 [ h3 []

43− [ case topButton of

43+ ([ case topButton of

44 Nothing ->

45 button

46 [ Attr.class "p-button--base is-inline u-no-margin", Attr.style "visibility" "hidden" ]

@@ -55,8 +55,9 @@ navigation { topButton, title } =

55 button

56 [ Attr.class "p-button--base is-inline u-no-margin", Ev.onClick cfg.toggle ]

57 [ i [ Attr.class "p-icon--menu" ] [] ]

58− , text title

59− ]

58+ ]

59+ ++ title

60+ )

60 ]

61 ]

62 ]

62 )

63 )

@@ -143,7 +144,7 @@ showNavigationView :

143 ->

144 ->

144 (model

145 (model

145 ->

146 ->

146− { title : String

147+ { title : List (Html msg)

147 , body : List (Html msg)

148 , body : List (Html msg)

148 , topButton : Maybe (TopButton msg)

149 , topButton : Maybe (TopButton msg)

149 }

150 }

style.css+5

@@ -13,10 +13,15 @@ nav.p-tabs__list {

13 position: sticky;

14 background-color: white;

15 padding-bottom: 1rem;

16+ padding-right: 1rem;

16 padding-bottom: 0;

17 padding-bottom: 0;

17 z-index: 10;

18 z-index: 10;

18}

19}

19

20

21+nav h3 {

22+ width: 100%;

23+}

24+

20.ninety-counter {

25.ninety-counter {

21 transform: rotate(90deg);

26 transform: rotate(90deg);

22}

27}