aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--static/fonts/MaterialIcons-Regular.eotbin143258 -> 0 bytes
-rw-r--r--static/fonts/MaterialIcons-Regular.ttfbin128180 -> 0 bytes
-rw-r--r--static/fonts/MaterialIcons-Regular.woffbin57620 -> 0 bytes
-rw-r--r--static/fonts/MaterialIcons-Regular.woff2bin44300 -> 0 bytes
-rw-r--r--static/material_icons.css36
-rw-r--r--templates/registration/base_admin.html4
-rw-r--r--templates/registration/base_client.html4
-rw-r--r--templates/registration/base_simple.html2
-rw-r--r--version.txt2
9 files changed, 6 insertions, 42 deletions
diff --git a/static/fonts/MaterialIcons-Regular.eot b/static/fonts/MaterialIcons-Regular.eot
deleted file mode 100644
index 70508eb..0000000
--- a/static/fonts/MaterialIcons-Regular.eot
+++ /dev/null
Binary files differ
diff --git a/static/fonts/MaterialIcons-Regular.ttf b/static/fonts/MaterialIcons-Regular.ttf
deleted file mode 100644
index 7015564..0000000
--- a/static/fonts/MaterialIcons-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/static/fonts/MaterialIcons-Regular.woff b/static/fonts/MaterialIcons-Regular.woff
deleted file mode 100644
index b648a3e..0000000
--- a/static/fonts/MaterialIcons-Regular.woff
+++ /dev/null
Binary files differ
diff --git a/static/fonts/MaterialIcons-Regular.woff2 b/static/fonts/MaterialIcons-Regular.woff2
deleted file mode 100644
index 9fa2112..0000000
--- a/static/fonts/MaterialIcons-Regular.woff2
+++ /dev/null
Binary files differ
diff --git a/static/material_icons.css b/static/material_icons.css
deleted file mode 100644
index 86d60d7..0000000
--- a/static/material_icons.css
+++ /dev/null
@@ -1,36 +0,0 @@
-@font-face {
- font-family: 'Material Icons';
- font-style: normal;
- font-weight: 400;
- src: url(/static/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
- src: local('Material Icons'),
- local('MaterialIcons-Regular'),
- url(/static/fonts/MaterialIcons-Regular.woff2) format('woff2'),
- url(/static/fonts/MaterialIcons-Regular.woff) format('woff'),
- url(/static/fonts/MaterialIcons-Regular.ttf) format('truetype');
-}
-
-.material-icons {
- font-family: 'Material Icons';
- font-weight: normal;
- font-style: normal;
- font-size: 24px; /* Preferred icon size */
- display: inline-block;
- line-height: 1;
- text-transform: none;
- letter-spacing: normal;
- word-wrap: normal;
- white-space: nowrap;
- direction: ltr;
-
- /* Support for all WebKit browsers. */
- -webkit-font-smoothing: antialiased;
- /* Support for Safari and Chrome. */
- text-rendering: optimizeLegibility;
-
- /* Support for Firefox. */
- -moz-osx-font-smoothing: grayscale;
-
- /* Support for IE. */
- font-feature-settings: 'liga';
-} \ No newline at end of file
diff --git a/templates/registration/base_admin.html b/templates/registration/base_admin.html
index 58413a8..0fdaffb 100644
--- a/templates/registration/base_admin.html
+++ b/templates/registration/base_admin.html
@@ -6,7 +6,7 @@
<head>
{% load static %}
{% load app_filter %}
- <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
<style>
input[type=text]:focus + label, .materialize-textarea:focus:not([readonly]) + label {
@@ -96,7 +96,7 @@
{% endblock %}
<ul class="right">
{% if user.is_staff or perms.client.staff %}
- <li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">security</i></a></li>
+ <li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">admin_panel_settings</i></a></li>
{% elif "capi" in user|user_groups%}
<li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">supervisor_account</i></a></li>
{% else %}
diff --git a/templates/registration/base_client.html b/templates/registration/base_client.html
index cb282b5..ff0b9d8 100644
--- a/templates/registration/base_client.html
+++ b/templates/registration/base_client.html
@@ -6,7 +6,7 @@
<head>
{% load static %}
{% load app_filter %}
- <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
<style>
input[type=text]:focus + label, .materialize-textarea:focus:not([readonly]) + label {
@@ -117,7 +117,7 @@
{% endblock %}
<ul class="right">
{% if user.is_staff or perms.client.staff %}
- <li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">security</i></a></li>
+ <li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">admin_panel_settings</i></a></li>
{% elif "capi" in user|user_groups%}
<li class="userswitcher" data-target='userswitcher'><a href="#">{{ user.username }}<i class="right material-icons">supervisor_account</i></a></li>
{% else %}
diff --git a/templates/registration/base_simple.html b/templates/registration/base_simple.html
index 30f7e32..11b71ac 100644
--- a/templates/registration/base_simple.html
+++ b/templates/registration/base_simple.html
@@ -5,7 +5,7 @@
<html>
<head>
{% load static %}
- <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
<style>
{% block style %}
diff --git a/version.txt b/version.txt
index 99b2087..4b81c6f 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
version=0.5
-rev=29
+rev=30