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 <chart@instructure.com>
Product-Review: Janelle Seegmiller <jseegmiller@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
This commit is contained in:
Colleen Palmer 2014-08-12 14:08:22 -06:00
parent f83627e7f0
commit 78c99216da
10 changed files with 30 additions and 8 deletions

View File

@ -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"

View File

@ -285,7 +285,7 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
}
i[class*=icon-], i[class^=icon-], a[class*=icon-], a[class^=icon-] {
i[class*=icon-], i[class^=icon-], a[class*=icon-], a[class^=icon-]{
&:before {
font-family: "canvas-icons";
@ -382,6 +382,7 @@ h1, h2, h3, h4, .h1, .h2, .h3, .h4, p {
.icon-calendar-month:before { content: "\f1b9"; }
.icon-check:before { content: "\f1bc"; }
.icon-check-dark:before { content: "\f1bd"; }
.icon-check-mark:before { content: "\f237"; }
.icon-check-plus:before { content: "\f1be"; }
.icon-clock:before { content: "\f1bf"; }
.icon-collapse:before { content: "\f102"; }

View File

@ -437,7 +437,9 @@
}
i.icon-ok:before {
content: "\e015";
// this is why we need the component loaded into the compiler sheet
// TODO: fix it so we're not using bootstrap.js and their classes
@extend .icon-check:before;
vertical-align: baseline;
}

View File

@ -1,3 +1,4 @@
@import "base/environment";
@import "components/_canvas-icons.scss";
@import "pages/conversations/conversations_new";
@import "pages/conversations/compose_message_dialog";

Binary file not shown.

View File

@ -1,11 +1,11 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<!--
2014-7-24: Created.
2014-8-12: Created.
-->
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
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)
</metadata>
@ -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"
/>
<missing-glyph />
<glyph glyph-name="uniF19C" unicode="&#xf19c;"
@ -122,6 +122,8 @@ c17.6641 0 32 14.3037 32 32c0 17.6641 -14.3359 32 -32 32s-32 -14.3359 -32 -32c0
d="M128 256h256l-128 -128z" />
<glyph glyph-name="uniF1AF" unicode="&#xf1af;"
d="M256 416c123.712 0 224 -100.288 224 -224s-100.288 -224 -224 -224s-224 100.288 -224 224s100.288 224 224 224zM284 164h140v56h-140v140h-56v-140h-140v-56h140v-140h56v140z" />
<glyph glyph-name="uniF237" unicode="&#xf237;"
d="M475.2 444.8c0 -67.2002 1.59961 -94.3994 33.5996 -169.6c-83.2002 -17.6006 -214.399 -235.2 -270.399 -337.601c-80 97.6006 -171.2 179.2 -236.801 203.2l148.801 86.4004l75.1992 -144s59.2002 264 249.601 361.6z" />
<glyph glyph-name="uniF1FF" unicode="&#xf1ff;"
d="M348.912 284.48h0.0478516l-162.4 -162.385c-8.94336 -8.94336 -8.94336 -23.5195 0 -32.4639c8.95996 -8.95996 23.5205 -8.95996 32.4805 0l194.88 194.849c26.8477 26.8477 26.8643 70.5596 0 97.4238c-26.8643 26.8633 -70.5918 26.8633 -97.4395 0
l-204.641 -204.576l0.0166016 -0.0322266c-0.144531 -0.12793 -0.288086 -0.271484 -0.448242 -0.416016c-44.5283 -44.5283 -44.5283 -116.96 0 -161.488c44.5439 -44.5273 116.992 -44.5273 161.536 0c0.12793 0.12793 0.271484 0.288086 0.416016 0.416016

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Binary file not shown.

View File

@ -285,7 +285,7 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
}
i[class*=icon-], i[class^=icon-], a[class*=icon-], a[class^=icon-] {
i[class*=icon-], i[class^=icon-], a[class*=icon-], a[class^=icon-]{
&:before {
font-family: "canvas-icons";

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g id="check">
<g>
<path d="M29.7,0.2C17.8,6.3,14.1,22.8,14.1,22.8l-4.7-9l-9.3,5.4c4.1,1.5,9.8,6.6,14.8,12.7c3.5-6.4,11.7-20,16.9-21.1
C29.8,6.1,29.7,4.4,29.7,0.2z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 640 B