]> _ Git - c6-wordpress.git/commitdiff
Done #2808 @1.5
authorStephen Cameron <stephen@cubedesigners.com>
Wed, 29 May 2019 10:19:55 +0000 (12:19 +0200)
committerStephen Cameron <stephen@cubedesigners.com>
Wed, 29 May 2019 10:19:55 +0000 (12:19 +0200)
.htaccess
wp-content/themes/c6/app/setup.php
wp-content/themes/c6/resources/views/partials/footer.blade.php
wp-content/themes/c6/resources/views/partials/head.blade.php

index e303c53a3862cbd922d96bc4b8d19b685bbaf841..721e5dcabe03c618f327daed2798c6965d065126 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,113 @@
+# BEGIN Performance Optimisations
+
+# Use UTF-8 encoding for anything served text/plain or text/html
+AddDefaultCharset UTF-8
+# Force UTF-8 for a number of file formats
+<IfModule mod_mime.c>
+AddCharset UTF-8 .atom .css .js .json .rss .vtt .xml
+</IfModule>
+# FileETag None is not enough for every server.
+<IfModule mod_headers.c>
+Header unset ETag
+</IfModule>
+# Since we’re sending far-future expires, we don’t need ETags for static content.
+# developer.yahoo.com/performance/rules.html#etags
+FileETag None
+<IfModule mod_alias.c>
+<FilesMatch "\.(html|htm|rtf|rtx|txt|xsd|xsl|xml)$">
+<IfModule mod_headers.c>
+Header set X-Powered-By "WP Rocket/3.3"
+Header unset Pragma
+Header append Cache-Control "public"
+Header unset Last-Modified
+</IfModule>
+</FilesMatch>
+<FilesMatch "\.(css|htc|js|asf|asx|wax|wmv|wmx|avi|bmp|class|divx|doc|docx|eot|exe|gif|gz|gzip|ico|jpg|jpeg|jpe|json|mdb|mid|midi|mov|qt|mp3|m4a|mp4|m4v|mpeg|mpg|mpe|mpp|otf|odb|odc|odf|odg|odp|ods|odt|ogg|pdf|png|pot|pps|ppt|pptx|ra|ram|svg|svgz|swf|tar|tif|tiff|ttf|ttc|wav|wma|wri|xla|xls|xlsx|xlt|xlw|zip)$">
+<IfModule mod_headers.c>
+Header unset Pragma
+Header append Cache-Control "public"
+</IfModule>
+</FilesMatch>
+</IfModule>
+# Expires headers (for better cache control)
+<IfModule mod_expires.c>
+       ExpiresActive on
+       # Perhaps better to whitelist expires rules? Perhaps.
+       ExpiresDefault                              "access plus 1 month"
+       # cache.appcache needs re-requests in FF 3.6 (thanks Remy ~Introducing HTML5)
+       ExpiresByType text/cache-manifest           "access plus 0 seconds"
+       # Your document html
+       ExpiresByType text/html                     "access plus 0 seconds"
+       # Data
+       ExpiresByType text/xml                      "access plus 0 seconds"
+       ExpiresByType application/xml               "access plus 0 seconds"
+       ExpiresByType application/json              "access plus 0 seconds"
+       # Feed
+       ExpiresByType application/rss+xml           "access plus 1 hour"
+       ExpiresByType application/atom+xml          "access plus 1 hour"
+       # Favicon (cannot be renamed)
+       ExpiresByType image/x-icon                  "access plus 1 week"
+       # Media: images, video, audio
+       ExpiresByType image/gif                     "access plus 4 months"
+       ExpiresByType image/png                     "access plus 4 months"
+       ExpiresByType image/jpeg                    "access plus 4 months"
+       ExpiresByType image/webp                    "access plus 4 months"
+       ExpiresByType video/ogg                     "access plus 1 month"
+       ExpiresByType audio/ogg                     "access plus 1 month"
+       ExpiresByType video/mp4                     "access plus 1 month"
+       ExpiresByType video/webm                    "access plus 1 month"
+       # HTC files  (css3pie)
+       ExpiresByType text/x-component              "access plus 1 month"
+       # Webfonts
+       ExpiresByType application/x-font-ttf        "access plus 1 month"
+       ExpiresByType font/opentype                 "access plus 1 month"
+       ExpiresByType application/x-font-woff       "access plus 1 month"
+       ExpiresByType application/x-font-woff2      "access plus 1 month"
+       ExpiresByType image/svg+xml                 "access plus 1 month"
+       ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
+       # CSS and JavaScript
+       ExpiresByType text/css                      "access plus 1 year"
+       ExpiresByType application/javascript        "access plus 1 year"
+</IfModule>
+# Gzip compression
+<IfModule mod_deflate.c>
+# Active compression
+SetOutputFilter DEFLATE
+# Force deflate for mangled headers
+<IfModule mod_setenvif.c>
+<IfModule mod_headers.c>
+SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
+RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
+# Don’t compress images and other uncompressible content
+SetEnvIfNoCase Request_URI \
+\.(?:gif|jpe?g|png|rar|zip|exe|flv|mov|wma|mp3|avi|swf|mp?g|mp4|webm|webp|pdf)$ no-gzip dont-vary
+</IfModule>
+</IfModule>
+# Compress all output labeled with one of the following MIME-types
+<IfModule mod_filter.c>
+AddOutputFilterByType DEFLATE application/atom+xml \
+                                         application/javascript \
+                                         application/json \
+                                         application/rss+xml \
+                                         application/vnd.ms-fontobject \
+                                         application/x-font-ttf \
+                                         application/xhtml+xml \
+                                         application/xml \
+                                         font/opentype \
+                                         image/svg+xml \
+                                         image/x-icon \
+                                         text/css \
+                                         text/html \
+                                         text/plain \
+                                         text/x-component \
+                                         text/xml
+</IfModule>
+<IfModule mod_headers.c>
+Header append Vary: Accept-Encoding
+</IfModule>
+</IfModule>
+
+# END Performance Optimisations
 
 # BEGIN WordPress
 <IfModule mod_rewrite.c>
@@ -9,4 +119,4 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule . /index.php [L]
 </IfModule>
 
-# END WordPress
\ No newline at end of file
+# END WordPress
index a6e2e9845fb71ed9c697b3708c3cf65c1ce7ccbf..4c6978033d0a5f06100d8f50752e2b9798aede57 100644 (file)
@@ -41,6 +41,27 @@ add_action('wp_print_styles', function() {
     }
 });
 
+/**
+ * Elementor optimisations
+ * Ref: https://docs.elementor.com/article/286-speed-up-a-slow-site
+ */
+add_filter( 'elementor/frontend/print_google_fonts', '__return_false' );
+add_action( 'wp_enqueue_scripts', function() { wp_dequeue_style( 'font-awesome' ); }, 50 );
+add_action( 'elementor/frontend/after_enqueue_styles', function () { wp_dequeue_style( 'font-awesome' ); } );
+add_action( 'elementor/frontend/after_enqueue_styles', function() {
+    if ( is_admin() || current_user_can( 'manage_options' ) ) {
+        return false; // Don't remove it in the backend
+    }
+    wp_dequeue_style( 'elementor-icons' );
+} );
+
+/**
+ * Plugin Optimisations
+ */
+add_action( 'wp_enqueue_scripts', function() {
+    wp_dequeue_style('cookie-notice-front'); // We already have all the styles we need in the theme CSS so no need for this
+}, 100 );
+
 /**
  * Theme assets
  */
index bbf2f8c1d2e9ae5be90b28c8b503224dbc33d39f..ee8555a05e92c8e19f2565b810542bd7dc724480 100644 (file)
@@ -32,3 +32,7 @@
     </div>
   </div>
 </footer>
+
+
+{{-- Instant Page - https://instant.page --}}
+<script src="//instant.page/1.2.2" type="module" integrity="sha384-2xV8M5griQmzyiY3CDqh1dn4z3llDVqZDqzjzcY+jCBCk/a5fXJmuZ/40JJAPeoU"></script>
index d201224f9d2e859305e7287837f9f38449c9ef3a..7ffd244f2cf4734b9ca99326b51f87e979dfe03a 100644 (file)
@@ -2,7 +2,7 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link href="https://fonts.googleapis.com/css?family=Muli:300,400,700,800" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Muli:300,400,700,800&display=swap" rel="stylesheet">
 
   {{-- Google Analytics --}}
   <script>