Merge pull request #760 from NoRedInk/dansby/put-litter-in-its-place

Dansby/put litter in its place
This commit is contained in:
Tessa 2021-11-15 11:54:54 -08:00 committed by GitHub
commit 5a83071054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 89 deletions

View File

@ -1,7 +1,6 @@
module Nri.Ui.Colors.V1 exposing
( aqua, aquaDark, aquaLight, azure, azureDark
, white
, blue, blueDeep
, cornflower, cornflowerDark, cornflowerLight, cyan
, frost
, gray20, gray45, gray75, gray85, gray92, gray96
@ -33,7 +32,6 @@ consider [elm-color-extra](http://package.elm-lang.org/packages/eskimoblood/elm-
@docs aqua, aquaDark, aquaLight, azure, azureDark
@docs white
@docs blue, blueDeep
@docs cornflower, cornflowerDark, cornflowerLight, cyan
@docs frost
@docs gray20, gray45, gray75, gray85, gray92, gray96
@ -98,20 +96,6 @@ azureDark =
hex "#004cc9"
{-| See <https://noredink-ui.netlify.com/#category/Colors>
-}
blue : Css.Color
blue =
hex "#40a8e4"
{-| See <https://noredink-ui.netlify.com/#category/Colors>
-}
blueDeep : Css.Color
blueDeep =
hex "#4a79a7"
{-| See <https://noredink-ui.netlify.com/#category/Colors>
-}
cornflower : Css.Color

View File

@ -69,7 +69,7 @@ spinningPencil : Nri.Ui.Svg.V1.Svg
spinningPencil =
UiIcon.edit
|> Nri.Ui.Svg.V1.withLabel "Loading..."
|> Nri.Ui.Svg.V1.withColor Colors.blueDeep
|> Nri.Ui.Svg.V1.withColor Colors.navy
|> Nri.Ui.Svg.V1.withWidth (Css.px 100)
|> Nri.Ui.Svg.V1.withHeight (Css.px 100)
|> Nri.Ui.Svg.V1.withCss circlingCss

View File

@ -17,7 +17,6 @@ import Examples.Fonts as Fonts
import Examples.Heading as Heading
import Examples.Loading as Loading
import Examples.Logo as Logo
import Examples.MasteryIcon as MasteryIcon
import Examples.Menu as Menu
import Examples.Message as Message
import Examples.Modal as Modal
@ -343,25 +342,6 @@ all =
LogoState childState ->
Just childState
_ ->
Nothing
)
, MasteryIcon.example
|> Example.wrapMsg MasteryIconMsg
(\msg ->
case msg of
MasteryIconMsg childMsg ->
Just childMsg
_ ->
Nothing
)
|> Example.wrapState MasteryIconState
(\msg ->
case msg of
MasteryIconState childState ->
Just childState
_ ->
Nothing
)
@ -765,7 +745,6 @@ type State
| HeadingState Heading.State
| LoadingState Loading.State
| LogoState Logo.State
| MasteryIconState MasteryIcon.State
| MenuState Menu.State
| MessageState Message.State
| ModalState Modal.State
@ -805,7 +784,6 @@ type Msg
| HeadingMsg Heading.Msg
| LoadingMsg Loading.Msg
| LogoMsg Logo.Msg
| MasteryIconMsg MasteryIcon.Msg
| MenuMsg Menu.Msg
| MessageMsg Message.Msg
| ModalMsg Modal.Msg

View File

@ -112,7 +112,7 @@ example =
, if showSpinners then
Html.div []
[ Loading.spinningPencil
|> Svg.withColor Colors.blue
|> Svg.withColor Colors.azure
|> Svg.toHtml
, Text.caption [ Text.plaintext "By default, the spinningPencil is white. Showing as blue for visibility." ]
, Loading.spinningDots

View File

@ -1,48 +0,0 @@
module Examples.MasteryIcon exposing (example, State, Msg)
{-|
@docs example, State, Msg
-}
import Category exposing (Category(..))
import Example exposing (Example)
import Examples.IconExamples as IconExamples
import KeyboardSupport exposing (Direction(..), Key(..))
import Nri.Ui.Colors.V1 as Colors
import Nri.Ui.MasteryIcon.V1 as MasteryIcon
{-| -}
type alias State =
()
{-| -}
type alias Msg =
()
{-| -}
example : Example State Msg
example =
{ name = "MasteryIcon"
, version = 1
, categories = [ Icons ]
, keyboardSupport = []
, state = ()
, update = \_ state -> ( state, Cmd.none )
, subscriptions = \_ -> Sub.none
, preview = []
, view =
\_ ->
[ IconExamples.view "Levels"
[ ( "levelZero", MasteryIcon.levelZero )
, ( "levelOne", MasteryIcon.levelOne )
, ( "levelTwo", MasteryIcon.levelTwo )
, ( "levelThree", MasteryIcon.levelThree )
, ( "levelFour", MasteryIcon.levelFour )
]
]
}

View File

@ -149,7 +149,7 @@ type alias State =
{-| -}
init : State
init =
{ color = fromCssColor Colors.blue
{ color = fromCssColor Colors.azure
, width = 30
, height = 30
, label = "Newspaper"