update

Gruntfile.js

@@ -154,8 +154,8 @@ module.exports = function(grunt) {
 			},
 			main: {
 				src: [
-					'src/js/jquery.btn.js',
 					'src/js/bvi.js',
+					'src/js/jquery.btn.js',
 					'src/js/main.js'
 				],
 				dest: 'test/js/main.js'

site/assets/templates/projectsoft/index.html

@@ -36,8 +36,8 @@
 		</div>{{@FILE assets/templates/projectsoft/tpl/yepnope.html}}
 		{{@FILE assets/templates/projectsoft/tpl/yepnope-load.html}}
 		<script src="https://pos.gosuslugi.ru/bin/script.min.js"></script>
-		<link type="text/css" rel="stylesheet" href="[~423~]?dc041e6e4c59ef2204c1ca5240eb6547">
-		<script src="[~424~]?dc041e6e4c59ef2204c1ca5240eb6547"></script>
+		<link type="text/css" rel="stylesheet" href="[~423~]?2f18464a893b0e091bd22f31d642b479">
+		<script src="[~424~]?2f18464a893b0e091bd22f31d642b479"></script>
 		<script>Widget("https://pos.gosuslugi.ru/form", 299239)</script>
 	</body>
 </html>

site/assets/templates/projectsoft/js/main.js

@@ -1,24 +1,3 @@
-(function($) {
-	$.fn.btnAni = function(options) {
-		var settings = $.extend({
-			'location'         : 'top',
-			'background-color' : 'blue'
-		}, options);
-		return this.each(function() {
-			if(!$(this).data('btnany')) {
-				const text = $.trim($(this).text()).replace(/\s/g, '\xa0'),
-					regex = /(.)/g,
-					subst = `<span>$1</span>`;
-				this.innerHTML = text.replace(regex, subst);
-				$(this).attr({
-					'data-before': text
-				}).data({
-					'btnany': true
-				});
-			}
-		});
-	};
-})(jQuery);
 /*!
  * Button visually impaired v2.0
  */
@@ -1000,6 +979,28 @@
     };
 })(jQuery);
 
+(function($) {
+	$.fn.btnAni = function(options) {
+		var settings = $.extend({
+			'location'         : 'top',
+			'background-color' : 'blue'
+		}, options);
+		return this.each(function() {
+			if(!$(this).data('btnany')) {
+				const text = $.trim($(this).text()).replace(/\s/g, '\xa0'),
+					regex = /(.)/g,
+					subst = `<span>$1</span>`;
+				this.innerHTML = text.replace(regex, subst);
+				$(this).attr({
+					'data-before': text
+				}).data({
+					'btnany': true
+				});
+				$(this).addClass('btn-any');
+			}
+		});
+	};
+})(jQuery);
 (function($){
 	!(function(){
 		let ref = document.referrer;
@@ -1252,6 +1253,7 @@
 					a[0].click();
 					$("body").removeClass('screen');
 					setTimeout(function(){
+						URL.revokeObjectURL(a[0].href);
 						a.remove();
 					}, 500);
 				}

site/assets/templates/projectsoft/tpl/director.html

@@ -26,7 +26,10 @@
 					 &display=`all`
 					]]
 				</dd>
-			</dl>{{@FILE assets/templates/projectsoft/tpl/vk_group.html}}
+			</dl>
+			<div class="director-sendbtn">
+				<button class="callme-btn btn" data-trigger="sendbot">ФОРМА ОБРАТНОЙ СВЯЗИ</button>
+			</div>{{@FILE assets/templates/projectsoft/tpl/vk_group.html}}
 		</div>
 		<div class="column photo">
 			<p><img src="[[thumb? &input=`[(director_photo)]` &options=`w=485,h=500,zc=C`]]" alt="[(director)]"></p>

site/assets/templates/projectsoft/tpl/head.html

@@ -26,8 +26,8 @@
 	<meta name="msapplication-TileColor" content="#ffffff">
 	<meta name="msapplication-TileImage" content="[(site_url)]ms-icon-144x144.png">
 	<meta name="theme-color" content="#ffffff">
-	<link type="text/css" rel="stylesheet" href="assets/templates/projectsoft/css/main.min.css?cfa2bc4dcff819416655b1916a0d1051">
-	<link type="text/css" rel="stylesheet" href="css.css?cfa2bc4dcff819416655b1916a0d1051">
+	<link type="text/css" rel="stylesheet" href="assets/templates/projectsoft/css/main.min.css?f1026cfa4105030b3a7078a45168c9dd">
+	<link type="text/css" rel="stylesheet" href="css.css?f1026cfa4105030b3a7078a45168c9dd">
 	<meta name="apple-mobile-web-app-title" content="[(site_name)]">
 	<meta name="application-name" content="[(site_name)]">
 	<meta name="title" content="[*pagetitle:notags:strip*]">

site/assets/templates/projectsoft/tpl/yepnope-load.html

@@ -1,9 +1,4 @@
 
-<script type="text/javascript">
-	window.HTTP_CLIENT = 0;
-	yepnope('assets/templates/projectsoft/js/appjs.min.js?5db8093f638d484008b01dc2fcae58f9', undefined, function() {
-		yepnope('assets/templates/projectsoft/js/main.min.js?5db8093f638d484008b01dc2fcae58f9', undefined, function() {
-			/*yepnope('assets/comon/js/Hyphenopoly/Hyphenopoly_Loader.js', undefined, function() {});*/
-		})
-	});
-</script>[!YandexMetrika!]
+<script type="text/javascript"></script>
+<script src="assets/templates/projectsoft/js/appjs.min.js?fed7009a0ac23948d2b88c680b507bb2"></script>
+<script src="assets/templates/projectsoft/js/main.min.js?fed7009a0ac23948d2b88c680b507bb2"></script>[!YandexMetrika!]

site/assets/templates/projectsoft/tpl/yepnope.html

@@ -1,5 +1,5 @@
 
-<script type="text/javascript">window.yepnope=function(e,t){function n(){}function r(e){return Object(e)===e}function o(e){return"string"==typeof e}function i(){return"yn_"+p++}function a(){f&&f.parentNode||(f=t.getElementsByTagName("script")[0])}function c(t,n){n.call(e)}function l(e,l){var u,p,m;o(e)?u=e:r(e)&&(u=e._url||e.src,p=e.attrs,m=e.timeout),l=l||n,p=p||{};var v,y,g=t.createElement("script");for(y in m=m||s.errorTimeout,g.src=u,h&&(g.event="onclick",g.id=g.htmlFor=p.id||i()),p)g.setAttribute(y,p[y]);g.onreadystatechange=g.onload=function(){if(!v&&(!(e=g.readyState)||"loaded"==e||"complete"==e||"uninitialized"==e)){if(v=1,h)try{g.onclick()}catch(e){}c(0,l)}var e;g.onload=g.onreadystatechange=g.onerror=null},g.onerror=function(){v=1,l(new Error("Script Error: "+u))},d(function(){v||(v=1,l(new Error("Timeout: "+u)),g.parentNode.removeChild(g))},m),a(),f.parentNode.insertBefore(g,f)}function u(i,c){var l,u,s={};r(i)?(l=i._url||i.href,s=i.attrs||{}):o(i)&&(l=i);var p=t.createElement("link");for(u in c=c||n,p.href=l,p.rel="stylesheet",p.media="only x",p.type="text/css",d(function(){p.media=s.media||"all"}),s)p.setAttribute(u,s[u]);a(),f.parentNode.appendChild(p),d(function(){c.call(e)})}function s(e,t,n){var o;r(e)&&(e=(o=e).src||o.href),e=s.urlFormatter(e,t),o?o._url=e:o={_url:e};var i=function(e){var t=e.split("?")[0];return t.substr(t.lastIndexOf(".")+1)}(e);if("js"===i)l(o,n);else{if("css"!==i)throw new Error("Unable to determine filetype.");u(o,n)}}var f,d=e.setTimeout,p=0,m={}.toString,h=!(!t.attachEvent||e.opera&&"[object Opera]"==m.call(e.opera));return s.errorTimeout=1e4,s.injectJs=l,s.injectCss=u,s.urlFormatter=function(e,t){var n=e,r=[],o=[];for(var i in t)t.hasOwnProperty(i)&&(t[i]?r.push(encodeURIComponent(i)):o.push(encodeURIComponent(i)));return(r.length||o.length)&&(n+="?"),r.length&&(n+="yep="+r.join(",")),o.length&&(n+=(r.length?"&":"")+"nope="+o.join(",")),n},s}(window,document);</script>
+<script type="text/javascript"></script>
 <div class="hidden">
 	<div id="orgAddress" data-point="[(google_map)]">[(address)]</div>
 	<div id="orgEmail">[(email)]</div>

src/js/jquery.btn.js

@@ -15,6 +15,7 @@
 				}).data({
 					'btnany': true
 				});
+				$(this).addClass('btn-any');
 			}
 		});
 	};

src/js/main.js

@@ -250,6 +250,7 @@
 					a[0].click();
 					$("body").removeClass('screen');
 					setTimeout(function(){
+						URL.revokeObjectURL(a[0].href);
 						a.remove();
 					}, 500);
 				}

src/less/inc/btn.less

@@ -19,6 +19,15 @@ input[type="reset"] {
 		border: none;
 		appearance: none;
 		outline: none !important;
+		user-select: none;
+		* {
+			&,
+			&::before,
+			&::after {
+				user-select: none;
+				pointer-events: none;
+			}
+		}
 		&:hover,
 		&:focus,
 		&:active {
@@ -27,8 +36,178 @@ input[type="reset"] {
 			text-decoration: none;
 			box-shadow: 0 0 2px @bg-color;
 		}
-		* {
-			pointer-events: none;
+	}
+}
+
+html {
+	body {
+		.bvi-body {
+			&[data-bvi-theme=white] {
+				*,
+				a,
+				button,
+				input[type="button"],
+				input[type="submit"],
+				input[type="reset"] {
+					&.btn {
+						background-color: white !important;
+						color: black;
+						box-shadow: 0 0 2px black !important;
+						outline: none !important;
+						span {
+							background-color: transparent !important;
+						}
+						&:hover,
+						&:focus,
+						&:active {
+							background-color: black !important;
+							color: white !important;
+							text-decoration: none;
+							box-shadow: 0 0 2px black;
+							span {
+								background-color: transparent !important;
+							}
+						}
+					}
+				}
+			}
+			&[data-bvi-theme=black] {
+				*,
+				a,
+				button,
+				input[type="button"],
+				input[type="submit"],
+				input[type="reset"] {
+					&.btn {
+						background-color: black !important;
+						box-shadow: 0 0 2px white !important;
+						outline: none !important;
+						span {
+							background-color: transparent !important;
+						}
+						&:hover,
+						&:focus,
+						&:active {
+							background-color: white !important;
+							color: black !important;
+							text-decoration: none;
+							box-shadow: 0 0 2px white;
+							span {
+								background-color: transparent !important;
+							}
+						}
+						* {
+							pointer-events: none;
+						}
+					}
+				}
+			}
+			&[data-bvi-theme=blue] {
+				*,
+				a,
+				button,
+				input[type="button"],
+				input[type="submit"],
+				input[type="reset"] {
+					&.btn {
+						background-color: #9dd1ff !important;
+						box-shadow: 0 0 2px #063462 !important;
+						color: #063462 !important;
+						outline: none !important;
+						&::before,
+						&::after {
+							color: #063462 !important;
+						}
+						span {
+							background-color: transparent !important;
+							color: #063462 !important;
+						}
+						&:hover,
+						&:focus,
+						&:active {
+							background-color: #063462 !important;
+							color: #9dd1ff !important;
+							text-decoration: none;
+							box-shadow: 0 0 2px #063462;
+							span {
+								background-color: transparent !important;
+								color: #9dd1ff !important;
+							}
+							&::before,
+							&::after {
+								color: #9dd1ff !important;
+							}
+						}
+						* {
+							pointer-events: none;
+						}
+					}
+				}
+			}
+			&[data-bvi-theme=brown] {
+				*,
+				a,
+				button,
+				input[type="button"],
+				input[type="submit"],
+				input[type="reset"] {
+					&.btn {
+						background-color: #f7f3d6 !important;
+						box-shadow: 0 0 2px #4d4b43 !important;
+						color: #4d4b43 !important;
+						outline: none !important;
+						span {
+							background-color: transparent !important;
+						}
+						&:hover,
+						&:focus,
+						&:active {
+							background-color: #4d4b43 !important;
+							color: #f7f3d6 !important;
+							text-decoration: none;
+							box-shadow: 0 0 2px #4d4b43;
+							span {
+								background-color: transparent !important;
+							}
+						}
+						* {
+							pointer-events: none;
+						}
+					}
+				}
+			}
+			&[data-bvi-theme=green] {
+				*,
+				a,
+				button,
+				input[type="button"],
+				input[type="submit"],
+				input[type="reset"] {
+					&.btn {
+						background-color: #3b2716 !important;
+						box-shadow: 0 0 2px #a9e44d !important;
+						color: #a9e44d !important;
+						outline: none !important;
+						span {
+							background-color: transparent !important;
+						}
+						&:hover,
+						&:focus,
+						&:active {
+							background-color: #a9e44d !important;
+							color: #3b2716 !important;
+							text-decoration: none;
+							box-shadow: 0 0 2px #a9e44d;
+							span {
+								background-color: transparent !important;
+							}
+						}
+						* {
+							pointer-events: none;
+						}
+					}
+				}
+			}
 		}
 	}
-}
+}

src/less/inc/error.less

@@ -1,5 +1,9 @@
 .error {
 	&_list {
 		color: @list-error-color;
+		margin-bottom: 2em;
+		li {
+			margin-bottom: unset;
+		}
 	}
 }