Skip to content

Commit

Permalink
Merge pull request #435 from FitzwilliamMuseum/issue-432-footer-css
Browse files Browse the repository at this point in the history
Fix css and add SVG
  • Loading branch information
portableant authored May 28, 2022
2 parents ac8d482 + 8530184 commit 121dc72
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 28 deletions.
2 changes: 1 addition & 1 deletion public/css/fitzwilliam.css

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions public/images/logos/by-nc-nd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=0566922439f19b3a6b59bb845fd54251",
"/css/app.css": "/css/app.css?id=e8c524b8f4ccb36bd05047c1944f16d0",
"/css/fitzwilliam.css": "/css/fitzwilliam.css?id=f1251539ba49761e4c45e7d4e78eeaaa"
"/css/fitzwilliam.css": "/css/fitzwilliam.css?id=062889d56e9323545e9da2ad85b8ce30"
}
29 changes: 19 additions & 10 deletions resources/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,25 @@ h5 > a:hover::before {
visibility: visible;
transform: scaleX(1);
}


.open-link a {
color: #fff;
}
.btn-circle.btn-xl {
width: 50px;
height: 50px;
padding: 10px 16px;
border-radius: 35px;
font-size: 12px;
text-align: center;
}
.form-control {
border-radius: 0;
}
a {
background-color: transparent;
color: #731100;
text-decoration: none;
}
.free_ticket a {
color: #fff !important;
}
Expand Down Expand Up @@ -469,14 +486,6 @@ a.nav-link {
margin-bottom: 0;
}

.btn {
border-radius: 0;
}

.form-control {
border-radius: 0;
}

a.text-center.btn.btn-outline-light.btn__book {
border: 4px solid white;
}
Expand Down
4 changes: 3 additions & 1 deletion resources/views/highlights/details.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ class="btn btn-dark mr-2 mt-2">{{$record['period_assigned']}}</a>
@endif
@if(isset($record['themes']))
@foreach($record['themes'] as $th)
<a href="{{route('theme', [$th]) }}" class="btn btn-dark mr-2 mt-2">{{str_replace('-',' ',$th)}}</a>
<a href="{{route('theme', [$th]) }}" class="btn btn-dark mr-2 mt-2">
{{str_replace('-',' ',$th)}}
</a>
@endforeach
@endif
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/includes/structure/email-signup.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<div class="btn-sign rounded-left rounded-right">
<div class="btn-sign-box"></div>
<div class="btn-sign-text">
<h3>
<h5>
<a href="https://tickets.museums.cam.ac.uk/account/create" class="stretch-link">
Sign up for updates
</a>
</h3>
</h5>
<p class="text-center">Updates about future exhibitions and displays, family activities, virtual
events & news. You'll be the first to know...</p>
</div>
Expand Down
22 changes: 9 additions & 13 deletions resources/views/learning/lookthinkdoactivity.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@ class="img-fluid" alt="{{ $look['title_of_work'] }}" loading="lazy"
height="{{ $look['focus_image']['height'] }}"
/>
</figure>
<span class="btn btn-dark m-1 p-2 share">
<a href="{{ $look['focus_image']['data']['full_url'] }}" target="_blank"
download><i class="fas fa-download mr-2"></i> Download this image</a>
</span>
<span class="btn btn-dark p-2">
<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img
alt="Creative Commons Licence"
src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png"/></a></span>
<a class="btn btn-dark m-1 p-2" href="{{ $look['focus_image']['data']['full_url'] }}" target="_blank"
download>@svg('fas-download', ['width' => 15, 'height'=> 15]) Download this image</a>
<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">
<img alt="Creative Commons Licence" src="{{ asset('/images/logos/by-nc-nd.svg') }}"/></a>
</div>
@if(!is_null($look['main_text_description']))

Expand Down Expand Up @@ -112,11 +108,11 @@ class="img-fluid" alt="{{ $look['title_of_work'] }}" loading="lazy"
@if(!is_null($look['associated_pharos'][0]['pharos_id']['image']))
<a href="{{ route('highlight', $look['associated_pharos'][0]['pharos_id']['slug']) }}">
<img class="img-fluid"
src="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['url']}}"
alt="{{ $look['associated_pharos'][0]['pharos_id']['image_alt_text'] }}"
loading="lazy"
width="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['width'] }}"
height="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['height'] }}"
src="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['url']}}"
alt="{{ $look['associated_pharos'][0]['pharos_id']['image_alt_text'] }}"
loading="lazy"
width="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['width'] }}"
height="{{ $look['associated_pharos'][0]['pharos_id']['image']['data']['thumbnails'][4]['height'] }}"
/></a>
@endif
<div class="card-body h-100">
Expand Down

0 comments on commit 121dc72

Please sign in to comment.