Skip to content

Commit

Permalink
Merge pull request #391 from web-illinois/jonker/issuesfor2-13
Browse files Browse the repository at this point in the history
Jonker/issuesfor2 13
  • Loading branch information
mattsharkey authored Oct 12, 2022
2 parents 6b5109e + 38e08d3 commit 438c17c
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/css/components/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ il-card, .il-card, .il-formatted il-card, .il-formatted .il-card {
color: var(--il-card-link-focus-color, var(--il-card-link-color));
outline: var(--il-card-link-focus-outline);
}

&.il-button:focus, &.il-button:hover {
color: var(--il-focused-button-foreground-color);
}
}

h2, h3, h4, h5, h6 {
Expand Down
3 changes: 2 additions & 1 deletion src/css/components/_image-feature.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@

.il-align-right il-image-feature, il-image-feature.il-align-right,
.il-float-left il-image-feature, il-image-feature.il-float-left,
.il-align-right il-video-feature, il-video-feature.il-align-right {
.il-align-right il-video-feature, il-video-feature.il-align-right,
.il-float-left il-video-feature, il-video-feature.il-float-left {
--il-image-feature-flex-direction: row-reverse;
}

Expand Down
1 change: 1 addition & 0 deletions src/js/components/header/header.css.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default css`
.campus svg {
fill: var(--il-blue);
transition: fill .3s;
}
.campus a:focus svg, .campus a:hover svg {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions tests/components/video-feature/float.njk
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
title: Video Feature (float option)
group: "Components: Video Feature"
layout: layouts/page.njk
---
<div class="il-formatted">
<h2>No option</h2>
<p><em>Pulled out video for visual testing -- can use https://mediaspace.illinois.edu/media/t/1_0o2ypqvp</em></p>
<il-video-feature src="">
<h3>Student Life</h3>
<p>Animal sciences students extend their learning and career networks beyond
the classroom through internships, judging teams, student organizations, undergraduate research
projects with our faculty, as well as short- and long-term study abroad opportunities all over the world. </p>
<a href="#" class="il-button">Subscribe</a>
<a href="#" class="il-button">Find a departmental advisor</a>
</il-video-feature>

<h2>Float Left</h2>
<p><em>Pulled out video for visual testing -- can use https://mediaspace.illinois.edu/media/t/1_0o2ypqvp</em></p>
<il-video-feature class="il-float-left" src="">
<h3>Student Life</h3>
<p>Animal sciences students extend their learning and career networks beyond
the classroom through internships, judging teams, student organizations, undergraduate research
projects with our faculty, as well as short- and long-term study abroad opportunities all over the world. </p>
<a href="#" class="il-button">Subscribe</a>
<a href="#" class="il-button">Find a departmental advisor</a>
</il-video-feature>

<h2>Float Right</h2>
<p><em>Pulled out video for visual testing -- can use https://mediaspace.illinois.edu/media/t/1_0o2ypqvp</em></p>
<il-video-feature class="il-float-right" src="">
<h3>Student Life</h3>
<p>Animal sciences students extend their learning and career networks beyond
the classroom through internships, judging teams, student organizations, undergraduate research
projects with our faculty, as well as short- and long-term study abroad opportunities all over the world. </p>
<a href="#" class="il-button">Subscribe</a>
<a href="#" class="il-button">Find a departmental advisor</a>
</il-video-feature>

</div>
12 changes: 12 additions & 0 deletions tests/components/video-feature/float.vis.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const util = require('../../tests.util');

const url = util.testUrl(__filename);

module.exports = (viewports) => {
return [
{
url, label: "videofeature-float",
viewports: [viewports.desktop, viewports.iphone, viewports.hdtv]
}
]
}

0 comments on commit 438c17c

Please sign in to comment.