Commit 799a6846 by David Ormsbee

Merge pull request #315 from MITx/hotfix/kfiedler/css-fixes

Hotfix/kfiedler/css fixes
parents 432fdd18 a2271d4e
...@@ -27,14 +27,17 @@ ...@@ -27,14 +27,17 @@
max-width: 1200px; max-width: 1200px;
min-width: 760px; min-width: 760px;
position: relative; position: relative;
width: 100%;
z-index: 2; z-index: 2;
> div.table {
display: table;
width: 100%;
}
.intro { .intro {
@include box-sizing(border-box); @include box-sizing(border-box);
@include clearfix; @include clearfix;
float: left; display: table-cell;
vertical-align: middle;
padding: 20px 20px; padding: 20px 20px;
position: relative; position: relative;
width: flex-grid(8) + flex-gutter(); width: flex-grid(8) + flex-gutter();
...@@ -130,9 +133,7 @@ ...@@ -130,9 +133,7 @@
.media { .media {
background: transparent; background: transparent;
@include box-sizing(border-box); @include box-sizing(border-box);
display: block; display: table-cell;
float: right;
height: 180px;
padding: 20px; padding: 20px;
position: relative; position: relative;
width: flex-grid(4); width: flex-grid(4);
......
...@@ -2,6 +2,27 @@ ...@@ -2,6 +2,27 @@
@include clearfix; @include clearfix;
padding: 60px 0px 120px; padding: 60px 0px 120px;
.dashboard-banner {
background: $yellow;
border: 1px solid rgb(200,200,200);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
padding: 10px;
margin-bottom: 30px;
&:empty {
display: none;
background-color: #FFF;
}
h2 {
margin-bottom: 0;
}
p {
margin-bottom: 0;
}
}
.profile-sidebar { .profile-sidebar {
background: transparent; background: transparent;
float: left; float: left;
......
...@@ -34,10 +34,11 @@ ...@@ -34,10 +34,11 @@
<section class="container dashboard"> <section class="container dashboard">
<section class="dashboard-banner"> %if message:
${message} <section class="dashboard-banner">
<br/> ${message}
</section> </section>
%endif
<section class="profile-sidebar"> <section class="profile-sidebar">
<header class="profile"> <header class="profile">
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<section class="course-info"> <section class="course-info">
<header class="course-profile"> <header class="course-profile">
<div class="intro-inner-wrapper"> <div class="intro-inner-wrapper">
<div class="table">
<section class="intro"> <section class="intro">
<hgroup> <hgroup>
<h1>${course.number}: ${get_course_about_section(course, "title")}<a href="${reverse('university_profile', args=[course.org])}">${get_course_about_section(course, "university")}</a></h1> <h1>${course.number}: ${get_course_about_section(course, "title")}<a href="${reverse('university_profile', args=[course.org])}">${get_course_about_section(course, "university")}</a></h1>
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
</div> </div>
% endif % endif
</div> </div>
</div>
</header> </header>
<section class="container"> <section class="container">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment