NoRedInk/noredink-ui
1
1
Fork 0
mirror of https://github.com/NoRedInk/noredink-ui.git synced 2024-11-28 10:17:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ink--upgrade-text

Browse Source
This commit is contained in:
Jasper Woudenberg 2018-05-17 08:38:47 +02:00 committed by GitHub
commit 93f101abaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elm-package.json
View File

@ -1,5 +1,5 @@
{
"version": "4.14.0",
"version": "4.15.0",
"summary": "UI Widgets we use at NRI",
"repository": "https://github.com/NoRedInk/noredink-ui.git",
"license": "BSD3",

8
src/Nri/Ui/Icon/V2.elm
View File

@ -58,6 +58,7 @@ module Nri.Ui.Icon.V2
, lock
, lockDeprecated
, logo
, masteryBadge
, newspaper
, notStarred
, okay
@ -140,6 +141,7 @@ module Nri.Ui.Icon.V2
@docs lock
@docs lockDeprecated
@docs logo
@docs masteryBadge
@docs newspaper
@docs notStarred
@docs okay
@ -627,6 +629,12 @@ logo assets =
ImgIcon assets.logoRedBlack_svg
{-| -}
masteryBadge : { r | masteryBadge : String } -> IconType
masteryBadge assets =
SvgIcon assets.masteryBadge
{-| -}
newspaper : { r | newspaper : String } -> IconType
newspaper assets =

2
src/Nri/Ui/Table/V1.elm
View File

@ -209,7 +209,7 @@ styles =
, Css.Foreign.class Row
[ height (px 45)
, fontSize (px 14)
, color gray45
, color gray20
, pseudoClass "nth-child(odd)"
[ backgroundColor gray96 ]
]

2
src/Nri/Ui/Table/V2.elm
View File

@ -207,7 +207,7 @@ rowStyles : List Style
rowStyles =
[ height (px 45)
, fontSize (px 14)
, color gray45
, color gray20
, pseudoClass "nth-child(odd)"
[ backgroundColor gray96 ]
]

2
styleguide-app/Assets.elm
View File

@ -51,6 +51,7 @@ type alias Assets =
, level3Badge_png : Asset
, lock : String
, logoRedBlack_svg : Asset
, masteryBadge : String
, newspaper : String
, openClose : String
, performance : String
@ -129,6 +130,7 @@ assets =
, level3Badge_png = Asset "assets/images/level-3-badge.png"
, lock = "icon-lock"
, logoRedBlack_svg = Asset "assets/images/logo-red-black.svg"
, masteryBadge = "icon-mastery-badge"
, newspaper = "icon-newspaper"
, openClose = "icon-open-close"
, performance = "icon-performance"

1
styleguide-app/Examples/Icon.elm
View File

@ -128,6 +128,7 @@ svgIcons =
, { icon = Icon.key assets, background = Light, alt = "Key" }
, { icon = Icon.leaderboard assets, background = Light, alt = "Leaderboard" }
, { icon = Icon.lock assets, background = Light, alt = "Lock" }
, { icon = Icon.masteryBadge assets, background = Light, alt = "Mastery Badge" }
, { icon = Icon.newspaper assets, background = Light, alt = "Newspaper" }
, { icon = Icon.openClose assets, background = Light, alt = "OpenClose" }
, { icon = Icon.performance assets, background = Light, alt = "Performance" }

2
styleguide-app/assets/generated_svgs.js
View File

File diff suppressed because one or more lines are too long

3
styleguide-app/assets/images/icon-mastery-badge.svg Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53a2feaa167b23968d48914eea5a8c4f18c97b4cbc9b392fa4a6b2b08d4ad78a
size 773