Commit 89a51ec749aeded3d0c2d9f4369e635efb4c699b

Authored by Андрей Ларионов
Exists in master

Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Showing 4 changed files Side-by-side Diff

public/css/cke_wysiwyg_frame_style.css
... ... @@ -0,0 +1,11 @@
  1 +img {
  2 + display: inline !important;
  3 + border: none !important;
  4 + box-shadow: none !important;
  5 + height: 1em !important;
  6 + width: 1em !important;
  7 + margin: 0 0.07em !important;
  8 + vertical-align: -0.1em !important;
  9 + background: none !important;
  10 + padding: 0 !important;
  11 +}
public/css/style_may2024.css
... ... @@ -9172,3 +9172,17 @@ main + .news {
9172 9172 display: -ms-flexbox;
9173 9173 display: flex;
9174 9174 }
  9175 +.main__vacancies-item .main__employer-page-two-item-text-body img {
  9176 + display: inline !important;
  9177 + border: none !important;
  9178 + box-shadow: none !important;
  9179 + height: 1em !important;
  9180 + width: 1em !important;
  9181 + margin: 0 0.07em !important;
  9182 + vertical-align: -0.1em !important;
  9183 + background: none !important;
  9184 + padding: 0 !important;
  9185 +}
  9186 +.main__vacancies-item .main__employer-page-two-item-text-body p{
  9187 + margin: 0 0 20px;
  9188 +}
resources/views/layout/frontend.blade.php
... ... @@ -316,6 +316,20 @@
316 316 }
317 317 }
318 318 };
  319 +
  320 + $(function() {
  321 + var style_link = "{{ asset('css/cke_wysiwyg_frame_style.css') }}";
  322 + var iterator = 0;
  323 + var wysiwyg_style_interval = window.setInterval(function(){
  324 + var frame = $('.cke_wysiwyg_frame');
  325 + frame.contents().find('head').append(
  326 + $('<link rel="stylesheet" type="text/css" href="' + style_link + '">')
  327 + );
  328 + if (frame.length || (++iterator == 6)){
  329 + clearInterval(wysiwyg_style_interval);
  330 + }
  331 + }, 500);
  332 + });
319 333 </script>
320 334 @include('js.modals')
321 335 @include('js.captha')
resources/views/resume.blade.php
... ... @@ -417,7 +417,7 @@
417 417 </div>
418 418 <div>
419 419 <b>Город проживания</b>
420   - <span>{{ $res->city }}</span>
  420 + <span>{{ $res->city ?? "-" }}</span>
421 421 </div>
422 422 <div>
423 423 <b>Уровень английского:</b>