Skip to content

Commit

Permalink
Merge pull request #7 from byuweb/brady/faculty-directory
Browse files Browse the repository at this point in the history
fix line height
  • Loading branch information
BradyHammond authored Oct 30, 2017
2 parents 87e3cda + 6e867aa commit e7a00c2
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 81 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}

@mixin contact() {
margin: 32px 0px 16px 0px;
margin: 36px 0px 16px 0px;
}

@mixin columnBase() {
Expand Down Expand Up @@ -90,7 +90,7 @@
}

@mixin slottedHeader() {
margin-top: 6px;
margin-top: 0px;
}

@mixin slottedHeaderDiv() {
Expand All @@ -111,6 +111,7 @@
color: #515151;
font-family: "Gotham Book", Helvetica, sans-serif;
font-weight: 200;
line-height: 20px;
margin: 24px auto 24px auto;
min-width: 250px;
width: 1024px;
Expand Down Expand Up @@ -141,7 +142,7 @@

@mixin sectionHeader() {
color: #002E5D;
margin: 15px 0px 0px 0px;
margin: 12px 0px 0px 0px;
}

@mixin showHiddenImage() {
Expand Down
8 changes: 4 additions & 4 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</byu-header>

<!--===== DEMO PT 1 =====-->
<!--<div class=faculty-listing-header>
<div class=faculty-listing-header>
<h1>
Faculty Profiles
</h1>
Expand Down Expand Up @@ -136,10 +136,10 @@ <h2 slot="listing-name">James Archibald</h2>
In 1994-1995 he was a visiting professor at the Swiss Federal Institute
of Technology in Zurich. Dr. Archibald's current research interests are
in the areas of real-time computer vision systems and autonomous agents.</p>
</byu-faculty-listing>-->
</byu-faculty-listing>

<!--===== DEMO PT 2 =====-->
<byu-faculty-profile background-image="./test_image_5.jpg" faculty-image="./test_image.png">
<!--<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 +168,7 @@ <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>
</byu-faculty-profile>-->
<byu-footer></byu-footer>
</body>
</html>
32 changes: 0 additions & 32 deletions dist/byu-faculty-directory.css

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

2 changes: 1 addition & 1 deletion dist/byu-faculty-directory.css.map

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions dist/byu-faculty-directory.min.css

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

2 changes: 1 addition & 1 deletion dist/byu-faculty-directory.min.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/components-compat.js

Large diffs are not rendered by default.

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.

4 changes: 2 additions & 2 deletions dist/components.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

0 comments on commit e7a00c2

Please sign in to comment.