Merge branch 'master' into header-levels

This commit is contained in:
Brian Hicks 2019-07-17 17:05:41 -05:00 committed by GitHub
commit 3c41173a8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions

View File

@ -3,7 +3,7 @@
"name": "NoRedInk/noredink-ui",
"summary": "UI Widgets we use at NRI",
"license": "BSD-3-Clause",
"version": "6.24.0",
"version": "6.24.1",
"exposed-modules": [
"Nri.Ui.Alert.V2",
"Nri.Ui.Alert.V3",

View File

@ -39,6 +39,7 @@ import Html.Styled.Attributes as Attributes
import Html.Styled.Events as Events
import Json.Decode
import List.Zipper exposing (Zipper(..))
import Nri.Ui
import Nri.Ui.Colors.Extra
import Nri.Ui.Colors.V1 as Colors
import Nri.Ui.Fonts.V1
@ -92,7 +93,9 @@ viewCustom config viewInnerTab =
List.Zipper.toList config.tabs
|> List.map (viewTab config viewInnerTab selected)
in
Html.div
Nri.Ui.styled Html.div
(styledName "container")
[]
[]
[ Html.styled Html.div
[ Css.displayFlex
@ -225,7 +228,10 @@ type alias LinkConfig msg =
-}
links : LinkConfig msg -> Html msg
links config =
Html.div []
Nri.Ui.styled Html.div
(styledName "container")
[]
[]
[ Html.styled Html.nav
[ Css.displayFlex
, Css.alignItems Css.flexEnd
@ -332,6 +338,11 @@ mapWithCurrent fn (Zipper before current after) =
(List.map (fn False) after)
styledName : String -> String
styledName suffix =
"Nri-Ui-Tabs-V4-" ++ suffix
-- STYLES