Merge pull request #431 from ubccr/branding

Add ColdFront logo and branding

README.md

@@ -1,3 +1,5 @@
+![ColdFront](docs/pages/images/logo-lg.png)
+
 # ColdFront - Resource Allocation System
 
 [![Documentation Status](https://readthedocs.org/projects/coldfront/badge/?version=latest)](https://coldfront.readthedocs.io/en/latest/?badge=latest)

coldfront/static/common/css/common.css

@@ -62,9 +62,13 @@ main {
   color: #ffffff;
 }
 
+.banner-name {
+    padding-top: 25px;
+}
+
 .banner-logo {
     margin-top: 5px;
-    max-height: 58px !important;
+    max-height: 75px !important;
     margin-bottom: 5px;
 }
 

coldfront/static/common/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/static/common/images/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/static/common/images/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

coldfront/templates/common/base.html

@@ -7,6 +7,11 @@
   <!-- Required meta tags -->
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="apple-touch-icon" sizes="180x180" href="{% static 'common/images/apple-touch-icon.png' %}">
+  <link rel="shortcut icon" type="image/png" href="{% static 'common/images/favicon.ico' %}"/>
+  <link rel="icon" type="image/png" sizes="32x32" href="{% static 'common/images/favicon-32x32.png' %}">
+  <link rel="icon" type="image/png" sizes="16x16" href="{% static 'common/images/favicon-16x16.png' %}">
+  <link rel="manifest" href="{% static 'common/site.webmanifest' %}">
 
   <!-- Load Bootstrap4 -->
   <link rel="stylesheet" href="{% static 'jquery/jquery-ui-1.12.1.min.css' %}">

coldfront/templates/common/navbar_brand.html

@@ -1,9 +1,13 @@
 {% load static %}
-<div class="bg-primary" id="brand">
+{% load common_tags %}
+<div class="bg-light" id="brand">
   <div class="container">
     <div class="row">
-      <div class="col">
-        <h1>ColdFront - <small>Resource Allocation System</small></h1>
+      <div class="col-6 col-md-2">
+        <a href="/"><img class="img-responsive banner-logo" src="{% static 'common/images/logo.png' %}" alt="Coldfront"></a>
+      </div>
+      <div class="col-6 col-md-6">
+        <h3 class="banner-name">{% settings_value 'CENTER_NAME' %}</h3>
       </div>
     </div>
   </div> 

docs/pages/index.md

@@ -1,5 +1,7 @@
 # What is ColdFront?
 
+![Diagram](images/logo-lg.png)
+
 ColdFront is an open source resource allocation management system designed to provide a
 central portal for administration, reporting, and measuring scientific impact
 of HPC resources. ColdFront was created to help HPC centers manage access to a

docs/pages/upgrading.md

@@ -6,8 +6,10 @@ introduce breaking changes so please refer to this document before upgrading.
 ## v1.1.3
 
 This release changes some css/javascript assets to be hosted statically instead
-of using a CDN. This will require running collectstatic. Before upgrading, be
-sure to backup your database and any custom changes. 
+of using a CDN. We also made some minor modifications to the default template.
+This will require running collectstatic. Before upgrading, be sure to backup
+your database and verify your custom template changes as they may need
+updating. 
 
 To upgrade via pip, following these steps:
 

docs/requirements.txt

@@ -1,13 +1,13 @@
 htmlmin==0.1.12
-Jinja2==2.11.3
+Jinja2==3.0.2
 jsmin==3.0.0
 Markdown==3.3.4
-MarkupSafe==1.1.1
-mkdocs==1.2.3
-mkdocs-material==7.0.2
+MarkupSafe==2.1.1
+mkdocs==1.3.0
+mkdocs-material==8.3.9
 mkdocs-minify-plugin==0.2.1
 mkdocs-awesome-pages-plugin==2.5.0
-Pygments==2.7.4
-pymdown-extensions==8.1.1
+Pygments==2.12.0
+pymdown-extensions==9.5
 PyYAML==5.4
-six==1.14.0
+six==1.16.0