From 78c99216da5b9bf3c1ec3961956534842533f3df Mon Sep 17 00:00:00 2001 From: Colleen Palmer Date: Tue, 12 Aug 2014 14:08:22 -0600 Subject: [PATCH] Select icon in conversations dropdown fixes CNVS-14436 This fixes the icon not showing up correctly in the conversations dropdown Test Plan: - Go to Inbox - Click on "All Courses" - Make sure a checkmark icon shows on the selected course - Also click on "Compose a Message" - Make sure the checkmark also appears in the Courses dropdown here Change-Id: I720424dcf8df0db10141ba06e6d8d53266939fea Reviewed-on: https://gerrit.instructure.com/39153 Reviewed-by: Chris Hart Product-Review: Janelle Seegmiller Tested-by: Jenkins QA-Review: Steven Shepherd --- .fontcustom-manifest.json | 8 ++++++-- app/stylesheets/components/_canvas-icons.scss | 3 ++- .../conversations/_conversations_new.scss | 4 +++- .../conversations/compiler-conversations.scss | 1 + public/font/canvas/canvas-icons.eot | Bin 29522 -> 29606 bytes public/font/canvas/canvas-icons.svg | 8 +++++--- public/font/canvas/canvas-icons.ttf | Bin 29332 -> 29416 bytes public/font/canvas/canvas-icons.woff | Bin 17592 -> 17656 bytes public/font/icons/_canvas-icons.scss | 2 +- public/font/icons/check-mark.svg | 12 ++++++++++++ 10 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 public/font/icons/check-mark.svg diff --git a/.fontcustom-manifest.json b/.fontcustom-manifest.json index c7fedba480a..b6e888c4bd1 100644 --- a/.fontcustom-manifest.json +++ b/.fontcustom-manifest.json @@ -1,7 +1,7 @@ { "checksum": { - "previous": "0e99401e8ff492bd69eb3886960756b80bf5bc174b02cd6944c05f1e59fcea35", - "current": "0e99401e8ff492bd69eb3886960756b80bf5bc174b02cd6944c05f1e59fcea35" + "previous": "bc7417f957ee16e48bc6ceadfda4de71eefb6620c4651d1e0bc43b44fb07c551", + "current": "bc7417f957ee16e48bc6ceadfda4de71eefb6620c4651d1e0bc43b44fb07c551" }, "fonts": [ "public/font/canvas/canvas-icons.ttf", @@ -90,6 +90,10 @@ "codepoint": 61885, "source": "public/font/icons/check-dark.svg" }, + "check-mark": { + "codepoint": 62007, + "source": "public/font/icons/check-mark.svg" + }, "check-plus": { "codepoint": 61886, "source": "public/font/icons/check-plus.svg" diff --git a/app/stylesheets/components/_canvas-icons.scss b/app/stylesheets/components/_canvas-icons.scss index d3798287260..ffacc19c6de 100644 --- a/app/stylesheets/components/_canvas-icons.scss +++ b/app/stylesheets/components/_canvas-icons.scss @@ -285,7 +285,7 @@ Either use `` with icon desired icon class added or insert `` inside `M%HD;3=A(OvYNAatc)$3=+Ivu`{EY^L(v%q1_l}bV0|M;oA~(*42%&# zenN6?V!?^zy-yezm?eN>P03{?3JijbE({DTbAa+J>50V!|Nk>E1N9#P@;TCTD$}HY zA6(AB!1{xMAvq=^H8F+JzHJpy?hX)}WdH@3KQkT%nk53{t7PPsRMhi+;|u}{>;U4p zoc!d(d%E8gfMzcM@*{E+D+(By84ZDK3!nytyu{p8b^Bj^3=Eke3=B*=3i69fQeTv) zGBD)uFfg#~U|O5H#bEURfB*M0F)p3$ZGjvK45Wb1Gm>00O-85o){Ok5~6Sv;qMarNc}IU$Tpj4L;P$+ckR YU@y(fbTcwGpR89b!2|S!DAW_80BnzYBLDyZ delta 402 zcmZ4Xobl2#M%JKW28JmUSl-=R#Lr`3V2l9r z6OwZi3r-~OeayhXECLj3N-ir=U=U<@vh+}f{ zlN0ah9w`EvJqO4S%T25(U}R!61hPSfDC8yPrmDFz^f54GaxgG3?I_4EF1fT-OpAdb z`v3z2+d2kDpei6P637mS=ePOFz|8~{U|=}^-smoj{{Qd)ekLZyLqI+U0~5pKvy6I- zt0w!vWN+&dGj_l(d5m-S$`N=Ef{ne%qNTF=x|!-n(G=F z7@9ClTqrepeKz0Z!kj9`Rh!@BgfMP)%Clfq1KGvE2n-sK^&mGfoUvVW9z-L%1OQp= BY=i&+ diff --git a/public/font/canvas/canvas-icons.svg b/public/font/canvas/canvas-icons.svg index 207d25ee555..ef2dfbaba34 100644 --- a/public/font/canvas/canvas-icons.svg +++ b/public/font/canvas/canvas-icons.svg @@ -1,11 +1,11 @@ -Created by FontForge 20120731 at Thu Jul 24 12:13:21 2014 +Created by FontForge 20120731 at Tue Aug 12 14:01:26 2014 By Colleen Palmer Created by Colleen Palmer with FontForge 2.0 (http://fontforge.sf.net) @@ -22,7 +22,7 @@ Created by Colleen Palmer with FontForge 2.0 (http://fontforge.sf.net) bbox="-1.71191 -64.416 513.008 449.376" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F102-F236" + unicode-range="U+F102-F237" /> + + + + + + + + + +