From 87691d1a6b8710f6eb5b684fdfde9fcbbbe622be Mon Sep 17 00:00:00 2001 From: Danielle Pham Date: Mon, 15 Oct 2018 17:15:57 -0400 Subject: [PATCH 1/3] Add assignmentTypePeerReview icon --- src/Nri/Ui/Icon/V3.elm | 8 ++++++++ styleguide-app/Assets.elm | 2 ++ styleguide-app/Examples/Icon.elm | 1 + styleguide-app/assets/images/peer-review-white.svg | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 styleguide-app/assets/images/peer-review-white.svg diff --git a/src/Nri/Ui/Icon/V3.elm b/src/Nri/Ui/Icon/V3.elm index 72547eb5..2faf9a19 100644 --- a/src/Nri/Ui/Icon/V3.elm +++ b/src/Nri/Ui/Icon/V3.elm @@ -9,6 +9,7 @@ module Nri.Ui.Icon.V3 exposing , assignmentStartButtonPrimary , assignmentStartButtonSecondary , assignmentTypeDiagnostic + , assignmentTypePeerReview , assignmentTypePractice , assignmentTypeQuiz , assignmentTypeWritingCycle @@ -93,6 +94,7 @@ module Nri.Ui.Icon.V3 exposing @docs assignmentStartButtonPrimary @docs assignmentStartButtonSecondary @docs assignmentTypeDiagnostic +@docs assignmentTypePeerReview @docs assignmentTypePractice @docs assignmentTypeQuiz @docs assignmentTypeWritingCycle @@ -428,6 +430,12 @@ assignmentTypeDiagnostic assets = SvgIcon assets.diagnostic +{-| -} +assignmentTypePeerReview : { r | icons_peerReviewWhite_svg : Asset } -> IconType +assignmentTypePeerReview assets = + ImgIcon assets.icons_peerReviewWhite_svg + + {-| -} assignmentTypePractice : { r | practice : String } -> IconType assignmentTypePractice assets = diff --git a/styleguide-app/Assets.elm b/styleguide-app/Assets.elm index ab0f7f26..42593d1b 100644 --- a/styleguide-app/Assets.elm +++ b/styleguide-app/Assets.elm @@ -46,6 +46,7 @@ type alias Assets = , icons_equals_svg : Asset , icons_helpBlue_svg : Asset , icons_peerReview_svg : Asset + , icons_peerReviewWhite_svg : Asset , icons_plusBlue_svg : Asset , icons_quickWrite_svg : Asset , icons_searchGray_svg : Asset @@ -135,6 +136,7 @@ assets = , icons_equals_svg = Asset "assets/images/equals.svg" , icons_helpBlue_svg = Asset "assets/images/help-blue.svg" , icons_peerReview_svg = Asset "assets/images/peer-review.svg" + , icons_peerReviewWhite_svg = Asset "assets/images/peer-review-white.svg" , icons_plusBlue_svg = Asset "assets/images/plus-blue.svg" , icons_quickWrite_svg = Asset "assets/images/quick-write.svg" , icons_searchGray_svg = Asset "assets/images/search-gray.svg" diff --git a/styleguide-app/Examples/Icon.elm b/styleguide-app/Examples/Icon.elm index 21ecb361..31329729 100644 --- a/styleguide-app/Examples/Icon.elm +++ b/styleguide-app/Examples/Icon.elm @@ -40,6 +40,7 @@ example = , { icon = Icon.assignmentTypePractice, background = Light, alt = "Practice" } , { icon = Icon.assignmentTypeQuiz, background = Light, alt = "Quiz" } , { icon = Icon.assignmentTypeWritingCycle, background = Light, alt = "WritingCycle" } + , { icon = Icon.assignmentTypePeerReview, background = Dark, alt = "PeerReview" } , { icon = Icon.peerReview, background = Light, alt = "PeerReview" } , { icon = Icon.submitting, background = Light, alt = "Submitting" } , { icon = Icon.rating, background = Light, alt = "Rating" } diff --git a/styleguide-app/assets/images/peer-review-white.svg b/styleguide-app/assets/images/peer-review-white.svg new file mode 100644 index 00000000..52dd1d24 --- /dev/null +++ b/styleguide-app/assets/images/peer-review-white.svg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:318e4b592733c81645cc43d4ccf49f43c7af4b3e6a79140bdac238eb06c1ae75 +size 3069 From 81ca29d94687ad38f8c2c7f42583ac93490f7712 Mon Sep 17 00:00:00 2001 From: Danielle Pham Date: Mon, 15 Oct 2018 17:21:08 -0400 Subject: [PATCH 2/3] Add assignmentTypeQuickWrite icon --- src/Nri/Ui/Icon/V3.elm | 8 ++++++++ styleguide-app/Assets.elm | 2 ++ styleguide-app/Examples/Icon.elm | 1 + styleguide-app/assets/images/quick-write-white.svg | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 styleguide-app/assets/images/quick-write-white.svg diff --git a/src/Nri/Ui/Icon/V3.elm b/src/Nri/Ui/Icon/V3.elm index 2faf9a19..6b2aba06 100644 --- a/src/Nri/Ui/Icon/V3.elm +++ b/src/Nri/Ui/Icon/V3.elm @@ -11,6 +11,7 @@ module Nri.Ui.Icon.V3 exposing , assignmentTypeDiagnostic , assignmentTypePeerReview , assignmentTypePractice + , assignmentTypeQuickWrite , assignmentTypeQuiz , assignmentTypeWritingCycle , attention @@ -96,6 +97,7 @@ module Nri.Ui.Icon.V3 exposing @docs assignmentTypeDiagnostic @docs assignmentTypePeerReview @docs assignmentTypePractice +@docs assignmentTypeQuickWrite @docs assignmentTypeQuiz @docs assignmentTypeWritingCycle @docs attention @@ -442,6 +444,12 @@ assignmentTypePractice assets = SvgIcon assets.practice +{-| -} +assignmentTypeQuickWrite : { r | icons_quickWriteWhite_svg : Asset } -> IconType +assignmentTypeQuickWrite assets = + ImgIcon assets.icons_quickWriteWhite_svg + + {-| -} assignmentTypeQuiz : { r | quiz : String } -> IconType assignmentTypeQuiz assets = diff --git a/styleguide-app/Assets.elm b/styleguide-app/Assets.elm index 42593d1b..20e3d885 100644 --- a/styleguide-app/Assets.elm +++ b/styleguide-app/Assets.elm @@ -49,6 +49,7 @@ type alias Assets = , icons_peerReviewWhite_svg : Asset , icons_plusBlue_svg : Asset , icons_quickWrite_svg : Asset + , icons_quickWriteWhite_svg : Asset , icons_searchGray_svg : Asset , icons_xBlue_svg : Asset , icons_xBlue_svg : Asset @@ -139,6 +140,7 @@ assets = , icons_peerReviewWhite_svg = Asset "assets/images/peer-review-white.svg" , icons_plusBlue_svg = Asset "assets/images/plus-blue.svg" , icons_quickWrite_svg = Asset "assets/images/quick-write.svg" + , icons_quickWriteWhite_svg = Asset "assets/images/quick-write-white.svg" , icons_searchGray_svg = Asset "assets/images/search-gray.svg" , icons_xBlue_svg = Asset "assets/images/x-blue.svg" , key = "icon-key" diff --git a/styleguide-app/Examples/Icon.elm b/styleguide-app/Examples/Icon.elm index 31329729..5bc0ec1e 100644 --- a/styleguide-app/Examples/Icon.elm +++ b/styleguide-app/Examples/Icon.elm @@ -39,6 +39,7 @@ example = [ { icon = Icon.assignmentTypeDiagnostic, background = Light, alt = "Diagnostic" } , { icon = Icon.assignmentTypePractice, background = Light, alt = "Practice" } , { icon = Icon.assignmentTypeQuiz, background = Light, alt = "Quiz" } + , { icon = Icon.assignmentTypeQuickWrite, background = Dark, alt = "QuickWrite" } , { icon = Icon.assignmentTypeWritingCycle, background = Light, alt = "WritingCycle" } , { icon = Icon.assignmentTypePeerReview, background = Dark, alt = "PeerReview" } , { icon = Icon.peerReview, background = Light, alt = "PeerReview" } diff --git a/styleguide-app/assets/images/quick-write-white.svg b/styleguide-app/assets/images/quick-write-white.svg new file mode 100644 index 00000000..1066f304 --- /dev/null +++ b/styleguide-app/assets/images/quick-write-white.svg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e8698a165aaee8341bb47d7dc120b1a78ac20859ecb24cedfb26425fe757419 +size 493 From cabc2fd59e853096db3134aba8869f4af27f5767 Mon Sep 17 00:00:00 2001 From: Danielle Pham Date: Mon, 15 Oct 2018 17:22:58 -0400 Subject: [PATCH 3/3] Rearrange icon examples --- styleguide-app/Examples/Icon.elm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styleguide-app/Examples/Icon.elm b/styleguide-app/Examples/Icon.elm index 5bc0ec1e..573597b4 100644 --- a/styleguide-app/Examples/Icon.elm +++ b/styleguide-app/Examples/Icon.elm @@ -40,15 +40,15 @@ example = , { icon = Icon.assignmentTypePractice, background = Light, alt = "Practice" } , { icon = Icon.assignmentTypeQuiz, background = Light, alt = "Quiz" } , { icon = Icon.assignmentTypeQuickWrite, background = Dark, alt = "QuickWrite" } - , { icon = Icon.assignmentTypeWritingCycle, background = Light, alt = "WritingCycle" } + , { icon = Icon.quickWrite, background = Light, alt = "QuickWrite" } , { icon = Icon.assignmentTypePeerReview, background = Dark, alt = "PeerReview" } , { icon = Icon.peerReview, background = Light, alt = "PeerReview" } , { icon = Icon.submitting, background = Light, alt = "Submitting" } , { icon = Icon.rating, background = Light, alt = "Rating" } , { icon = Icon.revising, background = Light, alt = "Revising" } - , { icon = Icon.quickWrite, background = Light, alt = "QuickWrite" } --, { icon = Icon.guidedWrite, background = Light, alt = "GuidedWrite" } + , { icon = Icon.assignmentTypeWritingCycle, background = Light, alt = "WritingCycle" } , { icon = Icon.writingAssignment, background = Light, alt = "WritingAssignment" } ] , viewIconSection "Student Assignment Actions"