Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Kyle Fiedler
2012-01-26 18:00:28 -05:00
parent 8b2109ab46 5188826e1a
commit 0708f8d03f
6 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.html
View File

@@ -18,7 +18,7 @@
<script type="text/javascript" src="/static/js/cktsim.js"></script> <script type="text/javascript" src="/static/js/cktsim.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
<script type="text/x-mathjax-config"> <script type="text/x-mathjax-config">

14
marketing.html
View File

@@ -15,11 +15,15 @@
<script type="text/javascript" src="/static/js/video_player.js"></script> <script type="text/javascript" src="/static/js/video_player.js"></script>
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> --> <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<script type="text/javascript"> <!--[if lt IE 9]>
$(function(){ <script src="/static/js/html5shiv.js"></script>
$("a[rel*=leanModal]").leanModal(); <![endif]-->
});
</script> <script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/> <%block name="headextra"/>

4
sass/_base.scss
View File

@@ -1,3 +1,7 @@
:focus {
outline-color: #ccc;
}
h1 { h1 {
font-size:1.6em; font-size:1.6em;
margin:20px 0 10px 0; margin:20px 0 10px 0;

17
sass/_index.scss
View File

@@ -103,6 +103,10 @@ body {
color: #444; color: #444;
font: $body-font-size $body-font-family; font: $body-font-size $body-font-family;
:focus {
outline-color: #ccc;
}
h1 { h1 {
font: 800 24px $header-font-family; font: 800 24px $header-font-family;
} }
@@ -188,16 +192,20 @@ header.announcement {
@include border-radius(0 0 3px 3px); @include border-radius(0 0 3px 3px);
background: #333; background: #333;
background: rgba(#000, .7); background: rgba(#000, .7);
padding: lh(.5); padding: lh(.5) lh();
h1 { h1 {
@include inline-block(); @include inline-block();
margin-right: lh(); margin-right: lh(.5);
a { a {
font: italic 800 18px $header-font-family; font: italic 800 18px $header-font-family;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
&:hover, &:focus {
color: $mit-red;
}
} }
} }
@@ -206,9 +214,10 @@ header.announcement {
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
font-style: normal; font-style: normal;
font-family: $header-font-family;
&:hover { &:hover, &:focus {
color: rgba(#fff, .6); color: $mit-red;
} }
} }
} }

1
sass/_local.scss
View File

@@ -16,7 +16,6 @@
.seq_problem_visited { background-color: #ccccaa;} .seq_problem_visited { background-color: #ccccaa;}
.seq_video_visited { background-color: #ccaacc;} .seq_video_visited { background-color: #ccaacc;}
.seq_video_visited { background-color: #cccaac;}
.seq_html_visited { background-color: #caaccc;} .seq_html_visited { background-color: #caaccc;}
.seq_tab_visited { background-color: #aacccc;} .seq_tab_visited { background-color: #aacccc;}
.seq_vertical_visited { background-color: #acaccc;} .seq_vertical_visited { background-color: #acaccc;}

2
sass/_profile.scss
View File

@@ -1,5 +1,5 @@
div.profile-wrapper { div.profile-wrapper {
display: table; @extend .table-wrapper;
section.user-info { section.user-info {
@include box-sizing(border-box); @include box-sizing(border-box);