Skip to content

Commit

Permalink
homepage block images and video play button styles. Deals with #281.
Browse files Browse the repository at this point in the history
  • Loading branch information
knice committed Aug 26, 2014
1 parent 9316857 commit ad17db6
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
8 changes: 8 additions & 0 deletions app/examples/pages/department-home.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ front: true
classes: "dept home"
---

<div class="row three separate dark">
<div class="wrap"><div class="block profile-block" id="profile"><h3 class="block-header">Uncommon&nbsp;<span>People</span></h3><div class="inner"><img alt="Juned Shaikh" class="block-image" src="http://history-dev.ucsc.edu/news-events/profiles/images/Juned_Shaikh-profile-thumbnail.jpg?t=0"><a class="upTitle" href="news-events/profiles/juned-shaikh.html">Juned Shaikh<br></a><p>The History Department is delighted to welcome Assistant Professor Juned Shaikh<a class="continu" href="news-events/profiles/juned-shaikh.html">
Continue»
</a></p></div></div></div>
<div class="wrap"><div class="block news-block" id="news"><h3 class="block-header">History&nbsp;<span>News</span></h3><div class="inner"><ul class="archive-list"><li><a href="news-events/news/ohara-hanger-prize.html"><img alt="Matt O'Hara" class="block-image" height="48" src="http://history-dev.ucsc.edu/news-events/images/ohara80w.jpg?t=0"></a><span class="date">December 17, 2013</span><a href="news-events/news/ohara-hanger-prize.html">Professor Matt O'Hara Wins Article Prize</a></li><li><a href="http://news.ucsc.edu/2013/11/delgado-history-awards.html"><img alt="ucsc assistant professor of history Grace Peña Delgado" class="block-image" height="48" src="http://news.ucsc.edu/2013/11/images/grace-delgado-thumb.jpg?t=0"></a><span class="date">November 18, 2013</span><a href="http://news.ucsc.edu/2013/11/delgado-history-awards.html">Grace Delgado wins two Western History Association awards </a></li><li><a href="1213 archives/2012-cosmopolitanism-china-hu.html"><img alt="No text description" class="block-image" height="48" src="http://history-dev.ucsc.edu/news-events/images/mhu1.jpg?t=0"></a><span class="date">August 27, 2012</span><a href="1213 archives/2012-cosmopolitanism-china-hu.html">Associate Professor Minghui Hu hosts Cosmopolitanism in China Conference</a></li></ul><p><a class="more" href="news-events/news/index.html">More news»</a></p></div></div></div>
<div class="wrap last"><div class="block video-block" id="video"><h3 class="block-header">Transformative&nbsp;<span>Teaching</span></h3><div class="inner"><a class="fb thumb_link" href="http://www.youtube.com/watch?v=dQDxRx2GkL0"><img alt="Play button" class="play-button" height="35" src="http://static.ucsc.edu/images/play_btn.png?t=0" width="48"><img alt="YouTube video thumbnail" class="block-image" height="90" src="http://history-dev.ucsc.edu/images/gailphoto_216.jpg?t=0" width="216"></a><a class="fb upTitle" href="http://www.youtube.com/watch?v=dQDxRx2GkL0">Humanities Today: The Transformational Power of Student-Centered Learning</a><p></p><p>History Professor <a href="http://history.ucsc.edu/faculty/profiles/singleton.php?&amp;singleton=true&amp;cruz_id=achristy" title="Christy Profile">Alan Christy</a> presented a TED-style talk at this year's <a href="http://specialevents.ucsc.edu/founders/" title="Founders Celebration">Founders Celebration</a>.</p>&nbsp;<a class="fb continu" href="http://www.youtube.com/watch?v=dQDxRx2GkL0">Watch»</a><p></p></div></div></div>
</div>


<div class="row three separate dark">
<div class="wrap"><div class="block text-block" id="forstudents"><h3 class="block-header">Press&nbsp;<span>Coverage</span></h3><div class="inner"><a href="press-coverage/index.html"><img align="left" alt="Gateway to Press Coverage" height="89" src="http://astro-dev.ucsc.edu/images/home_page_images/Hubble%20Utlra%20Deep%20Field.jpg?t=0" width="216"></a>
Expand Down
2 changes: 2 additions & 0 deletions app/sass/components/_block-images.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@
.block img[width="216"] {
display:block;
width:100%;
margin-bottom: 0.5em;
height: auto;
}
14 changes: 5 additions & 9 deletions app/sass/components/_block-news.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@
li {
clear: both;
line-height:130%;
margin: 0 0 $font-size-base*1.5;
margin: 0 0 1em;
min-height: 80px;
padding: 0;
background-image: none;
list-style-type: none;

.thumbnail {
img {
float: left;
display: block;
margin: 0 0.5em 0.5em 0;
padding:0.25em;
background-color: $sand;
border-radius: $border-radius-base;
img {
width:72px;
height:72px;
}
width:80px;
height:auto;
}

.date {
Expand Down
12 changes: 8 additions & 4 deletions app/sass/components/_block-showcase.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
#forstudents,
#know,
.profile-block,
.video-block {

img {
display:block;
//width:100%;
width:100%;
height:auto;
margin-bottom: em(14);
&.play_btn {

&.play-button {
width:auto;
position:absolute;
margin:0.5em 0 0 0.5em;
padding:0;
opacity: 0.75;
background-color: transparent;
}

}

.title,
Expand Down

0 comments on commit ad17db6

Please sign in to comment.