Merge branch 'contacts-page' into dev

.env

 PROJECT=dev-biuro
 
 IMAGE_NGINX=nginx:1.15.7
+# IMAGE_NGINX=fholzer/nginx-brotli
 IMAGE_MYSQL=mariadb:10.3
 IMAGE_WORDPRESS=wordpress:php7.2-fpm
 

README.md

@@ -16,10 +16,10 @@
 - check if dev.biuro.lt, dev.biuro.lv, dev.biuro.ee works
 
 ### DB backup
-- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysqldump -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro > docker/mariadb/data-001.sql`
+- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysqldump -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro > docker/mariadb/data-002.sql`
 
 ### DB restore
-- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysql -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro < docker/mariadb/data-000.sql`
+- `C:\web\dev.biuro> docker exec -i dev-biuro-mysql mysql -udev_user -pY6V6bFkD6@GyD!wTShgFmWz! --default-character-set=utf8 dev_biuro < docker/mariadb/data-001.sql`
 
 ## Development
 - `C:\web\dev.biuro\ npm install`

certs/biuro.lv/certificate.pem

 -----BEGIN CERTIFICATE-----
-MIIGGDCCBQCgAwIBAgISA2WmFmvfJcoDdgPycjmHERg8MA0GCSqGSIb3DQEBCwUA
+MIIFdTCCBF2gAwIBAgISAx3DpW3B2YYmavHTM+Jl9wTCMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODEwMDkwMzQ0NDFaFw0x
-OTAxMDcwMzQ0NDFaMBMxETAPBgNVBAMTCGJpdXJvLmx2MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAwz8fNEvDt9ix4USHVBZY5rRkaBQWr56p+jUQNLsx
-/V3+7ESdzvueVl0krFbvAA6F1kNAAMlHmERsTk1MgfTNBodP97rRZaA7aUt0Xdxf
-m/cWer67OyEX6Ns6vjTw3kzfkTmmdxmq9Ir0z1tjE1V4b/nQGYJ169M5Fog0CpW4
-GtBYM0fxzX3v9pDUniqx37S5kkAxNF/FSq0IGakWpd9YxLVM/eWodvHb++eNgzK+
-tTWNwoiZ/IzFLRhOOu8CvS+71p1H8+ZpSjucuxQNaTa2GM4WlZ5jfZGZINXhMbIe
-bAW6GJeX1nrLGmbEWGOxRzzz5Tv97ZpytkWobMHnKzRuMQIDAQABo4IDLTCCAykw
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODEyMTQwNTM4MzdaFw0x
+OTAzMTQwNTM4MzdaMBMxETAPBgNVBAMTCGJpdXJvLmx2MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmI15ZcOTi2Nm3Lz1JHRT9j74ype4QYYnG4awz0Yg
+OU7YvLZBEiNXAYHeSrIJ6JVhqgzuFChPfJ3mqE4udCMP5rqCT7qA74GYG4sisiev
+i6stOB7SShcsd7aTKXGuj2RsqQnhQEDpoHV+7EJelqK3wUDWz/OILGtRoquLJet3
+WXOTBsMPHkG3j/aDNQSt05CVtK4qY7oFhDWQsEHdespQ6rS6mdBwFDlyxDOpDLpN
+DzLbFdURMplPXsaB0cJSX29j/RW+OVEdgS6YzrjFwaAaWS33wQSF0HXuFc1XpgZO
+n1yVd17FFSgQ7dcpTyAahe2ZTSCTx0mqavVp3evGQkYVzwIDAQABo4ICijCCAoYw
 DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM
-BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQT7jKKYb9ui7yr3wc32wHgdF/rnjAfBgNV
+BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTrKY9/iRbSYpLy5mlHzROpnbO5/zAfBgNV
 HSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEwLgYI
 KwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcwLwYI
-KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMC8G
-A1UdEQQoMCaCCGJpdXJvLmx2ggxkZXYuYml1cm8ubHaCDHd3dy5iaXVyby5sdjCB
-/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC3xMBAQEwgdYwJgYIKwYB
-BQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEFBQcCAjCB
-ngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24gYnkg
-UmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0aGUg
-Q2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5cHQu
-b3JnL3JlcG9zaXRvcnkvMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcA4mlLribo
-6UAJ6IYbtjuD1D7n/nSI+6SPKJMBnd3x2/4AAAFmVyQxCQAABAMASDBGAiEAmByX
-fJ01jynuMywPwnRZ1hESIHoAIWsTrt/CwNKlGzsCIQDAghvGQAzbTU1Q332RhnKz
-0cUeMwy8wa8o5Cbm4TiN+wB2ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVF
-R/R4AAABZlckMRgAAAQDAEcwRQIhAKX5h+RwQMqqEbG2o0A2gLPmJeWxG7XHwtPY
-QOwLZ5EhAiAurLB5TZlS7dMbOvICDc8rVtBYSoSipyGPkHSYG9/WODANBgkqhkiG
-9w0BAQsFAAOCAQEABWWYPmE6boetZOR7GfpcKRLwlynr5wYUTU3cFlEftZ8LyHBE
-mxVlqVOooCZGFgYXpVufOuUikH+UgFe0ihn79BDm5Miflc+oxev5+8bSbRAmCCpO
-s+6q3PoulEXNGAJ0NUIzebFGVdSTIJ3uCbEzeX3j/7ECglBbKxexLoEgSqraptMJ
-MoTRjWFC+o3L09PzPO/y0nub+x7IR+1w//c8FdheYSV7kyA0p28228vr2POdCGiR
-aARruPALo2IR0XnHqkiYKp0bikgIeiJjmnDaAnZyMIHkPXHLzZncHkcdzmT1SPCw
-bHd+bNDqHLPWXCLWspr2o+2i3+JX55le+TMT2Q==
+KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMEEG
+A1UdEQQ6MDiCCGJpdXJvLmx2ggxkZXYuYml1cm8ubHaCEHN0YWdpbmcuYml1cm8u
+bHaCDHd3dy5iaXVyby5sdjBMBgNVHSAERTBDMAgGBmeBDAECATA3BgsrBgEEAYLf
+EwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCC
+AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLc
+pMMM9OVFR/R4AAABZ6twN/sAAAQDAEYwRAIgVzEdMqfXOhCn3vWES4VYObl3a0TA
+K+B/mbx+czCLf/cCIDWkkCOP/LhYZs0alYH4b+x2ojB2pI3OLuqT3/9oMXA1AHYA
+dH7agzGtMxCRIZzOJU9CcMK//V5CIAjGNzV55hB7zFYAAAFnq3A6WQAABAMARzBF
+AiB+dUrdUY159aooUmcvvYcvTghM68oV09gMEd5QdCJ+GwIhAOngDvKIFhOdcYVU
+QTOPy2F0ZK27cnRvNkjgM1o9ysRNMA0GCSqGSIb3DQEBCwUAA4IBAQCJkVuGlpBX
+4vFHJtWk7W3Qm7lU6zVYvBgFtjqoLUAhzHuw/orAHOhiCESiyrQfQWRv8wHyz5GR
+eboOyAbDYVxed8TN2AcmaMxtrQgfaDP4ZUqvqh7cmfrotYX61Zi1PuBqyaI6zwio
+Y5xJgN/w6CvVljtQms6RLTB4axGOK1Ef+V2onoTxFgHvP0TBaeYpPbh2R8zvATXL
+oy5VzRxYZylLmQLZgXNQy2hjvkwmsSnahKhZn1iUAKDCwYbSstyBn2f15LrJdvOc
+e+M/nbV7M/fEAOf+Y8oy1Bokt0Kww8wUGtFs8jmd4KZTsPsQfgY3tDpy+vLRSnHk
+5Ql1KxbEETDZ
 -----END CERTIFICATE-----

certs/biuro.lv/privkey.pem

 -----BEGIN PRIVATE KEY-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDDPx80S8O32LHh
-RIdUFljmtGRoFBavnqn6NRA0uzH9Xf7sRJ3O+55WXSSsVu8ADoXWQ0AAyUeYRGxO
-TUyB9M0Gh0/3utFloDtpS3Rd3F+b9xZ6vrs7IRfo2zq+NPDeTN+ROaZ3Gar0ivTP
-W2MTVXhv+dAZgnXr0zkWiDQKlbga0FgzR/HNfe/2kNSeKrHftLmSQDE0X8VKrQgZ
-qRal31jEtUz95ah28dv7542DMr61NY3CiJn8jMUtGE467wK9L7vWnUfz5mlKO5y7
-FA1pNrYYzhaVnmN9kZkg1eExsh5sBboYl5fWessaZsRYY7FHPPPlO/3tmnK2Rahs
-wecrNG4xAgMBAAECgf8/mYPBuNEAMcm6ydkcExKgmjoOU6chjLI4/pnv+UOM7pDU
-MstfO89Z7e+wYxDq67xDZuGFpaLVGQdlXHBq7q1M45Zy7BVU4Kvphzj6KHEhxLFx
-7SfavmYa+Y9cowYvIvzxFTp0l58qfQVNDw7D+cXNZuaSiQEu04+wjD7ytPkDqZb8
-8dy7H0IzKf67a7fvb/cLQ7KIOAfTSnDQEoaebNRZ0OxcgLBK1X5Cr2gb3T5tPBYy
-rxrbqHxfcen33Ik9WuZ095WZ1hRsaC7EYX9ddrnUZ+YGRbKwI+qgFs8IdsolasFQ
-qYQqVQRW/CFl0+93kgLQZ2R5ENivPUPE1Z8hgvUCgYEA369OoDGLIhJQup5o9AqJ
-M74yPY9KIGg/agPB83irlsaFIhQdiJ+mmTXfP4xS6RVYSDBC1DI9Bl6pGV6/cqFS
-Q2/JKqKdEnB/sxpsOWG9ldHn8dIYDEMHCIFQg+GiwRzWFP63cNSGkSDjewNenh0t
-jVf9HAbmON6cIsqTUDexUyUCgYEA33QQVywYRWVqYn1rIbXfnFfoDyNsRdQFqWQ2
-Qe/InKwZQXWsfbMKrUBibW3798B6E+wT29X9+oOwIKDg323Xe3eyCGT0kkQj5zcp
-GTQVO2R0qXWeuTMI/Qq2FNzNb9Zi+ySAYOk/2uQ/vlVCbuoJbrchFZ42g1FDUEXZ
-Gmv4Bx0CgYBY1FubDlG8hB1/Hu17DLwTylJVVBQR7pRQW5GoSKGLzOaN9AMOgKg+
-a8BukiFS4uEeOdwwPIszfmAU7SWGNj5e/YOb5NwPuJFd5P5Zg1EwsB02UUKvi+a9
-H+2DkhV6LyNtTwI2Uo/mDnOIJHxsuhWe7fRcLvk6WF0VC/GYh6Vp6QKBgQCoAAId
-GCjzW+ldPUBjqvMA/9KYNyC7a0oKbi6g6l/g8z9VyNwz8X2wfnzCG3PadJsUCWVw
-3fXC+GleTrZjJZlh2b8/sm9y3MpFl2JN8auY6NERaz43rZgvb3MwQkYutHfcrDfd
-JOD+eKc4Oa/l5g3LcOHt9/KyTlGWs70jsVNcPQKBgCyeV+b27zcITG6r8CosigIU
-YkPhIsyYxXbVmnp2Tn/kamuoQzgX6n9/FqtncaWKvFJD2ZpQsKext97dXVZkgRua
-wpmTiNjCGsglHbriPB9TQ2RmLQwkbpVoN6JegLgpoSUTJ2XlKiDOjb6+BPtOK0HU
-h5kyqRSow2Pu+wKJxIm/
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCYjXllw5OLY2bc
+vPUkdFP2PvjKl7hBhicbhrDPRiA5Tti8tkESI1cBgd5KsgnolWGqDO4UKE98neao
+Ti50Iw/muoJPuoDvgZgbiyKyJ6+Lqy04HtJKFyx3tpMpca6PZGypCeFAQOmgdX7s
+Ql6WorfBQNbP84gsa1Giq4sl63dZc5MGww8eQbeP9oM1BK3TkJW0ripjugWENZCw
+Qd16ylDqtLqZ0HAUOXLEM6kMuk0PMtsV1REymU9exoHRwlJfb2P9Fb45UR2BLpjO
+uMXBoBpZLffBBIXQde4VzVemBk6fXJV3XsUVKBDt1ylPIBqF7ZlNIJPHSapq9Wnd
+68ZCRhXPAgMBAAECggEAAdYQxCxOo4AJS2viKX5Vn7enUqJGifyy43kYug32h6oO
+ysqzeCPrwVgOVGjV3LJQ8B/it7m6fIisBOeYAIwxffijETxF9Aa5Is+8awI2RzXt
+apOtuqLnxUhxzK8SclBmTGyS2lf4V+xCIFbg1kBUJOPXvL4KLBAIoK7JkyXFPygz
+tarVV4S7D5T07prFa+qY+dkfw9fPdB0WW/26qWCYSOuAT8e3+YpvBMq2yFRDvEgT
+M314oOzQiKDXu0ykkjkmtWAbO4guaS26Q5svMAENwsKIkZJ6iWo4zcyGaGYyXkhr
+LvPsX9KbhbtjrBo9QTS3WmqVkNZAcm+ZF3bK+0Yq9QKBgQDOTeXsRI5Ya7pEbPrm
+DG0Bx8g9w0Arflkzod/INND0s2iPTSeDQVwyMSgrZ4D5YxTgiHgvq9rbFpdj4H5A
+6sL55QiemX+Y3ajRyy6HnW9awVFa5t7LuAixBDBe9BwFDYlxwz6Z03yEZgOtHuO/
+0WdnIDseRmy8Xz8YQenaUW12OwKBgQC9TOO7X5mLt5DxakqR2FU2NTxf9C4j0vNO
+Q71VqHCShBBvQFFhra5keE3HaGnStff100wTNoym+zPQY0VM1YcPwgCzyAi07lX7
+XwUk7dyOG9mV1yg71W9+SuTlWx+jy6kD/tdQY7KTnTg6hyFbQ4sLdY6nLpmNRmIl
+/nxXVqVhfQKBgQC9PuwJPiItrjSiDC5j1UYxeeiP74nv2+lL2dQEPZ7ouaLSwX3b
+g5tlV353wmynWGKQTd+iK02J6EFbl1V5i2DsB1NO2ZQY0EzKlk3KjXrWj7tnXZ1G
+1zzx1NviXp9Na0uHlgjY5w20DjiVGF7nWNo32XMhpIyeh+jDAcPZRxTYfQKBgE5r
+JMgBUW1UrQGlQ6DpWltrcEhbsiV7BPm+DBgJACFh/iDoJw5s0ZqjT600runwIfk+
+//vRlDC0TYGdLh8nMZ0wg/P2AM1bEllgwpPKyZxBI0D0caFfyKEry2jL9+51tt2F
+25JcyqRl894jDoltEJO9rkvJfSjOKGiO5NmVdktNAoGBAI7xH+xY9gv4FPwUN9+r
+EqrvO0RfoQVxJqL56caKBm7QbRrq54zSFhjre4CVoquBghlwQ7Jck75o3F+oEsPK
++9bH6BRFvJWRaiHFxP6d3ZGwY+ZI1hnMF+00RsmSCPUwJjqXbyuIO2WiALsa1KJu
+LswlHkO3Gj4ljmxnbUC8gb2T
 -----END PRIVATE KEY-----

docker-compose.yml

@@ -15,8 +15,6 @@ services:
             - ./certs:/etc/letsencrypt
             - ./certs-data:/data/letsencrypt
 
-            - ./wp-content/themes/biuro/:/var/www/html/wp-content/themes/biuro
-
             - ./wp-content/plugins/cookies-warning:/var/www/html/wp-content/plugins/cookies-warning
             - ./wp-content/plugins/data-controller:/var/www/html/wp-content/plugins/data-controller
             - ./wp-content/plugins/jobs-importer:/var/www/html/wp-content/plugins/jobs-importer
@@ -26,6 +24,7 @@ services:
             - ./wp-content/plugins/polylang:/var/www/html/wp-content/plugins/polylang
             - ./wp-content/plugins/wordpress-seo:/var/www/html/wp-content/plugins/wordpress-seo
 
+            - ./wp-content/themes/biuro/:/var/www/html/wp-content/themes/biuro
             - ./wp-content/uploads:/var/www/html/wp-content/uploads
 
             - ./wordpress:/var/www/html

nginx/dev-biuro.conf

@@ -36,6 +36,13 @@ server {
     ssl_certificate_key       /etc/letsencrypt/biuro.lt/privkey.pem;
     ssl_trusted_certificate   /etc/letsencrypt/biuro.lt/ca-bundle.pem;
 
+
+    # ssl_protocols TLSv1.2 TLSv1.3;
+    # ssl_ciphers EECDH+CHACHA20:EECDH+AES;
+
+    # # (1)
+    # ssl_ecdh_curve X25519;
+
     # ssl_protocols           TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
     # ssl_prefer_server_ciphers on;
     # ssl_ciphers 'TLS-CHACHA20-POLY1305-SHA256:TLS-AES-256-GCM-SHA384:TLS-AES-128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
@@ -45,14 +52,72 @@ server {
 
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
-
+#
     gzip on;
+    gzip_comp_level 5;
+    gzip_min_length 1024;
+    gzip_proxied any;
     gzip_vary on;
-    gzip_min_length 10240;
-    gzip_proxied expired no-cache no-store private auth;
-    gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+    gzip_types
+        application/atom+xml
+        application/javascript
+        application/json
+        application/rss+xml
+        application/vnd.ms-fontobject
+        application/x-font-ttf
+        application/x-javascript text/xml
+        application/x-web-app-manifest+json
+        application/xhtml+xml
+        application/xml
+        application/xml+rss text/javascript
+        font/opentype
+        image/svg+xml
+        image/x-icon
+        text/css
+        text/plain
+        text/x-component;
     gzip_disable "MSIE [1-6]\.";
 
+#    brotli on;
+#    brotli_comp_level 6;
+#    brotli_types application/eot application/x-otf application/font application/x-perl application/font-sfnt application/x-ttf application/javascript
+#                font/eot application/json font/ttf application/opentype font/otf application/otf font/opentype application/pkcs7-mime image/svg+xml
+#                application/truetype text/css application/ttf text/csv application/vnd.ms-fontobject text/html application/xhtml+xml text/javascript
+#                application/xml text/js application/xml+rss text/plain application/x-font-opentype text/richtext application/x-font-truetype
+#                text/tab-separated-values application/x-font-ttf text/xml application/x-httpd-cgi text/x-script application/x-javascript
+#                text/x-component application/x-mpegurl text/x-java-source application/x-opentype
+#                ;
+#
+    # Expire rules for static content
+    # https://serversforhackers.com/c/nginx-caching
+    # https://github.com/h5bp/server-configs-nginx
+
+    # cache.appcache, your document html and data
+    location ~* \.(?:manifest|appcache|html?|xml|json)$ {
+      expires -1;
+      # access_log logs/static.log; # I don't usually include a static log
+    }
+
+    # Feed
+    location ~* \.(?:rss|atom)$ {
+      expires 1h;
+      add_header Cache-Control "public";
+    }
+
+    # Media: images, icons, video, audio, HTC
+    location ~* \.(?:webp|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
+      expires 6M;
+      access_log off;
+      add_header Cache-Control "public";
+    }
+
+    # CSS and Javascript
+    location ~* \.(?:css|js)$ {
+      expires 1y;
+      access_log off;
+      add_header Cache-Control "public";
+    }
+
     location / {
         try_files $uri $uri/ /index.php?$args;
     }

package-lock.json

@@ -5847,6 +5847,16 @@
         }
       }
     },
+    "gulp-cached": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz",
+      "integrity": "sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4=",
+      "dev": true,
+      "requires": {
+        "lodash.defaults": "^4.2.0",
+        "through2": "^2.0.1"
+      }
+    },
     "gulp-html-tag-include": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gulp-html-tag-include/-/gulp-html-tag-include-1.0.1.tgz",
@@ -7389,6 +7399,12 @@
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "dev": true
+    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",

package.json

@@ -5,8 +5,8 @@
   "scripts": {
     "pre": "shx rm -rf wp-content/themes/biuro && shx mkdir -p wp-content/themes/biuro/js && shx mkdir -p wp-content/themes/biuro/css && shx mkdir -p wp-content/themes/biuro/i && shx mkdir -p wp-content/themes/biuro/fonts",
     "dev-old": "npm run pre & gulp --require @babel/register --gulpfile tasks",
-    "dev": "gulp --require @babel/register --gulpfile tasks",
-    "build-old": "npm run pre & SET NODE_ENV=production & gulp build --require @babel/register --gulpfile tasks"
+    "dev": "SET NAME=biuro & gulp --require @babel/register --gulpfile tasks",
+    "build-old": "npm run pre & SET NAME=biuro & SET NODE_ENV=production & gulp build --require @babel/register --gulpfile tasks"
   },
   "author": "Simon",
   "devDependencies": {
@@ -30,6 +30,7 @@
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "gulp": "^4.0.0",
+    "gulp-cached": "^1.1.1",
     "gulp-html-tag-include": "^1.0.1",
     "gulp-htmlmin": "^5.0.1",
     "gulp-inline-source": "^4.0.0",

wp-content/!source/css/01-settings/_settings--colors.css → source/css/01-settings/_settings--colors.css

@@ -3,9 +3,8 @@
 /* critical:start */
 
 :root   {
-    --color--light-orange: #ebe6de;
-    --color--dark-orange: #8f4a3f;
     --color--gray: #4d4d4d;
+    --color--green: #006957;
 }
 
 /* critical:end */

wp-content/!source/css/05-layout/__layout.css → source/css/05-layout/__layout.css

@@ -5,9 +5,9 @@ Layout styles (e.g. container, header, main, footer, grid systems etc)
 l-: layout classes
 ========================================================================== */
 
-@import '_layout--container.css';
-@import '_layout--header.css';
-@import '_layout--main.css';
-@import '_layout--nav.css';
-@import '_layout--aside.css';
+/*@import '_layout--container.css';*/
+/*@import '_layout--header.css';*/
+/*@import '_layout--main.css';*/
+/*@import '_layout--nav.css';*/
+/*@import '_layout--aside.css';*/
 @import '_layout--footer.css';

wp-content/!source/css/05-layout/_layout--footer.css → source/css/05-layout/_layout--footer.css

@@ -2,6 +2,8 @@
 
 /* critical:start */
 
-.l-footer   { }
+.l-footer   { clear: both; }
 
 /* critical:end */
+
+.l-footer   { min-height: 160px; }

wp-content/!source/css/06-objects/_object--nav.css → source/css/06-objects/_object--nav.css

@@ -2,7 +2,7 @@
 
 /* critical:start */
 
-/*.o-nav          { margin: 0; padding: 0; list-style: none; }*/
+.o-nav          { margin: 0; padding: 0; list-style: none; }
 
 /*.o-nav--item    { display: block; }*/
 

wp-content/!source/css/07-components/__components.css → source/css/07-components/__components.css

@@ -6,8 +6,10 @@ rich design UI styling. Class names here are more specific. This layer usually h
 c-: Signify that something is a Component. This is a concrete, implementation-specific piece of UI. All of the changes you make to its styles should be detectable in the context you’re currently looking at. Modifying these styles should be safe and have no side effects.
 ========================================================================== */
 
+@import '_component--agencies.css';
 @import '_component--cookies-warning.css';
 @import '_component--data-controller.css';
+@import '_component--job.css';
 
 /*
     @import '_component--nav.css';

source/css/07-components/_component--agencies.css

+/* ------------- Component: agencies ------------- */
+
+/* critical:start */
+
+/* critical:end */
+
+.c-agencies--list { display: flex; flex-wrap: wrap; margin-bottom: 16px; }
+
+.c-agencies--list-item { margin-right: 10px; padding: 0 12px; font-weight: 400; line-height: 1.5; cursor: pointer; }
+
+.is-agencies--list-item-active   { background: #ccc; font-weight: 700; }

source/css/07-components/_component--job.css

+/* ------------- Component: job ------------- */
+
+/* critical:start */
+
+/* critical:end */
+
+/*.c-job--title   {  } */
+
+
+#custom     {
+
+    .biuro-title    { margin: 0 0 20px; padding: 10px; font-size: calc(1.125rem + ((1vw - 3.2px) * 0.8929)); border: 2px solid var(--color--green); border-radius: 12px;
+        @media (--min--small) {
+            border-width: 3px; margin: 0 0 30px; padding: 20px; font-size: 22px;
+        }
+
+        h1 { margin: 0; padding: 0; line-height: 1.2; color: var(--color--green); font-weight: 700; overflow: hidden; text-align: center; text-transform: uppercase }
+
+    }
+
+}
+/*
+#custom .biuro-title{
+    padding: 20px 0;
+    font-size: 22px;
+}
+#custom .biuro-title h1 {
+    color:#006957;
+    font-weight:700;
+    overflow:hidden;
+
+    text-align:center;
+    text-transform:uppercase
+
+}*/
+/*
+@media (min-width:768px){
+
+    #custom .biuro-title{
+        border: 4px solid #006957;
+        border-radius: 12px;
+        padding: 20px;
+    }
+}
+
+
+
+@media (min-width:768px){
+    #custom .biuro-title{
+        margin: 0 0 30px;
+        padding:20px;
+    }
+    #custom .biuro-title h1 { margin: 0; padding: 0; line-height: 1.2; }
+}
+ */

wp-content/!source/css/main.css → source/css/main.css

@@ -61,6 +61,14 @@ qa-: Signify that a QA or Test Engineering team is running an automated UI test
 
 /* critical:end */
 
+@import '01-settings/__settings.css';
+
+@import '02-tools/__tools.css';
+
+@import '05-layout/__layout.css';
+
+@import '06-objects/__objects.css';
+
 @import '07-components/__components.css';
 
  @import '10-trumps/__utils.css';
@@ -84,12 +92,11 @@ qa-: Signify that a QA or Test Engineering team is running an automated UI test
         max-width:956px
     }
 
-    #custom .biuro-title{
+/*    #custom .biuro-title{
         margin: 0 0 30px;
         padding:20px;
     }
-    #custom .biuro-title h1 { margin: 0; padding: 0; line-height: 1.2; }
-
+    #custom .biuro-title h1 { margin: 0; padding: 0; line-height: 1.2; }*/
 }
 @media (min-width:980px){
     #main{
@@ -113,11 +120,11 @@ qa-: Signify that a QA or Test Engineering team is running an automated UI test
     }
 }
 
-.l-footer{
+/*.l-footer{
     clear:both;
-    /*border-top:1px solid #ababab;*/
-    /*padding:10px 0 20px 17px*/
-}
+    border-top:1px solid #ababab;
+    padding:10px 0 20px 17px
+}*/
 
 /* critical:end */
 
@@ -614,7 +621,8 @@ button,input,select,textarea{
     margin:0 22px 0 0;
     border:1px solid #E1E1E1;
     padding:7px;
-    cursor:pointer
+    cursor:pointer;
+    text-decoration:none
 }
 #content .search_box .filter-button:hover{
     background:#eee
@@ -932,7 +940,7 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
     padding:0 6px;
     float:left
 }
-#content ul a,#top .country li a:hover{
+#content ul:not([class]) a,#top .country li a:hover{
     text-decoration:underline
 }
 #top .country li a.act{
@@ -1022,16 +1030,22 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
 #cv-success,#cv-success p{
     color:#393
 }
-#content ul{
+#content ul:not([class]){
     padding:0 0 15px;
     display:block
 }
-#content ul li,#content ul.table li{
-    background:url(../_img/list_dot.gif) 0 9px no-repeat;
+#content ul:not([class]) li,
+#content ul.table li{
+    position:  relative;
+    /*background:url(../_img/list_dot.gif) 0 9px no-repeat;*/
     padding:0 0 5px 25px;
     display:block
 }
-#content ul a:hover,.advert_page .container a:hover{
+#content ul:not([class]) li:before,
+#content ul.table li:before { content: ''; position: absolute; top: 9px; left: 1px; width: 4px; height: 4px; border-radius: 50%; background: #4b4d4f;  }
+
+
+#content ul:not([class]) a:hover,.advert_page .container a:hover{
     text-decoration:none
 }
 #content ol{
@@ -1063,32 +1077,15 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
 #sidebar #menu>li ul li a{
     text-transform:none
 }
-#custom .biuro-title h1,#topsearch #top-search-form label,.advert_page .container h2{
+/*#custom .biuro-title h1,*/
+#topsearch #top-search-form label,.advert_page .container h2{
     text-align:center;
     text-transform:uppercase
 }
 #content p{
     padding-bottom:16px
 }
-#content ul#city-list{
-    margin-bottom:10px
-}
-#content ul#city-list li{
-    background:0 0;
-    float:left;
-    padding:0;
-    margin-right:10px;
-    line-height:1.5;
-    font-weight:400;
-    cursor:pointer
-}
-#content ul#city-list li span{
-    padding:0 12px
-}
-#content ul#city-list li.act{
-    font-weight:700;
-    background:#ccc
-}
+
 .hidden-coords{
     display:none
 }
@@ -1365,7 +1362,7 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
     display:block
 }
 .advert_page .container ol li,.advert_page .container ul li{
-    background:url(../_img/list_dot.gif) 35px 8px no-repeat;
+    /*background:url(../_img/list_dot.gif) 35px 8px no-repeat;*/
     padding:0 0 0 70px;
     display:block
 }
@@ -1409,7 +1406,7 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
     width:133px;
     margin:0 auto 20px
 }
-#custom .biuro-title{
+/*#custom .biuro-title{
     padding: 20px 0;
     font-size: 22px;
 }
@@ -1417,7 +1414,7 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
     color:#006957;
     font-weight:700;
     overflow:hidden
-}
+}*/
 #custom .biuro-ti-img{
     display:none
 }
@@ -1573,17 +1570,14 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
     #custom .biuro-header .logo{
         margin:0 20px 24px 0
     }
-    #custom .biuro-title{
+/*    #custom .biuro-title{
         border: 4px solid #006957;
         border-radius: 12px;
         padding: 20px;
-        /*margin: 0 0 30px;*/
-        /*padding:20px;*/
-    }
-    /*#custom .biuro-title h1 { margin: 0; padding: 0; line-height: 1.2; }*/
+    }*/
 }
 @media (min-width:980px){
-    #content h2,#content h3,#content ul{
+    #content h2,#content h3,#content ul:not([class]){
         text-align:justify
     }
 
@@ -1638,10 +1632,11 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
         margin:15px 50px;
         font-size:24px
     }
-    #content ul li{
+    #content ul:not([class]) li{
         padding:0 0 5px 45px;
-        background-position:20px 9px
     }
+    #content ul:not([class]) li:before { left: 21px; }
+
     #topsearch{
         float:left;
         margin:47px 0 10px 114px;