From 6f678162d34673d024af3c2f06fb27168e933467 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 29 Sep 2014 13:34:43 -0300
Subject: [PATCH] Added colab logo as SVG

---
 src/colab/custom_settings.py  |  5 +++++
 src/static/css/screen.css     |  4 ++++
 src/static/img/logo.png       | Bin 1887 -> 0 bytes
 src/static/img/logo.svg       | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/static/img/logo_nav.png   | Bin 7551 -> 0 bytes
 src/static/img/logo_small.png | Bin 3021 -> 0 bytes
 src/templates/base.html       |  2 +-
 7 files changed, 74 insertions(+), 1 deletion(-)
 delete mode 100644 src/static/img/logo.png
 create mode 100644 src/static/img/logo.svg
 delete mode 100644 src/static/img/logo_nav.png
 delete mode 100644 src/static/img/logo_small.png

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 504ecd1..1560c5a 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -1,6 +1,11 @@
 from settings import *
 from django.utils.translation import ugettext_lazy as _
 
+# Allow Django runserver to serve SVG files
+#   https://code.djangoproject.com/ticket/20162
+import mimetypes
+mimetypes.add_type('image/svg+xml', '.svg')
+
 DEBUG = False
 
 TEMPLATE_DEBUG = False
diff --git a/src/static/css/screen.css b/src/static/css/screen.css
index 627433f..dc9cf89 100644
--- a/src/static/css/screen.css
+++ b/src/static/css/screen.css
@@ -24,6 +24,10 @@ li hr {
     margin-left: 10px;
 }
 
+.navbar-brand img {
+    height: 40px;
+}
+
 #user-menu .wrapper {
     padding: 3px 10px;
     white-space: nowrap;
diff --git a/src/static/img/logo.png b/src/static/img/logo.png
deleted file mode 100644
index a5a49ce..0000000
Binary files a/src/static/img/logo.png and /dev/null differ
diff --git a/src/static/img/logo.svg b/src/static/img/logo.svg
new file mode 100644
index 0000000..cd22010
--- /dev/null
+++ b/src/static/img/logo.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="645.0506"
+   height="192.82056"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-58.02724,-191.19295)"
+     id="layer1">
+    <path
+       d="m 63.02724,197.18097 0,154.59066 17.780425,0 1.96673,-0.52717 0,-78.99093 8.405162,0 0,78.03622 22.225453,0 0,-78.03622 5.92681,0 2.96343,0 0,78.53009 18.76816,0 0,-78.53009 6.23758,1.67135 0,76.85874 20.43302,0 0,-127.92007 32.10348,0 0,-26.6706 z"
+       id="path3078"
+       style="fill:#b9ce2a;fill-opacity:1;stroke:none" />
+    <path
+       d="m 274.98763,378.02549 0,-154.59066 -17.78042,0 -1.96673,0.52717 0,78.99093 -8.40516,0 0,-78.03622 -22.22546,0 0,78.03622 -5.92681,0 -2.96343,0 0,-78.53009 -18.76815,0 0,78.53009 -6.23758,-1.67135 0,-76.85874 -20.43302,0 0,127.92007 -32.10349,0 0,26.6706 z"
+       id="path3108"
+       style="fill:#aabac3;fill-opacity:1;stroke:none" />
+    <g
+       id="text3878"
+       style="font-size:141.21679688px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#595b5d;fill-opacity:0.90980392;stroke:none;font-family:Sans">
+      <path
+         d="m 367.92842,326.69158 c -0.94152,15.72214 -8.75551,23.5832 -23.44199,23.5832 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.6131,-4.61307 -6.91964,-10.1676 -6.91963,-16.66358 l 0,-58.74619 c -10e-6,-6.40174 2.25946,-11.90919 6.77841,-16.52237 4.61306,-4.70712 10.21465,-7.06073 16.8048,-7.06084 l 23.5832,0 c 14.78062,1.1e-4 22.59461,7.86117 23.44199,23.58321 l -11.72099,0 c -0.94152,-7.90805 -4.84851,-11.86212 -11.721,-11.86221 l -11.86221,0 c -3.20095,9e-5 -5.97822,1.1769 -8.33179,3.53042 -2.2595,2.25955 -3.38924,5.03681 -3.3892,8.33179 l 0,58.74619 c -4e-5,3.20093 1.1297,5.97819 3.3892,8.33179 2.35357,2.35362 5.13084,3.53043 8.33179,3.53042 l 11.86221,0 c 6.96663,1e-5 10.87363,-3.95406 11.721,-11.86221 l 11.72099,0"
+         id="path3015"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 415.23164,267.94539 23.5832,0 c 6.40176,8e-5 11.90921,2.30662 16.52237,6.91962 4.613,4.61315 6.91954,10.1206 6.91962,16.52237 l 0,35.3042 c -8e-5,6.40184 -2.30662,11.95636 -6.91962,16.66358 -4.61316,4.61308 -10.12061,6.91962 -16.52237,6.91962 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66359,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,-35.3042 c -1e-5,-6.40177 2.30653,-11.90922 6.91962,-16.52237 4.70721,-4.613 10.26173,-6.91954 16.66359,-6.91962 m 0,23.44199 0,35.3042 c -4e-5,3.20093 1.12969,5.97819 3.3892,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35356,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17686,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.3892,8.19058"
+         id="path3017"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 485.97684,350.27478 0,-105.9126 23.5832,0 0,105.9126 -23.5832,0"
+         id="path3019"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 580.30745,303.24959 0,-11.86221 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 l -11.721,0 c -6.96672,7e-5 -10.87371,3.90707 -11.72099,11.721 l -11.86221,0 c 1.88288,-15.62792 9.74394,-23.44191 23.5832,-23.44199 l 23.58321,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,58.8874 -23.44199,0 0,-11.72099 c -0.94151,7.814 -4.89557,11.72099 -11.86221,11.72099 l -11.721,0 c -6.40185,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,0 c -10e-6,-6.4018 2.30653,-11.90925 6.91962,-16.52237 4.7072,-4.61304 10.26173,-6.91958 16.66358,-6.91962 l 23.58321,0 m 0,11.72099 -11.86221,0 c -3.20096,4e-5 -5.97822,1.17684 -8.33179,3.53042 -2.25951,2.2595 -3.38924,4.98969 -3.38921,8.19058 l 0,0 c -3e-5,3.20093 1.1297,5.97819 3.38921,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-11.721"
+         id="path3021"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 627.46944,350.27478 0,-105.9126 23.5832,0 0,35.3042 c 0.47069,-3.95399 1.69457,-6.87247 3.67164,-8.75544 1.97699,-1.97695 4.66011,-2.96547 8.04936,-2.96555 l 11.86221,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,35.3042 c -9e-5,6.40184 -2.30662,11.95636 -6.91963,16.66358 -4.61315,4.61308 -10.1206,6.91962 -16.52236,6.91962 l -47.16641,0 m 23.5832,-11.72099 11.721,0 c 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.38921,8.19058 l 0,47.16641"
+         id="path3023"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+    </g>
+  </g>
+</svg>
diff --git a/src/static/img/logo_nav.png b/src/static/img/logo_nav.png
deleted file mode 100644
index 31fdc9f..0000000
Binary files a/src/static/img/logo_nav.png and /dev/null differ
diff --git a/src/static/img/logo_small.png b/src/static/img/logo_small.png
deleted file mode 100644
index 7e657ff..0000000
Binary files a/src/static/img/logo_small.png and /dev/null differ
diff --git a/src/templates/base.html b/src/templates/base.html
index b62de0b..d6dd051 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a>
+          <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
         </div>
         <div class="collapse navbar-collapse navbar-main">
           <ul class="nav navbar-nav">
--
libgit2 0.21.2