Merge branch 'task-132687' into 'master'

task-132687 minor changes

Merge branch 'task-132687' into 'master'
task-132687 minor changes
Fedor K
2 parents 6e94c59a9a 7f9957575c
Showing 3 changed files Side-by-side Diff
public/css/style_may2024.css
resources/views/employers/menu.blade.php
resources/views/modals/vacancy/send_response_to_employer.blade.php
@@ -9414,39 +9414,16 @@ body .cke_notifications_area{
 nav .drop-down {
     list-style: none;
     overflow: hidden; /* When ul height is reduced, ensure overflowing li are not shown */
-    height: 250px; /* 172px = (38 (li) + 5 (li border)) * 4 (number of li) */
-    /*background-color: #34495e;*/
-    /*font-family: Arial;*/
-    /*width: 200px;*/
+    height: 200px; /* 172px = (38 (li) + 5 (li border)) * 4 (number of li) */
     margin: 0 auto;
     padding: 0;
-    /*text-align: center;*/
     -webkit-transition: height 0.3s ease;
     transition: height 0.3s ease;
 }
  
-
 nav .drop-down.closed {
     /*  When toggled via jQuery this class will reduce the height of the ul which inconjuction
         with overflow: hidden set on the ul will hide all list items apart from the first */
     /* current li height 38px + 5px border */
     height: 43px;
 }
-
-nav .drop-down li {
-    /*border-bottom: 5px solid #2c3e50;*/
-}
-
-nav .drop-down li a {
-    display: block;
-    /*color: #ecf0f1;*/
-    /*text-decoration: none;*/
-    padding: 10px; /* Larger touch target area */
-}
-
-nav .drop-down li:first-child a:after {
-    /*content: "\25BC";*/
-    float: right;
-    margin-left: -30px; /* Excessive -margin to bring link text back to center */
-    margin-right: 5px;
-}
@@ -115,28 +115,32 @@
                 <nav>
                     <ul class="drop-down closed">
                         <li>
-                            <a class="nav-button cabinet__menu-item">
-                                <svg>
-                                    <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
-                                </svg>
+                            <a style="background-color: white" class="nav-button cabinet__menu-item">
+                                <i>
+                                    <svg>
+                                        <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
+                                    </svg>
+                                </i>
                                 <span>Настройки</span>
                             </a>
                         </li>
                         <li>
                             <a href="{{ route('employer.subscribe') }}" class="cabinet__menu-item @if ($item==11) active @endif">
-                                <svg>
+                                <i><svg>
                                     <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
-                                </svg>
+                                </svg></i>
                                 <span>Настройки уведомлений</span>
                             </a>
                         </li>
                         <li>
                             <a href="{{ route('employer.password_reset') }}" class="cabinet__menu-item green @if ($item==13) active @endif">
+                                <i></i>
                                 <span>Сменить пароль</span>
                             </a>
                         </li>
                         <li>
                             <a href="{{ route('employer.delete_people') }}" class="cabinet__menu-item red @if ($item==14) active @endif">
+                                <i></i>
                                 <span>Удалить профиль</span>
                             </a>
                         </li>
@@ -3,5 +3,20 @@
         <div class="modal__text">Ваше резюме и комментарий отправлены работодателю.</div>
         <div class="modal__text">Спасибо, что пользуетесь нашим сервисом.</div>
         <div class="modal__text">Удачи Вам в поисках работы.</div>
+        <div class="modal__text"></div>
+        <div class="modal__text"></div>
+        <button type="button"
+            id="close-button"
+            class="button"
+        >
+            Вернуться
+        </button>
     </div>
 </div>
+<script>
+    $('#close-button').click(function(){
+        $.fancybox.close();
+        $.fancybox.close();
+        $.fancybox.close();
+    });
+</script>
...	...	@@ -9414,39 +9414,16 @@ body .cke_notifications_area{
9414	9414	nav .drop-down {
9415	9415	list-style: none;
9416	9416	overflow: hidden; /* When ul height is reduced, ensure overflowing li are not shown */
9417		- height: 250px; /* 172px = (38 (li) + 5 (li border)) * 4 (number of li) */
9418		- /background-color: #34495e;/
9419		- /font-family: Arial;/
9420		- /width: 200px;/
	9417	+ height: 200px; /* 172px = (38 (li) + 5 (li border)) * 4 (number of li) */
9421	9418	margin: 0 auto;
9422	9419	padding: 0;
9423		- /text-align: center;/
9424	9420	-webkit-transition: height 0.3s ease;
9425	9421	transition: height 0.3s ease;
9426	9422	}
9427	9423
9428		-
9429	9424	nav .drop-down.closed {
9430	9425	/* When toggled via jQuery this class will reduce the height of the ul which inconjuction
9431	9426	with overflow: hidden set on the ul will hide all list items apart from the first */
9432	9427	/* current li height 38px + 5px border */
9433	9428	height: 43px;
9434	9429	}
9435		-
9436		-nav .drop-down li {
9437		- /border-bottom: 5px solid #2c3e50;/
9438		-}
9439		-
9440		-nav .drop-down li a {
9441		- display: block;
9442		- /color: #ecf0f1;/
9443		- /text-decoration: none;/
9444		- padding: 10px; /* Larger touch target area */
9445		-}
9446		-
9447		-nav .drop-down li:first-child a:after {
9448		- /content: "\25BC";/
9449		- float: right;
9450		- margin-left: -30px; /* Excessive -margin to bring link text back to center */
9451		- margin-right: 5px;
9452		-}
...	...	@@ -115,28 +115,32 @@
115	115	<nav>
116	116	<ul class="drop-down closed">
117	117	<li>
118		- <a class="nav-button cabinet__menu-item">
119		- <svg>
120		- <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
121		- </svg>
	118	+ <a style="background-color: white" class="nav-button cabinet__menu-item">
	119	+ <i>
	120	+ <svg>
	121	+ <use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
	122	+ </svg>
	123	+ </i>
122	124	<span>Настройки</span>
123	125	</a>
124	126	</li>
125	127	<li>
126	128	<a href="{{ route('employer.subscribe') }}" class="cabinet__menu-item @if ($item==11) active @endif">
127		- <svg>
	129	+ <i><svg>
128	130	<use xlink:href="{{ asset('images/sprite.svg#cabinet-11') }}"></use>
129		- </svg>
	131	+ </svg></i>
130	132	<span>Настройки уведомлений</span>
131	133	</a>
132	134	</li>
133	135	<li>
134	136	<a href="{{ route('employer.password_reset') }}" class="cabinet__menu-item green @if ($item==13) active @endif">
	137	+ <i></i>
135	138	<span>Сменить пароль</span>
136	139	</a>
137	140	</li>
138	141	<li>
139	142	<a href="{{ route('employer.delete_people') }}" class="cabinet__menu-item red @if ($item==14) active @endif">
	143	+ <i></i>
140	144	<span>Удалить профиль</span>
141	145	</a>
142	146	</li>
...	...	@@ -3,5 +3,20 @@
3	3	<div class="modal__text">Ваше резюме и комментарий отправлены работодателю.</div>
4	4	<div class="modal__text">Спасибо, что пользуетесь нашим сервисом.</div>
5	5	<div class="modal__text">Удачи Вам в поисках работы.</div>
	6	+ <div class="modal__text"></div>
	7	+ <div class="modal__text"></div>
	8	+ <button type="button"
	9	+ id="close-button"
	10	+ class="button"
	11	+ >
	12	+ Вернуться
	13	+ </button>
6	14	</div>
7	15	</div>
	16	+<script>
	17	+ $('#close-button').click(function(){
	18	+ $.fancybox.close();
	19	+ $.fancybox.close();
	20	+ $.fancybox.close();
	21	+ });
	22	+</script>