update

KSOSH · Nov 6, 2024 · 62536cf · 62536cf
1 parent a7780c9
commit 62536cf
Show file tree

Hide file tree

Showing 8 changed files with 270 additions and 55 deletions.
diff --git a/site/assets/plugins/tinymce4/theme/theme.tinymce4.site.inc.php b/site/assets/plugins/tinymce4/theme/theme.tinymce4.site.inc.php
@@ -110,6 +110,10 @@ classes: "text-justify"
 $this->set('image_dimensions', false, 'bool');
 $this->set('image_description', false, 'bool');
 
+// Старт и сохранение
+$this->set('setup', 'function(ed) { ed.on("change", function(e) { documentDirty=true; }); }',  'object');
+$this->set('save_onsavecallback', 'function () { documentDirty=false; document.getElementById("stay").value = 2; document.mutate.save.click(); }',  'object');
+
 try {
 	$hash = "1.0.0";
 	$css = $this->themeConfig["content_css"]["value"][0];

diff --git a/site/assets/templates/projectsoft/css/main.css b/site/assets/templates/projectsoft/css/main.css
diff --git a/site/assets/templates/projectsoft/css/tinymce.css b/site/assets/templates/projectsoft/css/tinymce.css
diff --git a/site/assets/templates/projectsoft/css/tinymce.min.css b/site/assets/templates/projectsoft/css/tinymce.min.css
diff --git a/site/assets/templates/projectsoft/tpl/head.html b/site/assets/templates/projectsoft/tpl/head.html
@@ -31,8 +31,8 @@
 	<!--link(rel="preconnect" href="https://fonts.gstatic.com")-->
 	<!--link(href="https://fonts.googleapis.com/css2?family=Abel:wght@400&display=swap" rel="stylesheet")-->
 	<!-- Template style-->
-	<link type="text/css" rel="stylesheet" href="[(site_url)]assets/templates/projectsoft/css/main.css?a0169b2bb0c86f0686da8336ddd94066"/>
-	<link type="text/css" rel="stylesheet" href="[(site_url)]css.css?a0169b2bb0c86f0686da8336ddd94066"/>
+	<link type="text/css" rel="stylesheet" href="[(site_url)]assets/templates/projectsoft/css/main.css?1bb5ce62d54c5330d3fba3a5993eac9d"/>
+	<link type="text/css" rel="stylesheet" href="[(site_url)]css.css?1bb5ce62d54c5330d3fba3a5993eac9d"/>
 	<meta name="apple-mobile-web-app-title" content="[(site_name)]"/>
 	<meta name="application-name" content="[(site_name)]"/>
 	<meta name="title" content="[*pagetitle:notags:strip*]"/>

diff --git a/site/assets/templates/projectsoft/tpl/yepnope-load.html b/site/assets/templates/projectsoft/tpl/yepnope-load.html
@@ -18,8 +18,8 @@
 	};*/
 	window.HTTP_CLIENT = 0;
 	yepnope('assets/templates/projectsoft/js/appjs.min.js', undefined, function() {
-	   yepnope('assets/templates/projectsoft/js/main.js?dd2782af2c04e4846af28f79412b45fc', undefined, function() {
-	       /*yepnope('assets/comon/js/Hyphenopoly/Hyphenopoly_Loader.js?dd2782af2c04e4846af28f79412b45fc', undefined, function() {});*/
+	   yepnope('assets/templates/projectsoft/js/main.js?f9bde4e5d2f1427cde334ec34f07166e', undefined, function() {
+	       /*yepnope('assets/comon/js/Hyphenopoly/Hyphenopoly_Loader.js?f9bde4e5d2f1427cde334ec34f07166e', undefined, function() {});*/
 	   })
 	});
 </script>[!YandexMetrika!]
diff --git a/src/less/inc/table.less b/src/less/inc/table.less
@@ -1,4 +1,26 @@
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
+	&,
+	&.table-bordered,
+	&.border-collapse,
+	&.table-striped,
+	&.table-hover {
+		width: 100%;
+		max-width: 100%;
+		margin-bottom: 20px;
+		> thead,
+		> tbody,
+		> tfoot {
+			> tr {
+				> th,
+				> td {
+					padding: 8px;
+					line-height: 1.42857143;
+					vertical-align: top;
+					text-align: left;
+				}
+			}
+		}
+	}
 }
diff --git a/src/less/plugins/eye_panel.less b/src/less/plugins/eye_panel.less
@@ -3,30 +3,74 @@ a.bvi-open {
 	right: 15px;
 	top: 6px;
 	font-size: 25px;
+	background-color: red;
+	color: white;
+	padding-top: 0.2em;
+	padding-bottom: 0.2em;
+	transition: all .3s ease;
+	box-shadow: 0 0 0px red;
+	border-radius: 7px;
+	border: 1px solid red;
 	&, &:active {
 		text-decoration: none;
 	}
 	&:hover {
-		text-decoration: underline;
+		box-shadow: 0 0 5px #000;
+	}
+	&:hover,
+	&:focus {
+		text-decoration: none;
+		background-color: white;
+		box-shadow: 0 0 5px #c28989;
+		color: red;
+	}
+	i,
+	em {
+		font-style: normal;
 	}
 	.icon-eye {
 		display: flex;
 		flex-direction: row-reverse;
 		flex-wrap: nowrap;
+		align-items:center;
 		&::after {
 			content: attr(data-title);
 			margin-right: 15px;
 			margin-left: 15px;
 			font-size: 16px;
 			font-family: 'Open Sans';
 		}
+		&:before {
+			font-size: 0.6em;
+			margin-right: 15px;
+		}
+	}
+	@media(max-width: 440px) {
+		display: none;
 	}
 }
 a.bvi-panel-close {
 	position: absolute;
 	z-index: 10;
 	top: 6px;
 	right: 15px;
+	padding-top: 0.2em;
+	padding-bottom: 0.2em;
+	padding-right: 1em;
+	padding-left: 1em;
+	border: 1px solid;
+	border-radius: 7px;
+	&:hover,
+	&:focus {
+		text-decoration: none;
+	}
+	&:after {
+		content: "👁";
+		background-image: unset;
+		width: unset;
+		height: unset;
+		display: initial;
+	}
 }
 html body .bvi-panel {
 	margin-bottom: 0 !important;