Skip to content

Commit

Permalink
Updated look
Browse files Browse the repository at this point in the history
  • Loading branch information
csbao committed Jul 8, 2016
1 parent 8a16835 commit 9a6db69
Show file tree
Hide file tree
Showing 82 changed files with 850 additions and 591 deletions.
75 changes: 52 additions & 23 deletions css/stylesheets/myapp.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,41 @@ a {
}

/* line 14, ../sass/_main.scss */
.mdl-mini-footer {
background-color: white;
margin-top: -10px;
}

/* line 19, ../sass/_main.scss */
.thin-border {
margin-top: -15px;
border-top: 1px solid rgba(0, 0, 0, 0.12);
}

/* line 19, ../sass/_main.scss */
/* line 24, ../sass/_main.scss */
.project-border {
border-top: 1px solid rgba(0, 0, 0, 0.12);
}

/* line 28, ../sass/_main.scss */
.limit-border {
width: 90%;
margin: 0 auto;
}

/* line 33, ../sass/_main.scss */
.inset {
background: #f0f0f0;
padding-right: 10px;
padding-left: 10px;
}

/* line 40, ../sass/_main.scss */
a {
width: auto !important;
}

/* line 23, ../sass/_main.scss */
/* line 44, ../sass/_main.scss */
.vertical-line {
border-left: rgba(0, 0, 0, 0.12) 1px solid;
padding-right: 20px;
Expand All @@ -53,14 +77,14 @@ a {
* if you want a picture instead of a gradient in the header.
*/
/* Resizes logo to fit in the navbar */
/* line 34, ../sass/_main.scss */
/* line 55, ../sass/_main.scss */
.site-logo {
width: 230px;
height: 36px;
}

/* Adds a gradient to this */
/* line 40, ../sass/_main.scss */
/* line 61, ../sass/_main.scss */
.mdl-layout__header {
background: #525252;
/* fallback for old browsers */
Expand All @@ -70,72 +94,72 @@ a {
/* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
}

/* line 50, ../sass/_main.scss */
/* line 71, ../sass/_main.scss */
.is-small-screen .mdl-layout-title {
display: block;
margin-left: auto;
margin-right: auto;
}
/* line 55, ../sass/_main.scss */
/* line 76, ../sass/_main.scss */
.is-small-screen .edit_desktop {
display: none;
}

/* line 60, ../sass/_main.scss */
/* line 81, ../sass/_main.scss */
.spacer {
flex-grow: 1;
}

/* line 64, ../sass/_main.scss */
/* line 85, ../sass/_main.scss */
.description {
font-size: 12px;
text-indent: 10px;
color: grey;
}

/* line 71, ../sass/_main.scss */
/* line 92, ../sass/_main.scss */
.descrip-title {
font-size: 12px;
text-transform: uppercase;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}

/* highlight navbar on hover */
/* line 79, ../sass/_main.scss */
/* line 100, ../sass/_main.scss */
.highlight:hover {
color: #37474f;
}

/* line 84, ../sass/_main.scss */
/* line 105, ../sass/_main.scss */
.active .text {
color: #37474f;
}

/* line 89, ../sass/_main.scss */
/* line 110, ../sass/_main.scss */
.inactive-text {
color: dark-grey;
}

/* slick carousel css */
/* line 95, ../sass/_main.scss */
/* line 116, ../sass/_main.scss */
.banner-background {
background-color: #f3f3f3;
-webkit-box-shadow: 0px 2px 2px #c3c3c3;
-moz-box-shadow: 0px 2px 2px #c3c3c3;
box-shadow: 0px 2px 2px #c3c3c3;
}

/* line 102, ../sass/_main.scss */
/* line 123, ../sass/_main.scss */
.inner-content {
padding-right: 60px;
}
/* line 104, ../sass/_main.scss */
/* line 125, ../sass/_main.scss */
.inner-content .format-content {
padding-top: 15px;
margin-bottom: 15px;
}

/* line 112, ../sass/_main.scss */
/* line 133, ../sass/_main.scss */
.inner-content img {
width: 720px;
height: 340px;
Expand All @@ -144,33 +168,33 @@ a {
}

/* arrow keys */
/* line 120, ../sass/_main.scss */
/* line 141, ../sass/_main.scss */
.slick-prev:before, .slick-next:before {
color: grey !important;
}

/* line 124, ../sass/_main.scss */
/* line 145, ../sass/_main.scss */
.slick-next {
margin-left: 10%;
margin-right: 5%;
}

/* line 129, ../sass/_main.scss */
/* line 150, ../sass/_main.scss */
.mdl-card__media {
background-color: #48617F;
}

/* tab colors */
/* line 135, ../sass/_main.scss */
/* line 156, ../sass/_main.scss */
.mdl-tabs .mdl-tabs__tab.is-active {
color: #48617F;
}
/* line 138, ../sass/_main.scss */
/* line 159, ../sass/_main.scss */
.mdl-tabs .mdl-tabs__tab.is-active.is-active {
color: #48617F;
}

/* line 143, ../sass/_main.scss */
/* line 164, ../sass/_main.scss */
.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after {
background: #48617F;
}
Expand Down Expand Up @@ -287,7 +311,12 @@ a {
height: 320px;
}

/* line 54, ../sass/_card.scss */
/* line 56, ../sass/_card.scss */
.demo-card-square:hover {
opacity: 0.4;
}

/* line 60, ../sass/_card.scss */
.demo-card-square > .mdl-card__title {
color: #fff;
height: auto;
Expand Down
12 changes: 6 additions & 6 deletions events/2011/07/05/070511_euromicro.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@


<a class="mdl-navigation__link highlight" href="/publications/">
<div class="inactive-text"><i class="material-icons md-18" role="presentation">book</i>&nbsp;Publications </div>
<div class="inactive-text"><i class="material-icons md-18" role="presentation">turned_in_not</i>&nbsp;Publications </div>
</a>


Expand All @@ -114,7 +114,7 @@


<a class="mdl-navigation__link" href="/events/">
<i class="material-icons md-18" role="presentation"></i> Events
<i class="material-icons md-18" role="presentation">perm_contact_calendar</i> Events
</a>


Expand All @@ -126,7 +126,7 @@


<a class="mdl-navigation__link" href="/news/">
<i class="material-icons md-18" role="presentation"></i> News
<i class="material-icons md-18" role="presentation">dashboard</i> News
</a>


Expand All @@ -144,7 +144,7 @@


<a class="mdl-navigation__link" href="/publications/">
<i class="material-icons md-18" role="presentation">book</i> Publications
<i class="material-icons md-18" role="presentation">turned_in_not</i> Publications
</a>


Expand Down Expand Up @@ -304,13 +304,13 @@ <h2 id="committees">COMMITTEES</h2>
</main>
<footer class="mdl-mini-footer">
<div class="mdl-mini-footer__left-section">
<div class="mdl-logo">Systems Research Lab</div>
<i class="material-icons md-12" role="presentation">&#xE409;</i>Systems Research Lab
<ul class="mdl-mini-footer__link-list">
<li><a class="highlight" href="http://ucsc.edu/">UCSC Home</a></li>
<li><a class="highlight" href="http://soe.ucsc.edu/">BSOE Home</a></li>
<li><a class="highlight" href="http://issdm.soe.ucsc.edu/">ISSDM Home</a></li>
<div class="edit_desktop">
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/070511_euromicro.md">Edit on GitHub</a></li>
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/070511_euromicro.md"><i class="material-icons md-12" role="presentation">&#xE254;</i>Edit on GitHub</a></li>
</div>
</ul>

Expand Down
12 changes: 6 additions & 6 deletions events/2011/07/28/072811_nas.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@


<a class="mdl-navigation__link highlight" href="/publications/">
<div class="inactive-text"><i class="material-icons md-18" role="presentation">book</i>&nbsp;Publications </div>
<div class="inactive-text"><i class="material-icons md-18" role="presentation">turned_in_not</i>&nbsp;Publications </div>
</a>


Expand All @@ -114,7 +114,7 @@


<a class="mdl-navigation__link" href="/events/">
<i class="material-icons md-18" role="presentation"></i> Events
<i class="material-icons md-18" role="presentation">perm_contact_calendar</i> Events
</a>


Expand All @@ -126,7 +126,7 @@


<a class="mdl-navigation__link" href="/news/">
<i class="material-icons md-18" role="presentation"></i> News
<i class="material-icons md-18" role="presentation">dashboard</i> News
</a>


Expand All @@ -144,7 +144,7 @@


<a class="mdl-navigation__link" href="/publications/">
<i class="material-icons md-18" role="presentation">book</i> Publications
<i class="material-icons md-18" role="presentation">turned_in_not</i> Publications
</a>


Expand Down Expand Up @@ -221,13 +221,13 @@ <h2 id="important-dates">Important dates</h2>
</main>
<footer class="mdl-mini-footer">
<div class="mdl-mini-footer__left-section">
<div class="mdl-logo">Systems Research Lab</div>
<i class="material-icons md-12" role="presentation">&#xE409;</i>Systems Research Lab
<ul class="mdl-mini-footer__link-list">
<li><a class="highlight" href="http://ucsc.edu/">UCSC Home</a></li>
<li><a class="highlight" href="http://soe.ucsc.edu/">BSOE Home</a></li>
<li><a class="highlight" href="http://issdm.soe.ucsc.edu/">ISSDM Home</a></li>
<div class="edit_desktop">
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/072811_nas.md">Edit on GitHub</a></li>
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/072811_nas.md"><i class="material-icons md-12" role="presentation">&#xE254;</i>Edit on GitHub</a></li>
</div>
</ul>

Expand Down
12 changes: 6 additions & 6 deletions events/2011/10/18/101811_symposium.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@


<a class="mdl-navigation__link highlight" href="/publications/">
<div class="inactive-text"><i class="material-icons md-18" role="presentation">book</i>&nbsp;Publications </div>
<div class="inactive-text"><i class="material-icons md-18" role="presentation">turned_in_not</i>&nbsp;Publications </div>
</a>


Expand All @@ -114,7 +114,7 @@


<a class="mdl-navigation__link" href="/events/">
<i class="material-icons md-18" role="presentation"></i> Events
<i class="material-icons md-18" role="presentation">perm_contact_calendar</i> Events
</a>


Expand All @@ -126,7 +126,7 @@


<a class="mdl-navigation__link" href="/news/">
<i class="material-icons md-18" role="presentation"></i> News
<i class="material-icons md-18" role="presentation">dashboard</i> News
</a>


Expand All @@ -144,7 +144,7 @@


<a class="mdl-navigation__link" href="/publications/">
<i class="material-icons md-18" role="presentation">book</i> Publications
<i class="material-icons md-18" role="presentation">turned_in_not</i> Publications
</a>


Expand Down Expand Up @@ -206,13 +206,13 @@ <h3>Third Annual SRL/ISSDM Research Symposium and UCSC Systems Oktoberfest</h3>
</main>
<footer class="mdl-mini-footer">
<div class="mdl-mini-footer__left-section">
<div class="mdl-logo">Systems Research Lab</div>
<i class="material-icons md-12" role="presentation">&#xE409;</i>Systems Research Lab
<ul class="mdl-mini-footer__link-list">
<li><a class="highlight" href="http://ucsc.edu/">UCSC Home</a></li>
<li><a class="highlight" href="http://soe.ucsc.edu/">BSOE Home</a></li>
<li><a class="highlight" href="http://issdm.soe.ucsc.edu/">ISSDM Home</a></li>
<div class="edit_desktop">
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/101811_symposium.md">Edit on GitHub</a></li>
<li><a class="highlight" href="https://github.com/systemslab/systemslab.github.io/edit/master/_events/101811_symposium.md"><i class="material-icons md-12" role="presentation">&#xE254;</i>Edit on GitHub</a></li>
</div>
</ul>

Expand Down
Loading

0 comments on commit 9a6db69

Please sign in to comment.