Browse Source

Merge branch 'main' into main

Jeff Triplett 4 years ago
parent
commit
1f09ee65bc
6 changed files with 2055 additions and 21 deletions
  1. 7 1
      Gemfile.lock
  2. 1 1
      Makefile
  3. 8 1
      README.md
  4. 4 1
      _includes/header.html
  5. 2030 10
      assets/development.css
  6. 5 7
      assets/style.css

+ 7 - 1
Gemfile.lock

@@ -25,10 +25,12 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     execjs (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
+    ffi (1.13.1-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
     github-pages (208)
@@ -211,6 +213,8 @@ GEM
     multipart-post (2.1.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -246,11 +250,13 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   github-pages
@@ -258,4 +264,4 @@ DEPENDENCIES
   jekyll-optional-front-matter
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

+ 1 - 1
Makefile

@@ -1,4 +1,4 @@
-TAILWIND_CSS_VERSION := 1.8.10
+TAILWIND_CSS_VERSION := 1.9.2
 
 build: toc
 

+ 8 - 1
README.md

@@ -79,6 +79,8 @@ _For a complete listing of all available packages, see [Django Packages](https:/
 - [django-admin-honeypot](https://github.com/dmpayton/django-admin-honeypot) - Configure a honeypot to see who's trying to hack your site.
 - [django-loginas](https://github.com/skorokithakis/django-loginas) - "Log in as user" for the Django admin.
 - [impostor](https://github.com/avallbona/Impostor) - Impostor is a Django application which allows staff members to login as a different user by using their own username and password.
+- [django-admin-env-notice](https://github.com/dizballanze/django-admin-env-notice) - Visually distinguish environments in Django Admin, for example: `development`, `staging`, `production`.
+- [django-admin-interface](https://github.com/fabiocaccamo/django-admin-interface) - Customize Admin by the admin itself(color, header. title,logo) and  popup windows replaced by modals.
 
 ### APIs
 <!--lint disable double-link-->
@@ -122,6 +124,7 @@ _For a complete listing of all available packages, see [Django Packages](https:/
 - [wagtail](https://github.com/wagtail/wagtail) - Popular Django content management system (CMS). See [awesome-wagtail](https://github.com/springload/awesome-wagtail) too.
 - [mezzanine](https://github.com/stephenmcd/mezzanine) - CMS framework.
 - [django-cms](https://github.com/divio/django-cms) - CMS for Django.
+- [feincms](https://github.com/feincms/feincms) - An extensible Django-based CMS.
 - [puput](https://github.com/APSL/puput) - Blog app features with Wagtail.
 <!--lint enable double-link-->
 
@@ -139,6 +142,7 @@ _For a complete listing of all available packages, see [Django Packages](https:/
 - [django-wysiwyg-redactor](https://github.com/douglasmiranda/django-wysiwyg-redactor) - A lightweight wysiwyg editor for Django.
 - [django-business-logic](https://github.com/dgk/django-business-logic) - Visual DSL framework for django.
 - [django-quill-editor](https://github.com/LeeHanYeong/django-quill-editor) - django-quill-editor makes Quill.js easy to use on Django Forms and admin sites.
+- [django-summernote](https://github.com/summernote/django-summernote) - Summernote is a simple WYSIWYG editor.
 
 ### Files/Images
 - [django-cleanup](https://github.com/un1t/django-cleanup) - Zero configuration file/image removal for local and remote files.
@@ -146,10 +150,10 @@ _For a complete listing of all available packages, see [Django Packages](https:/
 ### Forms
 - [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms/) - DRY Django forms.
 - [django-floppyforms](https://github.com/jazzband/django-floppyforms) - Full control of form rendering.
+- [django-formtools](https://github.com/jazzband/django-formtools) - For form previous and multi-step forms, previously part of Django until 1.8.
 - [django-widget-tweaks](https://github.com/jazzband/django-widget-tweaks) - Tweak form field rendering in templates.
 - [django-autocomplete-light](https://github.com/yourlabs/django-autocomplete-light) - Add autocompletion to forms.
 - [django-shapeshifter](https://github.com/kennethlove/django-shapeshifter) - A CBV to handle multiple forms in one view.
-- [django-summernote](https://github.com/summernote/django-summernote) - Summernote is a simple WYSIWYG editor.
 
 ### General
 - [django-filter](https://github.com/carltongibson/django-filter) - Powerful filters based on Django QuerySets.
@@ -183,6 +187,9 @@ _For a complete listing of all available packages, see [Django Packages](https:/
 - [django-haystack](https://github.com/django-haystack/django-haystack) - Modular search for Django.
 - [django-watson](https://github.com/etianen/django-watson) - Full-text search plugin.
 
+### Search engine optimisation
+- [django-check-seo](https://github.com/kapt-labs/django-check-seo) - Check SEO of pages.
+
 ### Security
 - [django-csp](https://github.com/mozilla/django-csp) - Adds [Content-Security-Policy](http://www.w3.org/TR/CSP/) headers to Django.
 - [django-feature-policy](https://github.com/adamchainz/django-feature-policy) - Set the draft security HTTP header `Feature-Policy` on a Django app.

+ 4 - 1
_includes/header.html

@@ -12,4 +12,7 @@
 {% endif %}
   </head>
 
-  <body class="max-w-screen-lg mx-auto py-8 px-4 sm:px-6 lg:py-8 lg:px-8 {% if jekyll.environment == 'development' %}border border-2 debug-screens{% endif %}">
+  <!-- Fork Me On GitHub Link -->
+  <a style="position: absolute;" href="https://github.com/wsvincent/awesome-django"><img loading="lazy" width="149" height="149" src="https://github.blog/wp-content/uploads/2008/12/forkme_left_green_007200.png?resize=149%2C149" class="attachment-full size-full" alt="Fork me on GitHub" data-recalc-dims="1"></a>
+
+  <body class="max-w-screen-lg mx-auto pb-8 px-4 sm:px-6 lg:pb-8 lg:px-8 {% if jekyll.environment == 'development' %}border border-2 debug-screens{% endif %}">

File diff suppressed because it is too large
+ 2030 - 10
assets/development.css


+ 5 - 7
assets/style.css

@@ -991,8 +991,7 @@ video {
   padding-right: 1rem;
 }
 
-.py-8 {
-  padding-top: 2rem;
+.pb-8 {
   padding-bottom: 2rem;
 }
 
@@ -1522,15 +1521,14 @@ video {
     margin-bottom: 0;
   }
 
-  .lg\:py-8 {
-    padding-top: 2rem;
-    padding-bottom: 2rem;
-  }
-
   .lg\:px-8 {
     padding-left: 2rem;
     padding-right: 2rem;
   }
+
+  .lg\:pb-8 {
+    padding-bottom: 2rem;
+  }
 }
 
 @media (min-width: 1280px) {