NoRedInk/noredink-ui
1
1
Fork 0
mirror of https://github.com/NoRedInk/noredink-ui.git synced 2024-12-29 16:44:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into zamboni/add-button-v7

Browse Source
This commit is contained in:
Jasper Woudenberg 2019-01-03 13:44:35 +00:00 committed by GitHub
commit 5899d7a386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Nri/Ui/TextArea/V3.elm
View File

@ -129,22 +129,21 @@ view_ theme model =
"false" "false"
] ]
[] []
] , if not model.showLabel then
, if not model.showLabel then Html.label
Html.label ([ Attributes.for (generateId model.label)
([ Attributes.for (generateId model.label) ]
, Attributes.css [ InputStyles.label theme model.isInError ] ++ Accessibility.Styled.Style.invisible
] )
++ Accessibility.Styled.Style.invisible [ Html.text model.label ]
)
[ Html.text model.label ]
else else
Html.label Html.label
[ Attributes.for (generateId model.label) [ Attributes.for (generateId model.label)
, Attributes.css [ InputStyles.label theme model.isInError ] , Attributes.css [ InputStyles.label theme model.isInError ]
] ]
[ Html.text model.label ] [ Html.text model.label ]
]
] ]

2
styleguide-app/Examples/TextArea.elm
View File

@ -37,7 +37,7 @@ type alias State =
{-| -} {-| -}
example : (Msg -> msg) -> State -> ModuleExample msg example : (Msg -> msg) -> State -> ModuleExample msg
example parentMessage state = example parentMessage state =
{ filename = "Nri.Ui.TextArea.V3" { filename = "Nri.Ui.TextArea.v3"
, category = Inputs , category = Inputs
, content = , content =
[ Text.heading [ Html.text "Textarea controls" ] [ Text.heading [ Html.text "Textarea controls" ]