Merge branch 'new-logo' into 'master'

New logo and CI application

Closes #150

See merge request AlekSIS!167

aleksis/core/settings.py

@@ -365,8 +365,8 @@ CONSTANCE_ADDITIONAL_FIELDS = {
 }
 CONSTANCE_CONFIG = {
     "SITE_TITLE": ("AlekSIS", _("Site title"), "char_field"),
-    "COLOUR_PRIMARY": ("#007bff", _("Primary colour")),
-    "COLOUR_SECONDARY": ("#007bff", _("Secondary colour")),
+    "COLOUR_PRIMARY": ("#0d5eaf", _("Primary colour")),
+    "COLOUR_SECONDARY": ("#0d5eaf", _("Secondary colour")),
     "MAIL_OUT_NAME": ("AlekSIS", _("Mail out name")),
     "MAIL_OUT": (DEFAULT_FROM_EMAIL, _("Mail out address"), "email_field"),
     "PRIVACY_URL": ("", _("Link to privacy policy"), "url_field"),

aleksis/core/static/img/aleksis-icon.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg8" width="256" height="256" version="1.1" viewBox="0 0 67.73 67.73" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title id="title32">AlekSIS icon</title>
+ <defs id="defs2">
+  <linearGradient id="shadow-gradient" x1="-19.53" x2="165.4" y1="-19.53" y2="165.4" gradientUnits="userSpaceOnUse">
+   <stop id="stop9444" offset="0"/>
+   <stop id="stop9446" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata id="metadata5">
+  <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>AlekSIS icon</dc:title>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
+    <dc:date>2020-02-29</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Dominik George</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>Julian Leucker</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+   </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
+  </rdf:RDF>
+ </metadata>
+ <g id="background-with-glow">
+  <rect id="background" y="-3.357e-6" width="67.73" height="67.73" rx="3.307" ry="3.307" fill="#0d5eaf" stroke-width=".4104"/>
+  <path id="glow" transform="scale(.2646)" d="m9.959 0.2578c-5.698 1.168-9.959 6.189-9.959 12.24v52.31a234.1 86.8 0 0 0 188.9 35.71 234.1 86.8 0 0 0 67.09-3.715v-84.3c0-4.319-2.17-8.112-5.482-10.36-0.01554-0.01049-0.03129-0.02083-0.04688-0.03125-0.2971-0.1993-0.6034-0.3849-0.918-0.5586-0.05211-0.02867-0.1037-0.05799-0.1562-0.08594-0.2939-0.1568-0.5968-0.3001-0.9043-0.4336-0.05654-0.02442-0.111-0.05257-0.168-0.07617-0.3308-0.1378-0.6709-0.2577-1.016-0.3672-0.03502-0.01105-0.06836-0.02636-0.1035-0.03711-0.3806-0.1172-0.7687-0.2158-1.164-0.2969h-236.1z" fill="#fff" opacity=".2" stroke-width="1.551"/>
+ </g>
+ <g id="widgets-with-shadow">
+  <path id="shadow" transform="scale(.2646)" d="m188.2 20.16c-11.17 0.2955-4.441 16.25-17.54 12.56-17.31 4.576-18.64 24.39-17.21 39.1 1.565 6.747-1.9 1.315-3.715-0.1367-5.666-3.203-12.24 3.777-8.709 9.107 1.178 1.172 2.354 2.349 3.529 3.525-1.648-0.1733-2.722 0.18-3.406 0.8867-20.9-20.89-41.81-41.78-62.73-62.66-1.667-1.362-3.817-2.142-5.979-2.131-9.823 2.627-15.3 12.67-22.91 19-8.327 8.601-17.24 16.68-25.2 25.61-4.688 8.603 4.095 13.55 8.873 18.91 1.473 2.302 7.219 4.605 2.852 6.906-7.332 4.874-9.54 15.75-2.365 21.36 15.49 15.49 30.97 30.98 46.46 46.46-0.4584 0.6368-1.044 1.194-1.809 1.637-3.106 4.526-4.08-0.9818-6.254-1.748-5.859-6.192-12.02-12.08-17.95-18.21h-22.08c-12.43 0.00454-12.65 13.69-12 22.8 0.3378 21.38-0.6904 42.86 0.541 64.18 3.053 6.838 9.872 10.98 14.65 16.58 4.034 4.029 8.064 8.062 12.1 12.09h196.1c6.925 0 12.5-5.575 12.5-12.5v-162.7c-13.85-14.24-27.68-28.5-41.44-42.83-4.585-4.531-11.77-4.442-15.49-9.955-3.38-2.915-5.87-7.7-10.88-7.838z" fill="url(#shadow-gradient)" stroke-width="1.551"/>
+  <g id="widgets" fill="#fff">
+   <path id="schoolbag" d="m44.52 19.7h10.45a0.4353 0.4353 0 0 1 0.4353 0.4353v3.917a0.4353 0.4353 0 0 1-0.4353 0.4353h-10.45a0.4353 0.4353 0 0 1-0.4353-0.4353v-3.917a0.4353 0.4353 0 0 1 0.4353-0.4353zm10.88-1.306v-0.8705a0.4353 0.4353 0 0 0-0.4353-0.4353h-10.45a0.4353 0.4353 0 0 0-0.4353 0.4353v0.8705a0.4353 0.4353 0 0 0 0.4353 0.4353h10.45a0.4353 0.4353 0 0 0 0.4353-0.4353zm-14.8 10.01v0.8705a2.176 2.176 0 0 0 2.176 2.176h13.93a2.176 2.176 0 0 0 2.176-2.176v-0.8705a0.4353 0.4353 0 0 0-0.4353-0.4353h-17.41a0.4353 0.4353 0 0 0-0.4353 0.4353zm-0.8705-7.4v-1.741a0.4353 0.4353 0 0 0-0.4353-0.4353h-0.8705a1.306 1.306 0 0 0-1.306 1.306v0.8706a0.4353 0.4353 0 0 0 0.4353 0.4353h1.741a0.4353 0.4353 0 0 0 0.4353-0.4353zm-2.612 1.741v4.788a1.306 1.306 0 0 0 1.306 1.306h0.8705a0.4353 0.4353 0 0 0 0.4353-0.4353v-5.659a0.4353 0.4353 0 0 0-0.4353-0.4353h-1.741a0.4353 0.4353 0 0 0-0.4353 0.4353zm22.63 0v5.659a0.4353 0.4353 0 0 0 0.4353 0.4353h0.8705a1.306 1.306 0 0 0 1.306-1.306v-4.788a0.4353 0.4353 0 0 0-0.4353-0.4353h-1.741a0.4353 0.4353 0 0 0-0.4353 0.4353zm2.612-1.741v-0.8706a1.306 1.306 0 0 0-1.306-1.306h-0.8705a0.4353 0.4353 0 0 0-0.4353 0.4353v1.741a0.4353 0.4353 0 0 0 0.4353 0.4353h1.741a0.4353 0.4353 0 0 0 0.4353-0.4353zm-3.482-6.203v11.86a0.4353 0.4353 0 0 1-0.4353 0.4353h-17.41a0.4353 0.4353 0 0 1-0.4353-0.4353v-11.86a6.42 6.42 0 0 1 6.42-6.42h0.3809a0.1632 0.1632 0 0 0 0.1632-0.1632v-0.7073a2.179 2.179 0 0 1 2.229-2.176c1.188 0.0282 2.124 1.028 2.124 2.217v0.6664a0.1632 0.1632 0 0 0 0.1632 0.1632h0.3809a6.42 6.42 0 0 1 6.42 6.42zm-10.45-6.583a0.1632 0.1632 0 0 0 0.1632 0.1632h2.285a0.1632 0.1632 0 0 0 0.1632-0.1632v-0.6776c0-0.7306-0.5978-1.348-1.328-1.336a1.307 1.307 0 0 0-1.283 1.306zm-0.4353 4.081a1.741 1.741 0 1 0 1.741-1.741 1.741 1.741 0 0 0-1.741 1.741zm8.27 5.223a1.307 1.307 0 0 0-1.306-1.306h-10.45a1.307 1.307 0 0 0-1.306 1.306v6.529a1.307 1.307 0 0 0 1.306 1.306h10.45a1.307 1.307 0 0 0 1.306-1.306z" stroke-width=".05441"/>
+   <path id="puzzle-ll" d="m8.484 37.13c-1.759 0-3.175 1.416-3.175 3.175v18.89c0 1.759 1.416 3.175 3.175 3.175h18.93c1.759 0 3.175-1.416 3.175-3.175v-18.89c0-1.759-1.416-3.175-3.175-3.175h-5.842v2.798h-0.01188c0.0052 0.0528 0.01281 0.1048 0.01447 0.1586 0 2.002-1.623 3.625-3.625 3.625-2.002 0-3.625-1.623-3.625-3.625 0.01013-0.0551 0.02494-0.1053 0.03669-0.1586h-0.03514v-2.798zm28.69 12.62c3e-6 2.002-1.623 3.625-3.625 3.625-4.515-0.8302-3.163-7.154 0-7.251 2.002 0 3.625 1.623 3.625 3.625zm-6.582-3.623h2.798v7.247h-2.798z"/>
+   <path id="puzzle-lr" d="m37.31 59.24c0 1.759 1.416 3.175 3.175 3.175h18.89c1.759 0 3.175-1.416 3.175-3.175v-18.93c0-1.759-1.416-3.175-3.175-3.175h-18.89c-1.759 0-3.175 1.416-3.175 3.175v5.842h2.798v0.0119c0.0528-5e-3 0.1048-0.0128 0.1586-0.0145 2.002 0 3.625 1.623 3.625 3.625 0 2.002-1.623 3.625-3.625 3.625-0.0551-0.0101-0.1053-0.0249-0.1586-0.0367v0.0351h-2.798z"/>
+   <path id="puzzle-ul" d="m31.48 20.23c0.9818-0.9818 0.9818-2.563 0-3.544l-10.54-10.54c-0.9818-0.9819-2.563-0.9819-3.545 0l-10.57 10.57c-0.9818 0.9818-0.9818 2.563 6e-6 3.544l10.54 10.54c0.9818 0.9819 2.563 0.9819 3.545 0l3.261-3.261-1.562-1.562 0.0064-0.0069c-0.03229-0.02696-0.06563-0.05145-0.09668-0.08057-1.118-1.118-1.118-2.93 0-4.048 1.118-1.118 2.93-1.118 4.048 0 0.02514 0.0363 0.04485 0.07241 0.0681 0.109l0.0196-0.01948 1.562 1.562zm-23.06 8.969c-1.118-1.118-1.118-2.93-6.1e-6 -4.048 2.984-2.057 5.759 2.228 4.048 4.048-1.118 1.118-2.93 1.118-4.048 0zm5.697-1.652-1.562 1.562-4.045-4.045 1.562-1.562z"/>
+  </g>
+ </g>
+</svg>

aleksis/core/static/style.scss

@@ -8,6 +8,10 @@
   color: $primary-color !important;
 }
 
+rect#background {
+  fill: $primary-color !important;
+}
+
 .waves-effect.waves-primary .waves-ripple {
   background-color: lighten($primary-color, 5%);
 }
@@ -66,6 +70,11 @@ header, main, footer {
   margin-left: 10px;
 }
 
+#sidenav-logo {
+  height: 70px;
+  width:auto;
+}
+
 @media only screen and (max-width: 993px) {
   header div.nav-wrapper {
     z-index: -5;

aleksis/core/templates/core/base.html

@@ -64,7 +64,9 @@
   <ul id="slide-out" class="sidenav sidenav-fixed">
     <li class="logo">
       <a id="logo-container" href="/" class="brand-logo">
-        <img src="{% static 'img/aleksis-logo.png' %}" alt="AlekSIS Logo" style="height: 70px; width:auto;">
+        <object type="image/svg+xml" data="{% static 'img/aleksis-icon.svg' %}" class="aleksis-logo-svg" id="sidenav-logo">
+          <img src="{% static 'img/aleksis-icon.png' %}" alt="AlekSIS icon" />
+        </object>
       </a>
     </li>
     <li class="no-padding">

dev.sh

@@ -53,7 +53,7 @@ case "$1" in
     "gource")
 	for d in . apps/official/*; do
 		gource --output-custom-log - "$d"
-	done | sort -n | gource --log-format custom --background-image aleksis/core/static/img/aleksis-logo.png -
+	done | sort -n | gource --log-format custom --background-image aleksis/core/static/img/aleksis-icon.png -
 	exit
 	;;