Skip to content

Commit

Permalink
Merge pull request #13 from ben-mur64/master
Browse files Browse the repository at this point in the history
Added slots, updated demo
  • Loading branch information
ben-mur64 authored Jan 11, 2019
2 parents a599c42 + 4978c71 commit 6b957a1
Show file tree
Hide file tree
Showing 11 changed files with 2,385 additions and 2,873 deletions.
40 changes: 40 additions & 0 deletions components/byu-faculty-profile/byu-faculty-profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,45 @@ <h3>Links</h3>
<slot class="card-slot" name="faculty-custom-body">No Information</slot>
</div>
</div>
<div class="card education-card hide">
<div class="click-area">
<table>
<tbody>
<tr>
<td class="card-title-wrapper">
<h3>Education</h3>
</td>
<td class="card-chevron-wrapper">
<img class="chevron svg-md" src="./Chevron-Right.svg">
<img class="chevron svg-md hide" src="./Chevron-Down.svg">
</td>
</tr>
</tbody>
</table>
</div>
<div class="card-content">
<slot class="card-slot" name="faculty-education">No Information</slot>
</div>
</div>
<div class="card cv-card hide">
<div class="click-area">
<table>
<tbody>
<tr>
<td class="card-title-wrapper">
<h3>Curriculum Vitae</h3>
</td>
<td class="card-chevron-wrapper">
<img class="chevron svg-md" src="./Chevron-Right.svg">
<img class="chevron svg-md hide" src="./Chevron-Down.svg">
</td>
</tr>
</tbody>
</table>
</div>
<div class="card-content">
<slot class="card-slot" name="faculty-cv">No Information</slot>
</div>
</div>
</div>
</div>
17 changes: 14 additions & 3 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<!--===== DEMO PT 1 =====-->
<div class=faculty-listing-header>
<h1>
Faculty Profiles
Faculty Listing Examples
</h1>
</div>
<byu-faculty-listing id="demo" faculty-image="./test_image.png" faculty-profile-link="https://home.byu.edu/home/">
Expand Down Expand Up @@ -139,7 +139,16 @@ <h2 slot="listing-name">James Archibald</h2>
</byu-faculty-listing>

<!--===== DEMO PT 2 =====-->
<!--<byu-faculty-profile background-image="./test_image_5.jpg" faculty-image="./test_image.png">
<br />
<br />
<br />
<div class=faculty-listing-header>
<h1>
Faculty Profile Example
</h1>
</div>

<byu-faculty-profile background-image="./test_image_5.jpg" faculty-image="./test_image.png">
<div slot="faculty-name">Bradley R. Adams</div>
<span slot="faculty-title">Associate Professor</span>
<span slot="faculty-office">265 Crabtree</span>
Expand Down Expand Up @@ -168,7 +177,9 @@ <h2 slot="listing-name">James Archibald</h2>
<div slot="faculty-custom-header">Custom Header</div>
<p slot="faculty-custom-body">This is a card that can be used for custom
content.</p>
</byu-faculty-profile>-->
<p slot="faculty-education">This is where the faculty education goes!</p>
<p slot="faculty-cv">This is where the CV goes!</p>
</byu-faculty-profile>
<byu-footer></byu-footer>
</body>
</html>
2 changes: 1 addition & 1 deletion dist/components-compat.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/components-compat.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components-compat.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components-compat.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 6b957a1

Please sign in to comment.