diff --git a/public/css/app.css b/public/css/app.css index be026771..37c125e3 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -9618,6 +9618,16 @@ h3, h4, h5, h6 { color: rgb(174.87, 70.47, 0); } +.has-external-link-icon { + text-decoration: none; +} +.has-external-link-icon:hover { + text-decoration: none; +} +.has-external-link-icon span { + text-decoration: underline; +} + img { max-width: 100%; height: auto; @@ -10674,19 +10684,21 @@ button.video-control .fa-play { .profile .contact_info > div { margin-top: 30px; } -.profile h3 { +.profile h2 { font-weight: lighter; font-size: 1.8rem; margin-bottom: 1.4rem; z-index: 0; position: relative; + margin-top: 1rem; } -.profile h5 { +.profile h3 { clear: both; margin-bottom: 15px; } -.profile h6 { +.profile h4 { color: #c95100; + font-size: 1rem; } .profile .links { text-align: center; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index dcb76aea..61950703 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -3,8 +3,8 @@ "/js/app.js.map": "/js/app.js.map?id=271c8f103c569b8f5613b8778d48ee75", "/js/manifest.js": "/js/manifest.js?id=dc9ead3d7857b522d7de22d75063453c", "/js/manifest.js.map": "/js/manifest.js.map?id=389e00e7d7680b68d4e1d128ce27ff48", - "/css/app.css": "/css/app.css?id=0fd161f323dd5c77642c3240bbb47d16", - "/css/app.css.map": "/css/app.css.map?id=3ba6add83b449d9a830b1160dc25d43d", + "/css/app.css": "/css/app.css?id=134d47945758d2b1c346de45f027d267", + "/css/app.css.map": "/css/app.css.map?id=3505676b3c363f41254329a533224bef", "/js/vendor.js": "/js/vendor.js?id=77012e19e850a379f73e3ac0c76bc9b1", "/js/vendor.js.map": "/js/vendor.js.map?id=f3f5514d1186aa088c887b6ebe999fe0" } diff --git a/resources/assets/sass/_core.scss b/resources/assets/sass/_core.scss index bcf1b015..3e89099a 100644 --- a/resources/assets/sass/_core.scss +++ b/resources/assets/sass/_core.scss @@ -18,6 +18,18 @@ a { } } +.has-external-link-icon { + text-decoration: none; + + &:hover { + text-decoration: none; + } + + span { + text-decoration: underline; + } +} + img{ max-width: 100%; height: auto; diff --git a/resources/assets/sass/_profile.scss b/resources/assets/sass/_profile.scss index 073cdb46..f654621b 100644 --- a/resources/assets/sass/_profile.scss +++ b/resources/assets/sass/_profile.scss @@ -105,21 +105,23 @@ } } - h3 { + h2 { font-weight: lighter; font-size: 1.8rem; margin-bottom: 1.4rem; z-index: 0; position: relative; + margin-top: 1rem; } - h5 { + h3 { clear: both; margin-bottom: 15px; } - h6 { + h4 { color: $utd-web-orange; + font-size: 1rem; } .links { diff --git a/resources/views/livewire/profile-data-cards/activities.blade.php b/resources/views/livewire/profile-data-cards/activities.blade.php index 54b131d7..63e709e6 100644 --- a/resources/views/livewire/profile-data-cards/activities.blade.php +++ b/resources/views/livewire/profile-data-cards/activities.blade.php @@ -1,12 +1,18 @@ -
-

Activities @if($editable) Edit@endif

- @foreach($data as $activity) -
-
{{$activity->title}}
- {!! Purify::clean($activity->description) !!} - @if($activity->start_date)[{{$activity->start_date}}–{{$activity->end_date}}] @endif -
- @endforeach +
+

Activities @if($editable) Edit@endif

+ @if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/additionals.blade.php b/resources/views/livewire/profile-data-cards/additionals.blade.php index d43cee2c..0b9d0fb4 100644 --- a/resources/views/livewire/profile-data-cards/additionals.blade.php +++ b/resources/views/livewire/profile-data-cards/additionals.blade.php @@ -1,11 +1,24 @@ -
-

Additional Information @if($editable) Edit@endif

- @foreach($data as $additional) -
-
{{$additional->title}}
- {!! Purify::clean($additional->description) !!} -
- @endforeach +
+

Additional Information @if($editable) Edit@endif

+ @if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/affiliations.blade.php b/resources/views/livewire/profile-data-cards/affiliations.blade.php index 4bee227e..a14ba554 100644 --- a/resources/views/livewire/profile-data-cards/affiliations.blade.php +++ b/resources/views/livewire/profile-data-cards/affiliations.blade.php @@ -1,12 +1,14 @@ -
-

Affiliations @if($editable) Edit@endif

- @foreach($data as $affiliation) -
-
{{$affiliation->title}}
- @if($affiliation->start_date){{$affiliation->start_date}}@if($affiliation->end_date)–{{$affiliation->end_date}}@endif
@endif - {!! Purify::clean($affiliation->description) !!} -
- @endforeach +
+

Affiliations @if($editable) Edit@endif

+
    + @foreach($data as $affiliation) +
  • +

    {{$affiliation->title}}

    + @if($affiliation->start_date){{$affiliation->start_date}}@if($affiliation->end_date)–{{$affiliation->end_date}}@endif
    @endif +

    {!! Purify::clean($affiliation->description) !!}

    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/appointments.blade.php b/resources/views/livewire/profile-data-cards/appointments.blade.php index 9afc5e84..c22962f3 100644 --- a/resources/views/livewire/profile-data-cards/appointments.blade.php +++ b/resources/views/livewire/profile-data-cards/appointments.blade.php @@ -1,15 +1,19 @@ -
-

Appointments @if($editable) Edit@endif

- @foreach($data as $appt) -
- {{$appt->appointment}} -
- {{$appt->organization}} [{{$appt->start_date}}@if($appt->end_date)–{{$appt->end_date}}@else–Present@endif]
- @if($appt->description) - {!! Purify::clean($appt->description) !!} - @endif -
- @endforeach +
+

Appointments @if($editable) Edit@endif

+
    + @foreach($data as $appt) +
  • +

    + {{$appt->appointment}} +
    + {{$appt->organization}} [{{$appt->start_date}}@if($appt->end_date)–{{$appt->end_date}}@else–Present@endif]
    + @if($appt->description) + {!! Purify::clean($appt->description) !!} + @endif +

    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/areas.blade.php b/resources/views/livewire/profile-data-cards/areas.blade.php index 2351e67a..80adaf5c 100644 --- a/resources/views/livewire/profile-data-cards/areas.blade.php +++ b/resources/views/livewire/profile-data-cards/areas.blade.php @@ -1,13 +1,23 @@ -
-

Research Areas @if($editable) Edit@endif

- @foreach($data as $area) - @if($area->url) -
{{$area->title}}
- @else -
{{$area->title}}
- @endif - {!! Purify::clean($area->description) !!} - @endforeach +
+

Research Areas @if($editable) Edit@endif

+ @if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/awards.blade.php b/resources/views/livewire/profile-data-cards/awards.blade.php index 9d0ebaf3..391c33c6 100644 --- a/resources/views/livewire/profile-data-cards/awards.blade.php +++ b/resources/views/livewire/profile-data-cards/awards.blade.php @@ -1,10 +1,14 @@ -
-

Awards @if($editable) Edit@endif

- @foreach($data as $award) -
- {{$award->name}} - {{$award->organization}} @if($award->year)[{{$award->year}}]@endif
-
- @endforeach +
+

Awards @if($editable) Edit@endif

+
    + @foreach($data as $award) +
  • +

    + {{$award->name}} - {{$award->organization}} @if($award->year)[{{$award->year}}]@endif
    +

    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/news.blade.php b/resources/views/livewire/profile-data-cards/news.blade.php index de1ec700..04f5f1d4 100644 --- a/resources/views/livewire/profile-data-cards/news.blade.php +++ b/resources/views/livewire/profile-data-cards/news.blade.php @@ -1,20 +1,28 @@ -
-

News Articles @if($editable) Edit@endif

- @foreach($data as $article) -
- @if($article->url) -
- - {{$article->title}} - -
- @else -
{{$article->title}}
- @endif - @if($article->image){{ $article->image_alt ?? $article->title }}@endif - {!! Purify::clean($article->description) !!} -
- @endforeach +
+

News Articles @if($editable) Edit@endif

+
    + @foreach($data as $article) +
  • + +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/preparation.blade.php b/resources/views/livewire/profile-data-cards/preparation.blade.php index d6c9a86e..3e19e6c6 100644 --- a/resources/views/livewire/profile-data-cards/preparation.blade.php +++ b/resources/views/livewire/profile-data-cards/preparation.blade.php @@ -1,12 +1,16 @@ -
-

Professional Preparation @if($editable) Edit@endif

- @foreach($data as $prep) -
- {{$prep->degree}} @if($prep->major)- {{$prep->major}}@endif -
- {{$prep->institution}}@if($prep->year) - {{$prep->year}}@endif -
- @endforeach +
+

Professional Preparation @if($editable) Edit@endif

+
    + @foreach($data as $prep) +
  • +

    + {{$prep->degree}} @if($prep->major)- {{$prep->major}}@endif +
    + {{$prep->institution}}@if($prep->year) - {{$prep->year}}@endif +

    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/presentations.blade.php b/resources/views/livewire/profile-data-cards/presentations.blade.php index 9b3d2134..24c64ba8 100644 --- a/resources/views/livewire/profile-data-cards/presentations.blade.php +++ b/resources/views/livewire/profile-data-cards/presentations.blade.php @@ -1,18 +1,34 @@ -
-

Presentations @if($editable) Edit@endif

- @foreach($data as $presentation) -
- @if($presentation->url) -
{{$presentation->title}}
- @else -
{{$presentation->title}}
- @endif - @if($presentation->start_date){{$presentation->start_date}}@if($presentation->end_date)–{{$presentation->end_date}}@endif@endif - @if($presentation->description) - {!! Purify::clean($presentation->description) !!} - @endif -
- @endforeach +
+

Presentations @if($editable) Edit@endif

+
    + @foreach($data as $presentation) +
  • +
    + @if($presentation->url) +

    + + {{$presentation->title}} + + (opens in a new tab) + +

    + @else +

    {{$presentation->title}}

    + @endif + @if($presentation->start_date) + {{$presentation->start_date}} + @if($presentation->end_date) + –{{$presentation->end_date}} + @endif + + @endif + @if($presentation->description) + {!! Purify::clean($presentation->description) !!} + @endif +
    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/projects.blade.php b/resources/views/livewire/profile-data-cards/projects.blade.php index a9d7ff0d..6f0b3cdd 100644 --- a/resources/views/livewire/profile-data-cards/projects.blade.php +++ b/resources/views/livewire/profile-data-cards/projects.blade.php @@ -1,18 +1,28 @@ -
-

Projects @if($editable) Edit@endif

- @foreach($data as $project) -
- @if($project->url) -
{{$project->title}}
- @else -
{{$project->title}}
- @endif - @if($project->start_date){{$project->start_date}}@if($project->end_date)–{{$project->end_date}}@endif@endif - @if($project->description) - {!! Purify::clean($project->description) !!} - @endif -
- @endforeach +
+

Projects @if($editable) Edit@endif

+
    + @foreach($data as $project) +
  • +
    + @if($project->url) +

    + + {{$project->title}} + + (opens in a new tab) + +

    + @else +

    {{$project->title}}

    + @endif + @if($project->start_date){{$project->start_date}}@if($project->end_date)–{{$project->end_date}}@endif@endif + @if($project->description) + {!! Purify::clean($project->description) !!} + @endif +
    +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/publications.blade.php b/resources/views/livewire/profile-data-cards/publications.blade.php index 5c517ef2..3aab0803 100644 --- a/resources/views/livewire/profile-data-cards/publications.blade.php +++ b/resources/views/livewire/profile-data-cards/publications.blade.php @@ -1,5 +1,5 @@ -
-

Publications +
+

Publications @if($editable) @if($profile->hasOrcidManagedPublications()) @@ -9,17 +9,23 @@ @endif @endif -

- @foreach($data as $pub) -
- {!! Purify::clean($pub->title) !!} {{$pub->year}} - {{$pub->type}} - @if($pub->url) - - - - @endif -
- @endforeach +

+ @if($paginated) {{ $data->links() }} @endif diff --git a/resources/views/livewire/profile-data-cards/support.blade.php b/resources/views/livewire/profile-data-cards/support.blade.php index 8c4adb15..ea07f2bc 100644 --- a/resources/views/livewire/profile-data-cards/support.blade.php +++ b/resources/views/livewire/profile-data-cards/support.blade.php @@ -1,16 +1,24 @@ -
-

Funding @if($editable) Edit@endif

- @foreach($data as $funding) -
- @if($funding->url) -
{{$funding->title}}
- @else -
{{$funding->title}}
- @endif -
{{$funding->amount}} - {{$funding->sponsor}} [{{$funding->start_date}}@if($funding->end_date)–{{$funding->end_date}}@endif]
- {{ $funding->description }} -
- @endforeach +
+

Funding @if($editable) Edit@endif

+
    + @foreach($data as $funding) +
  • + @if($funding->url) +

    + + {{$funding->title}} + + (opens in a new tab) + +

    + @else +

    {{$funding->title}}

    + @endif +

    {{$funding->amount}} - {{$funding->sponsor}} [{{$funding->start_date}}@if($funding->end_date)–{{$funding->end_date}}@endif]

    + {{ $funding->description }} +
  • + @endforeach +
@if($paginated) {{ $data->links() }} @endif