Merge branch 'main' of github.com:aksharahegde/django-jet-3-calm

Author: Akshara Hegde

jet/dashboard/dashboard.py

@@ -201,20 +201,10 @@ def init_with_context(self, context):
         self.available_children.append(modules.LinkList)
         self.available_children.append(modules.Feed)
 
-        site_name = get_admin_site_name(context)
-        # append a link list module for "quick links"
-        self.children.append(modules.LinkList(
-            _('Quick links'),
-            layout='inline',
-            draggable=False,
-            deletable=False,
-            collapsible=False,
-            children=[
-                [_('Return to site'), '/'],
-                [_('Change password'),
-                 reverse('%s:password_change' % site_name)],
-                [_('Log out'), reverse('%s:logout' % site_name)],
-            ],
+        # append an app list module for "Administration"
+        self.children.append(modules.AppList(
+            _('Administration'),
+            models=('auth.*',),
             column=0,
             order=0
         ))
@@ -223,33 +213,43 @@ def init_with_context(self, context):
         self.children.append(modules.AppList(
             _('Applications'),
             exclude=('auth.*',),
-            column=1,
-            order=0
-        ))
-
-        # append an app list module for "Administration"
-        self.children.append(modules.AppList(
-            _('Administration'),
-            models=('auth.*',),
-            column=2,
-            order=0
+            column=0,
+            order=1
         ))
 
+        # site_name = get_admin_site_name(context)
+        # # append a link list module for "quick links"
+        # self.children.append(modules.LinkList(
+        #     _('Quick links'),
+        #     layout='inline',
+        #     draggable=False,
+        #     deletable=False,
+        #     collapsible=False,
+        #     children=[
+        #         [_('Return to site'), '/'],
+        #         [_('Change password'),
+        #          reverse('%s:password_change' % site_name)],
+        #         [_('Log out'), reverse('%s:logout' % site_name)],
+        #     ],
+        #     column=0,
+        #     order=0
+        # ))
+        
         # append a recent actions module
         self.children.append(modules.RecentActions(
             _('Recent Actions'),
             10,
-            column=0,
-            order=1
+            column=1,
+            order=0
         ))
 
         # append a feed module
         self.children.append(modules.Feed(
             _('Latest Django News'),
             feed_url='http://www.djangoproject.com/rss/weblog/',
             limit=5,
-            column=1,
-            order=1
+            column=2,
+            order=0
         ))
 
         # append another link list module for "support".

jet/static/jet/css/_dashboard.scss

@@ -109,7 +109,7 @@ ul.actionlist li {
   &-tools {
     position: absolute;
     top: ($top-height + 10px * 2) / 2 - 30px / 2;
-    right: 20px + 175px + 20px;
+    right: 20px + 220px + 20px;
 
     @include for-mobile {
       display: none;

jet/static/jet/css/_helpers.scss

@@ -108,6 +108,7 @@
 /// Test if `$value` is an angle
 /// @param {*} $value - Value to test
 /// @return {Bool}
+/// 
 @function is-direction($value) {
   $is-direction: index((to top, to top right, to right top, to right, to bottom right, to right bottom, to bottom, to bottom left, to left bottom, to left, to left top, to top left), $value);
   $is-angle: type-of($value) == 'number' and index('deg' 'grad' 'turn' 'rad', unit($value));

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

@@ -12,7 +12,7 @@
 [class^="icon-"], [class*=" icon-"] {
   /* use !important to prevent issues with browser extensions that change fonts */
   font-family: 'jet-icons' !important;
-  speak: none;
+  speak-as: none;
   font-style: normal;
   font-weight: normal;
   font-variant: normal;

jet/static/jet/css/jquery-ui/_jquery-ui.theme.scss

@@ -79,26 +79,26 @@
   }
 }
 
-.ui-icon {
-  @include font-icon;
-  font-size: 16px;
-  font-weight: bold;
-  background: none !important;
-  text-indent: 0;
-  overflow: visible;
-}
-
-.ui-icon-circle-triangle-e:before {
-  content: $icon-arrow-right;
-}
-
-.ui-icon-circle-triangle-w:before {
-  content: $icon-arrow-left;
-}
-
-.ui-icon-closethick:before {
-  content: $icon-cross;
-}
+// .ui-icon {
+//   @include font-icon;
+//   font-size: 16px;
+//   font-weight: bold;
+//   background: none !important;
+//   text-indent: 0;
+//   overflow: visible;
+// }
+
+// .ui-icon-circle-triangle-e:before {
+//   content: $icon-arrow-right;
+// }
+
+// .ui-icon-circle-triangle-w:before {
+//   content: $icon-arrow-left;
+// }
+
+// .ui-icon-closethick:before {
+//   content: $icon-cross;
+// }
 
 .ui-widget-overlay {
   background: $jquery-ui-overlay-color;