dev

skeeks-cms · Nov 27, 2024 · 330dc4b · 330dc4b
1 parent 0054689
commit 330dc4b
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 8 deletions.
diff --git a/src/admin/assets/src/css/admin.css b/src/admin/assets/src/css/admin.css
@@ -1,5 +1,6 @@
 :root {
-  --primary-color: #cb11ab; /*Главный цвет ссылок и главных кнопок*/
+  /*--primary-color: #cb11ab;*/ /*Главный цвет ссылок и главных кнопок*/
+  --primary-color: #2067b0; /*Главный цвет ссылок и главных кнопок*/
   --bg-gray: #f3f3f3; /*Главный цвет ссылок и главных кнопок*/
 }
 html {
@@ -281,6 +282,10 @@ a:hover {
 {
     background: #f9f9f9;
 }
+table.sx-table thead tr th a.asc, table.sx-table thead tr th a.desc
+{
+    color: var(--primary-color)
+}
 
 table.sx-table thead tr th {
     background: #f9f9f9;
@@ -702,6 +707,10 @@ iframe {
 /*.btn {
     padding: 10px 25px;
 }*/
+.btn {
+    /*padding: .575rem 2rem;*/
+}
+
 .btn:visited,
 .btn:active,
 .btn:focus {
@@ -951,4 +960,9 @@ pre {
     background-size: 400%;
     animation: loading 1.2s ease-in-out infinite;
     opacity: 1 !important;
+}
+
+
+.sx-content-actions .nav-link.active {
+    color: var(--primary-color);
 }
diff --git a/src/assets/src/css/unify-custom.css b/src/assets/src/css/unify-custom.css
@@ -223,8 +223,8 @@ body {
 
 .form-control {
     border-color: #ced4da;
-    padding: 10px;
-    height: 43px;
+    padding: 0.625rem;
+    height: 2.6rem;
     /*height: auto;*/
 }
 
@@ -603,7 +603,7 @@ body {
     background-color: var(--primary-color);
 }
 .select2-container .select2-selection--single {
-    height: 43px;
+    height: 2.6rem;
 
     border-radius: 4px;
     /*display: flex;*/

diff --git a/src/views/widgets/ContentElementsCmsWidget/news-masonry.php b/src/views/widgets/ContentElementsCmsWidget/news-masonry.php
@@ -55,8 +55,8 @@
         'tag' => false
     ],
     'layout'       => '
-<div class="row list-view">{items}</div>
-<div class="row"><div class="col-md-12">{pager}</div></div>',
+<div class="row no-gutters list-view">{items}</div>
+<div class="row no-gutters"><div class="col-md-12">{pager}</div></div>',
     'pager'        => [
         'class' => \skeeks\cms\themes\unify\widgets\ScrollAndSpPager::class
     ],

diff --git a/src/views/widgets/ContentElementsCmsWidget/stock-carousel.php b/src/views/widgets/ContentElementsCmsWidget/stock-carousel.php
@@ -8,7 +8,7 @@
     \skeeks\cms\themes\unify\assets\components\UnifyThemeStickAsset::register($this);
     \skeeks\cms\themes\unify\assets\VanillaLazyLoadAsset::register($this);
     ?>
-    <div class="js-carousel sx-stick"
+    <div class="js-carousel sx-stick" 
          data-infinite="true" 
          data-autoplay="true" 
          data-speed="7000" 
@@ -24,7 +24,7 @@
                 <? if ($banner_url = $model->relatedPropertiesModel->getAttribute("url")) : ?>
                     <a href="<?php echo $banner_url; ?>">
                 <? endif; ?>
-                <img data-src="<?= $model->image->src; ?>" alt=" " class="img-fluid lazy" style="width: 100%;">
+                <img data-lazy="<?= $model->image->src; ?>" alt=" " class="img-fluid" style="width: 100%;">
                 <? if ($banner_url) : ?>
                     </a>
                 <? endif; ?>

diff --git a/src/widgets/auth/views/auth.php b/src/widgets/auth/views/auth.php
@@ -18,8 +18,35 @@
 
 $this->registerJs(<<<JS
     new sx.classes.Auth({$js});
+
+    $("body").on("click", ".sx-view-pass", function() {
+        var jIcon = $(this);
+        var jInput = jIcon.parent("div").find("input");
+
+        
+        if (jInput.attr("type") == 'password') {
+            jInput.attr('type', 'text');
+            jIcon.addClass("fa-eye-slash");
+            jIcon.removeClass("fa-eye");
+        } else {
+            jInput.attr('type', 'password');
+            jIcon.addClass("fa-eye");
+            jIcon.removeClass("fa-eye-slash");
+        }
+    });
 JS
 );
+$this->registerCss(<<<CSS
+    .sx-view-pass {
+        position: absolute;
+        right: 1rem;
+        z-index: 1;
+        cursor: pointer;
+        top: 50% !important;
+        transform: translateY(-50%);
+    }
+CSS
+);
 ?>
 
 <?php echo \yii\helpers\Html::beginTag("div", $widget->options); ?>
@@ -94,6 +121,7 @@ function (ActiveFormAjaxSubmit) {
 
         <div class="form-group">
             <div class="input-group">
+                <i class="far fa-eye sx-view-pass"></i>
                 <input type="password" class="form-control" name="password" value="" placeholder="Ваш пароль">
                 <!--<button class="btn btn-primary sx-btn-submit" type="submit">Войти</button>-->
             </div>
@@ -207,6 +235,7 @@ function (ActiveFormAjaxSubmit) {
 
         <div class="form-group">
             <div class="input-group">
+                <i class="far fa-eye sx-view-pass"></i>
                 <input type="password" class="form-control" name="password" value="" placeholder="Ваш пароль">
                 <!--<button class="btn btn-primary sx-btn-submit" type="submit">Войти</button>-->
             </div>
@@ -329,6 +358,7 @@ function (ActiveFormAjaxSubmit) {
 
         <div class="form-group">
             <div class="input-group">
+                <i class="far fa-eye sx-view-pass"></i>
                 <input type="password" class="form-control" name="password" value="" placeholder="Ваш пароль">
                 <!--<button class="btn btn-primary sx-btn-submit" type="submit">Войти</button>-->
             </div>