Feature/django 3

jet/dashboard/models.py

@@ -1,12 +1,10 @@
 from importlib import import_module
 import json
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from jet.utils import LazyDateTimeEncoder
 
 
-@python_2_unicode_compatible
 class UserDashboardModule(models.Model):
     title = models.CharField(verbose_name=_('Title'), max_length=255)
     module = models.CharField(verbose_name=_('module'), max_length=255)

jet/dashboard/templates/admin/index.html

@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static jet_dashboard_tags static %}
+{% load i18n static jet_dashboard_tags static %}
 
 {% block html %}{% get_dashboard 'index' as dashboard %}{{ block.super }}{% endblock %}
 

jet/models.py

@@ -1,10 +1,9 @@
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 
-@python_2_unicode_compatible
+
 class Bookmark(models.Model):
     url = models.URLField(verbose_name=_('URL'))
     title = models.CharField(verbose_name=_('title'), max_length=255)
@@ -20,7 +19,6 @@ def __str__(self):
         return self.title
 
 
-@python_2_unicode_compatible
 class PinnedApplication(models.Model):
     app_label = models.CharField(verbose_name=_('application name'), max_length=255)
     user = models.PositiveIntegerField(verbose_name=_('user'))

jet/static/jet/css/_breadcrumbs.scss

@@ -4,8 +4,7 @@
 
 div.breadcrumbs {
   font-size: 12px;
-  font-weight: bold;
-  text-transform: uppercase;
+  font-family: 'Roboto-Bold';
   line-height: $top-height;
   color: $top-text-color;
   padding: 10px 175px + 20px + 20px 10px 20px;

jet/static/jet/css/_changeform.scss

@@ -854,7 +854,6 @@ form .related-widget-wrapper ul {
 
 .changeform-navigation {
   display: none;
-  float: left;
   margin-bottom: 20px;
 
   @include for-mobile {

jet/static/jet/css/_object-tools.scss

@@ -46,9 +46,9 @@
       float: none;
     }
 
-    li {
-      display: list-item;
-    }
+    // li {
+    //   display: list-item;
+    // }
   }
 
   a.addlink {

jet/static/jet/css/_tables.scss

@@ -61,7 +61,7 @@ table {
 }
 
 td, th {
-  padding: 8px;
+  padding: 10px 5px;
   font-size: 13px;
 }
 

jet/static/jet/css/_variables.scss

@@ -9,13 +9,12 @@
 
 $background-color: #ecf2f6 !default;
 $text-color: #6f7e95 !default;
-$dim-text-color: #d0dbe6 !default;
+$dim-text-color: #919a9e !default;
 $error-text-color: #c14747 !default;
 
 $link-color: #47bac1 !default;
 $hover-link-color: #639af5 !default;
 
-$font: Arial, sans-serif !default;
 $font-size: 14px !default;
 
 $transitions-duration: 0.3s !default;

jet/static/jet/css/fonts/style.css

@@ -0,0 +1,6 @@
+@font-face {
+    font-family: 'Quicksand';
+    src: url('Quicksand/Quicksand-Medium.ttf');
+    font-weight: normal;
+    font-style: normal;
+  }

jet/static/jet/css/icons/Quicksand/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2011 The Quicksand Project Authors (https://github.com/andrew-paglinawan/QuicksandFamily), with Reserved Font Name “Quicksand”.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

jet/static/jet/css/icons/style.css

@@ -9,6 +9,45 @@
   font-style: normal;
 }
 
+@font-face {
+  font-family: 'Roboto-Light';
+  src: url('Roboto/Roboto-Light.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto-Regular';
+  src: url('Roboto/Roboto-Regular.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto-Bold';
+  src: url('Roboto/Roboto-Bold.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Roboto-Thin';
+  src: url('Roboto/Roboto-Thin.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Quicksand-Medium';
+  src: url('Quicksand/Quicksand-Medium.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'SF Pro Display Regular';
+  font-style: normal;
+  font-weight: normal;
+  src: local('SF Pro Display Regular'), url('SF/SFPRODISPLAYREGULAR.woff') format('woff');
+}
+
 [class^="icon-"], [class*=" icon-"] {
   /* use !important to prevent issues with browser extensions that change fonts */
   font-family: 'jet-icons' !important;

jet/static/jet/css/themes/default/_variables.scss

@@ -1,3 +1,24 @@
 /*
  * These theme uses default variables at ../_variables.scss
- */
+ */
+ $top-height: 32px !default;
+ $font: "Quicksand-Medium",sans-serif !default;;
+ $top-text-color: #465661 !default;
+ $top-separator-color: #c0d4e8 !default;
+ $top-link-color: #8296a5 !default;
+ $top-hover-link-color: #639af5 !default;
+ $top-border-color: #c0d4e8 !default;
+ $top-icon-color: #47bac1 !default;
+
+ $top-dropdown-background-color: #6f7e95 !default;
+ $top-dropdown-text-color: #ecf2f6 !default;
+ $top-dropdown-contrast-background-color: #59677e !default;
+ $top-dropdown-contrast-text-color: #c0cad8 !default;
+ $top-dropdown-border-color: #76849a !default;
+ $top-dropdown-link-color: #ecf2f6 !default;
+ $top-dropdown-hover-link-color: #ecf2f6 !default;
+ $top-dropdown-icon-color: #ecf2f6 !default;
+ $top-dropdown-selected-color: #e5e2a5 !default;
+
+ $success-color: #209233;
+ $text-color: #45505b;