Merge pull request 'visually-impaired mode fix' (#53) from RomanGolienko/Roman_applicant-site:feature/visually-impaired-mode into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/53

resources/views/layouts/new-design-layout.blade.php

@@ -15,7 +15,6 @@
 
     <link rel="stylesheet" type="text/css" href="{{ asset('css/bootstrap.css') }}">
     <link rel="stylesheet" type="js" href="{{ asset('js/bootstrap-bundle.js') }}">
-    <script src="{{ asset('js/jquery-3.7.1.min.js') }}"></script>
 
 
 
@@ -28,8 +27,10 @@
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="0">
-{{--   <script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>--}}
+    <script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>
-{{--   <script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>--}}
+    <script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>
+    <script src="{{ asset('js/jquery-3.7.1.min.js') }}"></script>
+
 </head>
 <style>
     @font-face {
@@ -135,7 +136,7 @@
         left: 0;
         height: 25px;
         width: 25px;
-        background-color: transparent;
+        /*background-color: transparent;*/
         border: 1px solid rgb(241, 241, 241);
         border-radius: 8px;
 
@@ -145,7 +146,8 @@
 
     }
     .checkbox2 input:checked ~ .checkmark {
-        background-color: rgb(0, 0, 0);
+        background-color: rgb(0, 0, 0)!important;
+
 
     }
 
@@ -155,6 +157,7 @@
         position: absolute;
         display: none;
 
+
     }
 
     /* Show the checkmark when checked */
@@ -209,63 +212,24 @@
         background-image: url({{ URL::to("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#35af00' %3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")}});
         transform: rotate(-180deg);
     }
-    .visually_impaired_mode_bg {
+    .special .carousel-control-prev-icon {
-
+        background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='black'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e")!important;
-        background-image: url({{ URL::to("public/img/front-page/white-bg.jpg")}})!important;
-
     }
-    .direction-card-text {
+    .special .carousel-control-next-icon {
-        color: #004329;
+        background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='black'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")!important;
     }
-    .disabled {
+    .special .offcanvas .mx-5 {
-        display: none;
+        margin-top: 5em;
     }
-    .visually-impaired-text {
+    .special .btn-close {
-        font-size: 150%!important;
+        background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='black'%3e%3cpath d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/%3e%3c/svg%3e") center/1em auto no-repeat!important;
     }
 
 
-
 </style>
 <script>
-    $(document).on("click", ".visually_impaired_mode_button", function () {
+    $(document).on("click", "#specialButton", function () {
-
+        $("button[title='Обычная версия сайта']").attr('id','specialButton')
-
-            if(!$("body").hasClass('visually-impaired-text')){
-                $("body").addClass('visually-impaired-text')
-
-
-            }
-            else {
-                $("body").removeClass('visually-impaired-text')
-            }
-
-            if($('div, a, p').hasClass('visually_impaired_mode_bg')){
-                $(".visually_impaired_mode").removeClass('visually_impaired_mode_bg');
-
-            }
-            else {
-                $(".visually_impaired_mode").addClass('visually_impaired_mode_bg');
-            }
-
-            if($("div, a, p").hasClass('buttonBG')){
-                $(".buttonBG").addClass('buttonBGDISABLED')
-                $(".buttonBG").removeClass('buttonBG');
-            }
-            else {
-                $(".buttonBGDISABLED").addClass('buttonBG');
-                $(".buttonBGDISABLED").removeClass('buttonBGDISABLED');
-            }
-
-            if($("div, a, p").hasClass('text-white')){
-                $(".text-white").addClass('text-whiteDISABLED');
-                $(".text-white").removeClass('text-white');
-
-            }
-            else {
-                $(".text-whiteDISABLED").addClass('text-white');
-                $(".text-whiteDISABLED").removeClass('text-whiteDISABLED');
-            }
 
         if($(".gradient-text").hasClass('gradient-text')){
             $(".gradient-text").addClass('gradient-textDISABLED');
@@ -274,71 +238,14 @@
         else {
             $(".gradient-textDISABLED").addClass('gradient-text');
             $(".gradient-textDISABLED").removeClass('gradient-textDISABLED');
-
         }
-
+        if($(".checkbox1").hasClass("checkbox2")){
-            if($(".direction-card-text").hasClass('direction-card-text')){
+            $(".checkbox1").removeClass('checkbox2')
-                $(this).addClass('direction-card-textDISABLED');
-                $(".direction-card-text").removeClass('direction-card-text');
         }
         else {
-                $(".direction-card-textDISABLED").addClass('direction-card-text');
+            $(".checkbox1").addClass('checkbox2')
-                $(".direction-card-textDISABLED").removeClass('direction-card-textDISABLED');
-
         }
-            if($("img").hasClass('disabled')){
-                $("img").removeClass('disabled')
-            }
-            else {
-                $("img").addClass('disabled')
-            }
-
-            if($("div, a, p").hasClass('scroll-1')){
-                $(".scroll-1").addClass('scroll-1DISABLED');
-                $(".scroll-1").removeClass('scroll-1');
-
-            }
-
-            else {
-                $(".scroll-1DISABLED").addClass('scroll-1');
-                $(".scroll-1DISABLED").removeClass('scroll-1DISABLED');
-            }
-
-
-            if(!$("div, a, p").hasClass('DARK')){
-
-                $(".checkmark").css("border", "3px solid rgb(0, 0, 0)")
-                $(this).addClass("DARK")
-
-            }
-
-            else {
-                $(this).removeClass("DARK")
-                $(".checkmark").css("border", "1px solid rgb(241, 241, 241)")
-
-            }
-
-
-            if($(".checkbox1").hasClass("checkbox2 input:checked ~ .checkmark")){
-                $(".checkbox1 ").removeClass("checkbox2 input:checked ~ .checkmark")
-            }
-            else {
-                $(".checkbox1 ").addClass("checkbox2 input:checked ~ .checkmark")
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     });
+
 </script>
 @yield('content')

resources/views/new-design/bakalavr-special.blade.php

@@ -1,5 +1,6 @@
 @extends('layouts.new-design-layout')
 @section('content')
+
     <style>
 
         .gradient-text {
@@ -120,11 +121,11 @@
                                 {{--                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
                                 {{--                                    <div class="hover2"> RU </div>--}}
                                 {{--                                </a>--}}
-                                {{--                            <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}}
+                                                            <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />
-                                <a type="button" class="col-auto px-lg-3 text-white text-sm-start visually_impaired_mode_button "
+{{--                                <a type="button" class="col-auto px-lg-3 text-white text-sm-start visually_impaired_mode_button "--}}
-                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
+{{--                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
-                                    <div class="hover2"> Режим для слабовидящих</div>
+{{--                                    <div class="hover2"> Режим для слабовидящих</div>--}}
-                                </a>
+{{--                                </a>--}}
                             </div>
 
                         </div>
@@ -404,8 +405,7 @@
 
                         <div class="text-white display-6"> Выберите предметы ЕГЭ</div>
                         <form class="text-white mt-4 fs-4 calcul" style=" font-family: Geologica-ExtraLight">
-                            <script
+                            <script src="{{ URL::to('https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js')}}"></script>
-                                src="{{ URL::to('https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js')}}"></script>
                             @foreach($subjects as $id => $name)
                                 @if($name === "Русский язык" || $name === "Математика" )
                                     <label class="checkbox1"> {{ $name }}