Commit 54516a95 by Kyle Fiedler

Fix grid and make sure that everything is fluid

parent 6da83900
.container.about { .container.about {
padding: 20px 10px 120px; padding: 20px 30px 120px;
> nav { > nav {
margin-bottom: 80px; margin-bottom: 80px;
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
img { img {
background: rgb(245,245,245); background: rgb(245,245,245);
display: block; display: block;
//height: 200px;
width: 100%; width: 100%;
} }
} }
...@@ -257,14 +256,14 @@ ...@@ -257,14 +256,14 @@
.contact { .contact {
@include clearfix; @include clearfix;
margin: 0 auto; margin: 0 auto;
width: flex-grid(10);
.map { .photo {
background: rgb(245,245,245); @include box-sizing(border-box);
background: rgb(255,255,255);
border: 1px solid rgb(210,210,210);
padding: 1px;
float: left; float: left;
margin-right: flex-gutter(); width: flex-grid(3);
overflow: hidden;
width: flex-grid(6);
img { img {
max-width: 100%; max-width: 100%;
...@@ -275,7 +274,7 @@ ...@@ -275,7 +274,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
float: left; float: left;
padding-left: 40px; padding-left: 40px;
width: flex-grid(6); width: flex-grid(9);
ul { ul {
list-style: none; list-style: none;
......
.container.jobs { .container.jobs {
padding: 60px 0 120px; padding: 60px 30px 120px;
q { q {
display: block; display: block;
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
img { img {
background: rgb(245,245,245); background: rgb(245,245,245);
display: block; display: block;
height: 200px; max-width: 100%;
width: 100%;
} }
} }
...@@ -54,7 +53,7 @@ ...@@ -54,7 +53,7 @@
p { p {
margin-left: 0; margin-left: 0;
font-style: italic; font-style: italic;
line-height: 1.4; line-height: 1.6;
font-size: 1.1em; font-size: 1.1em;
color: #666; color: #666;
} }
...@@ -63,6 +62,7 @@ ...@@ -63,6 +62,7 @@
margin-top: 12px; margin-top: 12px;
display: block; display: block;
color: #a0a0a0; color: #a0a0a0;
font-weight: 300;
} }
} }
} }
......
...@@ -195,9 +195,8 @@ ...@@ -195,9 +195,8 @@
.citizenship, .gender, .date-of-birth { .citizenship, .gender, .date-of-birth {
margin-bottom: 20px; margin-bottom: 20px;
float: left;
.input-wrapper { width: flex-grid(4);
}
label { label {
display: block; display: block;
...@@ -205,36 +204,15 @@ ...@@ -205,36 +204,15 @@
select { select {
width: 100%; width: 100%;
@include box-sizing(border-box);
display: block;
} }
} }
.citizenship, .gender { .citizenship, .gender {
float: left;
width: flex-grid(4);
}
.citizenship {
margin-right: flex-gutter(); margin-right: flex-gutter();
} }
.date-of-birth {
float: left;
width: flex-grid(12);
select {
@include box-sizing(border-box);
display: block;
float: left;
margin-right: flex-gutter();
max-width: flex-grid(4);
width: flex-grid(4);
&:last-child {
margin: 0px;
}
}
}
.submit { .submit {
padding-top: 10px; padding-top: 10px;
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
</nav> </nav>
<section class="contact"> <section class="contact">
<div class="map"> <div class="photo">
<img src="${static.url('images/contact-page.jpg')}"> <img src="${static.url('images/contact-page.jpg')}">
</div> </div>
<div class="contacts"> <div class="contacts">
<h2>Class Feedback</h2> <h2>Class Feedback</h2>
<p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p> <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that&nbsp;class.</p>
<h2>General Inquiries and Feedback</h2> <h2>General Inquiries and Feedback</h2>
<p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p> <p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
</section> </section>
<section class="gender"> <section class="date-of-birth">
<label>Year of birth</label> <label>Year of birth</label>
<div class="input-wrapper"> <div class="input-wrapper">
<select name="year_of_birth"> <select name="year_of_birth">
......
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
</nav> </nav>
<section class="contact"> <section class="contact">
<div class="map"> <div class="photo">
<img src="${static.url('images/contact-page.jpg')}"> <img src="${static.url('images/contact-page.jpg')}">
</div> </div>
<div class="contacts"> <div class="contacts">
<h2>Class Feedback</h2> <h2>Class Feedback</h2>
<p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p> <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that&nbsp;class.</p>
<h2>General Inquiries and Feedback</h2> <h2>General Inquiries and Feedback</h2>
<p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p> <p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
......
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