From 21e51754f80c027912d20d55afaa4725287d45bd Mon Sep 17 00:00:00 2001
From: Jennifer Stern <jstern@instructure.com>
Date: Mon, 13 Jul 2015 14:02:05 -0500
Subject: [PATCH] Fix invalid font/image urls

fixes CNVS-21857

brandable_css was logging warnings for these image and font urls.
This seems to fix that.

Note there are still a couple warnings for images that actually
don't exist in the repo:

1. /images/inst_tree/node-drag.gif
    (referenced at _inst_tree.scss:97)
2. /images/mediaelement/skipback.png
    (referenced at _mediaelementplayer.scss:977)

Changes included in this commit:

1. canvas-icons svg font url
    (verify at /styleguide#icons)
2. breadcrumbs arrow image url
    (verify that there are no changes to breadcrumbs)
3. loader image in new ui navigation trays
    (click 'Admin' or 'Courses' in new nav with a slow connection)

Change-Id: Ic077717dd20a552e4a3fd28d3dd4f5873f3c926e
Reviewed-on: https://gerrit.instructure.com/58291
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
---
 app/stylesheets/base/_ic_app_header.scss      | 4 ++--
 app/stylesheets/components/_breadcrumbs.scss  | 6 +++---
 app/stylesheets/components/_canvas-icons.scss | 2 +-
 app/stylesheets/components/_inst_tree.scss    | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/stylesheets/base/_ic_app_header.scss b/app/stylesheets/base/_ic_app_header.scss
index 850d604754b..864746af4b0 100644
--- a/app/stylesheets/base/_ic_app_header.scss
+++ b/app/stylesheets/base/_ic_app_header.scss
@@ -30,7 +30,7 @@
     position: relative;
     height: 100%;
     // Use this element to preload the loading image for the secondary nav drawers
-    background: image-url("/images/panda-cycle-loader.gif") no-repeat -9999px -9999px;
+    background: url("/images/panda-cycle-loader.gif") no-repeat -9999px -9999px;
   }
 
   .ic-app-header__main-navigation {
@@ -279,7 +279,7 @@
         @include breakpoint(short) { padding-top: $ic-sp/2; }
       }
       &.ReactTray__loading-list-item {
-        background: image-url("panda-cycle-loader.gif") no-repeat left center;
+        background: url("/images/panda-cycle-loader.gif") no-repeat left center;
         background-size: 100px;
         text-align: center;
         color: $ic-dim-helper-text;
diff --git a/app/stylesheets/components/_breadcrumbs.scss b/app/stylesheets/components/_breadcrumbs.scss
index 956fc0d4ace..2dc6adbb1c1 100644
--- a/app/stylesheets/components/_breadcrumbs.scss
+++ b/app/stylesheets/components/_breadcrumbs.scss
@@ -12,7 +12,7 @@
       @if $use_new_styles {
         vertical-align: top;
         font-size: 18px;
-        // temporary solution for new styles before crumbs are re-done: 
+        // temporary solution for new styles before crumbs are re-done:
         // we do not want to see the home link
         &:first-of-type { display: none; }
         &:nth-child(2):before { display: none; }
@@ -43,7 +43,7 @@
             width: 5px; height: 9px;
             display: inline-block;
             margin: 0 ($ic-sp - 3);
-            background: image-url("breadcrumb-arrow-light.svg") no-repeat 50% 50%;
+            background: url("/images/breadcrumb-arrow-light.svg") no-repeat 50% 50%;
             background-size: 5px 9px;
           }
           @else {
@@ -66,4 +66,4 @@
     font-size: 10px;
     color: $ic-font-color--subdued;
   }
-}
\ No newline at end of file
+}
diff --git a/app/stylesheets/components/_canvas-icons.scss b/app/stylesheets/components/_canvas-icons.scss
index 52631eb81fa..465b82a2cf1 100644
--- a/app/stylesheets/components/_canvas-icons.scss
+++ b/app/stylesheets/components/_canvas-icons.scss
@@ -297,7 +297,7 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
   src:  url('/fonts/canvas/canvas-icons.eot?#iefix') format('embedded-opentype'),
         url('/fonts/canvas/canvas-icons.woff') format('woff'),
         url('/fonts/canvas/canvas-icons.ttf') format('truetype'),
-        url('/fonts/canvas/canvas-webfont.svg#canvasregular') format('svg');
+        url('/fonts/canvas/canvas-icons.svg#canvas-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/app/stylesheets/components/_inst_tree.scss b/app/stylesheets/components/_inst_tree.scss
index 0ffe4771ed3..a028856a106 100644
--- a/app/stylesheets/components/_inst_tree.scss
+++ b/app/stylesheets/components/_inst_tree.scss
@@ -34,7 +34,7 @@ ul.instTree {
         background-image: url("/images/groups_folder.png");
       }
       // &.open
-   
+
     }
     &.leaf {
       background-image: url("/images/mimeClassIcons/file.svg");
@@ -93,6 +93,7 @@ ul.instTree {
   z-index: 1000;
   position: absolute;
   &.node {
+    // FIXME: this background image doesn't exist
     background: #C3E1FF url("/images/inst_tree/node-drag.gif") left 3px no-repeat;
   }
   &.leaf {