Skip to content

Commit

Permalink
Merge pull request #344 from web-illinois/develop
Browse files Browse the repository at this point in the history 
Merge to 2.7.3
  • Loading branch information
@bryanjonker-illinois
bryanjonker-illinois authored Apr 26, 2022
2 parents 4899427 + 39a1841 commit f673fba
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_minor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: deploy_cdn
name: deploy_minor
on:
workflow_dispatch:
env:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "il-toolkit",
"version": "2.7.2",
"version": "2.7.3",
"description": "Web toolkit",
"repository": "https://github.com/web-illinois/toolkit",
"author": "Web Implementation Guidelines Group",
Expand Down
6 changes: 6 additions & 0 deletions src/css/tables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ table {
border-right: none;
color: var(--il-blue);
}
td:first-of-type {
border-left: 1px solid var(--il-gray-2);
}
td:last-of-type {
border-right: 1px solid var(--il-gray-2);
}
tr:nth-child(odd) {
background-color: var(--il-gray-1);
}
Expand Down
6 changes: 5 additions & 1 deletion src/js/components/layout/responsive-layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ export default class ResponsiveLayout extends LitElement {

updateMode() {
const mode = this.getModes().find(this.matchMode);
this.mode = mode.name;
if (this.mode !== mode.name) {
this._mode = mode.name;
this.mode = mode.name;
this.dispatchModeChange();
}
}
}
274 changes: 274 additions & 0 deletions tests/components/layout/sidebar-components.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
---
title: "Section with full mockup"
group: Layout
layout: layouts/page.njk
stylesheets: ["tests.css", "layout.css"]
---
<il-page>
<header slot="header">
<il-header>

<div slot="wordmark">
<il-unit-wordmark>
<h1>College of Agricultural, Consumer & Environmental Sciences</h1>
</il-unit-wordmark>
</div>

<il-search slot="search"></il-search>

<nav slot="links" class="il-links" aria-label="Top">
<ul>
<li><a id="link-1" href="#">Apply</a></li>
<li><a href="#">Donate</a></li>
<li><a href="#">Contact</a></li>
</ul>
</nav>

<il-nav slot="navigation">
<il-nav-section>
<a href="https://www.google.com" slot="label">About</a>
<ul class="il-subnav">
<li>
<a href="https://www.google.com">Overview of ACES</a>
</li>
<li>
<a href="#">Programs of Study</a>
</li>
<li>
<a href="#">Diversity</a>
</li>
<li>
<a href="#">Contact Us</a>
</li>
<li>
<a href="#">Visit</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">Academics</a>
<ul class="il-subnav">
<li>
<a href="#">Programs of Study</a>
</li>
<li>
<a href="#">Future Students</a>
</li>
<li>
<a href="#">Admissions</a>
</li>
<li>
<a href="#">Student Life</a>
</li>
<li>
<a href="#">Current Students</a>
</li>
<li>
<a href="#">Study Abroad</a>
</li>
<li>
<a href="#">Career Services</a>
</li>
<li>
<a href="#">Student Diversity and Inclusion</a>
</li>
<li>
<a href="#">Contact Us</a>
</li>
<li>
<a href="#">Staff</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">Research</a>
<ul class="il-subnav">
<li>
<a href="#">Research Areas</a>
</li>
<li>
<a href="#">Research History</a>
</li>
<li>
<a href="#">Facilities</a>
</li>
<li>
<a href="#">Resources</a>
</li>
<li>
<a href="#">Safety and Compliance</a>
</li>
<li>
<a href="#">Civil Rights</a>
</li>
<li>
<a href="#">Staff</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">Extension</a>
<ul class="il-subnav">
<li>
<a href="#">About</a>
</li>
<li>
<a href="#">Staff</a>
</li>
<li>
<a href="#">Programs</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">International</a>
<ul class="il-subnav">
<li>
<a href="#">About</a>
</li>
<li>
<a href="#">International Engagements</a>
</li>
<li>
<a href="#">Resources</a>
</li>
<li>
<a href="#">Newsletter &amp; Publications</a>
</li>
<li>
<a href="#">Study Abroad</a>
</li>
<li>
<a href="#">Contact Us</a>
</li>
<li>
<a href="#">Events</a>
</li>
<li>
<a href="#">Staff</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">News</a>
<ul class="il-subnav">
<li>
<a href="#">Events</a>
</li>
<li>
<a href="#">#askACES Podcast</a>
</li>
<li>
<a href="#">Voices of ACES Blog</a>
</li>
<li>
<a href="#">Subscribe</a>
</li>
<li>
<a href="#">ACES Seminars</a>
</li>
<li>
<a href="#">COVID-19</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">People</a>
<ul class="il-subnav">
<li>
<a href="#">College Leadership</a>
</li>
<li>
<a href="#">Academic Department Heads</a>
</li>
<li>
<a href="#">Academic Units</a>
</li>
<li>
<a href="#">Administrative Units</a>
</li>
</ul>
</il-nav-section>
<il-nav-section>
<a href="#" slot="label">Giving</a>
<ul class="il-subnav">
<li>
<a href="#">With ACES Priorities</a>
</li>
<li>
<a href="#">Ways to Give</a>
</li>
<li>
<a href="#">Give Now</a>
</li>
<li>
<a href="#">Alumni Association</a>
</li>
<li>
<a href="#">Student Committee</a>
</li>
<li>
<a href="#">4-H Foundation</a>
</li>
</ul>
</il-nav-section>
</il-nav>

</il-header>
</header>

<il-section-with-sidebar>
<il-section-nav slot="sidebar">
<h3>
<a href="#">Programs of Study</a>
</h3>
<ul>
<li>
<a href="#">Undergraduate Degrees</a>
<ul>
<li>
<a href="#">Animal Sciences Major</a>
<ul>
<li>
<a href="#" id="link">Companion Animal Equine Science Active Page</a>
</li>
<li>
<a href="#">Food Animal Production and Management</a>
</li>
<li>
<a href="#">Science, Pre-Veterinary, and Medical</a>
</li>
</ul>
</li>
<li>
<a href="#">Computer Science &amp; Animal Science</a>
</li>
<li>
<a href="#">Minors</a>
</li>
<li>
<a href="#">Focus Areas</a>
</li>
<li>
<a href="#">Experiential Learning</a>
</li>
<li>
<a href="#">FAQ</a>
</li>
</ul>
</li>
<li>
<a href="#">Graduate Degrees</a>
</li>
<li>
<a href="#">Certificates</a>
</li>
</ul>
</il-section-nav>
<div class="layout-content">Content</div>
</il-section-with-sidebar>

<div slot="footer">
<div class="layout-content">Footer</div>
</div>
</il-page>
39 changes: 39 additions & 0 deletions tests/stylesheets/typography/tables.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
title: Tables
group: Typography
layout: layouts/page.njk
---
<div class="il-formatted">
<div style="margin: 50px;">
<table>
<thead>
<tr>
<th>&nbsp;</th>
<th>Size</th>
<th>Quantity</th>
<th>Price</th>
</tr>
</thead>
<tbody>
<tr>
<th>Item #1</th>
<td>Super-duper Large</td>
<td>1578</td>
<td>$114.45</td>
</tr>
<tr>
<th>Item #2</th>
<td>Medium</td>
<td>4476</td>
<td>$45.22</td>
</tr>
<tr>
<th>Item #3</th>
<td>Teeny-tiny</td>
<td>7454</td>
<td>$2.33</td>
</tr>
</tbody>
</table>
</div>
</div>

0 comments on commit f673fba

Please sign in to comment.