Merge pull request #505 from MITx/feature/tomg/fall-design

Feature/tomg/fall design
This commit is contained in:
Calen Pennington
2012-08-22 13:34:39 -07:00
5 changed files with 39 additions and 10 deletions

View File

@@ -1,7 +1,7 @@
body {
min-width: 980px;
min-height: 100%;
background: url(../images/bg-texture.png) #ddd;
background: url(../images/bg-texture.png) #d6d6d6;
}
body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label {

View File

@@ -32,15 +32,20 @@ nav.course-material {
font-size: 14px;
font-weight: bold;
text-decoration: none;
// text-shadow: 0 1px 0 rgba(0, 0, 0, .4);
&:hover {
color: #333;
background: rgba(255, 255, 255, .4);
background: rgba(255, 255, 255, .6);
}
&.active {
color: $blue;
background: rgba(255, 255, 255, .8);
// background: rgba(0, 0, 0, .2);
@include linear-gradient(top, rgba(0, 0, 0, .4), rgba(0, 0, 0, .25));
background-color: transparent;
@include box-shadow(0 1px 0 rgba(255, 255, 255, .5), 0 1px 1px rgba(0, 0, 0, .3) inset);
color: #fff;
text-shadow: 0 1px 0 rgba(0, 0, 0, .4);
}
}
}

View File

@@ -38,22 +38,26 @@ section.wiki {
float: left;
margin-right: 10px;
font-size: 0.9em;
line-height: 31px;
a {
display: inline-block;
max-width: 200px;
float: left;
display: block;
overflow: hidden;
height: 30px;
height: 30px;
line-height: 31px;
max-width: 200px;
height: 100%;
text-overflow: ellipsis;
white-space: nowrap;
}
&:after {
content: '';
display: inline-block;
display: inline;
margin-left: 10px;
color: $base-font-color;
height: 30px;
line-height: 31px;
}
}
}