Merge branch 'master' into get-a-little-more-shakey

This commit is contained in:
Brian Hicks 2020-11-09 10:21:14 -06:00 committed by GitHub
commit 589a5c29d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions

View File

@ -3,7 +3,7 @@
"name": "NoRedInk/noredink-ui",
"summary": "UI Widgets we use at NRI",
"license": "BSD-3-Clause",
"version": "12.8.0",
"version": "12.9.0",
"exposed-modules": [
"Nri.Ui",
"Nri.Ui.Accordion.V1",

View File

@ -782,7 +782,7 @@ sizeStyle size width =
Small ->
{ fontSize = 15
, height = 36
, imageHeight = 15
, imageHeight = 12
, shadowHeight = 2
, minWidth = 75
}
@ -790,7 +790,7 @@ sizeStyle size width =
Medium ->
{ fontSize = 15
, height = 45
, imageHeight = 15
, imageHeight = 14
, shadowHeight = 3
, minWidth = 100
}
@ -798,7 +798,7 @@ sizeStyle size width =
Large ->
{ fontSize = 20
, height = 56
, imageHeight = 20
, imageHeight = 16
, shadowHeight = 4
, minWidth = 200
}

View File

@ -121,10 +121,12 @@ init =
iconChoice : Control.Control (Maybe Svg)
iconChoice =
Control.choice
[ ( "Nothing", Control.value Nothing )
, ( "Just Performance", Control.value (Just UiIcon.performance) )
, ( "Just Share", Control.value (Just UiIcon.share) )
, ( "Just Download", Control.value (Just UiIcon.download) )
[ ( "none", Control.value Nothing )
, ( "preview", Control.value (Just UiIcon.preview) )
, ( "arrowLeft", Control.value (Just UiIcon.arrowLeft) )
, ( "performance", Control.value (Just UiIcon.performance) )
, ( "share", Control.value (Just UiIcon.share) )
, ( "download", Control.value (Just UiIcon.download) )
]