Skip to content

E
edx-platform
Commit 2d3ebff2 by Kyle Fiedler
Options

IE6 & 7 fixeS

parent 3d552243
Showing with 31 additions and 11 deletions
.DS_Store
No preview for this file type
marketing.html
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /--> <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
<![endif]-->
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
......
sass/_index.scss
...@@ -358,7 +358,7 @@ section.index-content { ...@@ -358,7 +358,7 @@ section.index-content {
&.requirements { &.requirements {
clear: both; clear: both;
width: auto; width: 100%;
border-top: 1px solid #E5E5E5; border-top: 1px solid #E5E5E5;
padding-top: lh(); padding-top: lh();
margin-bottom: 0; margin-bottom: 0;
......
sass/_wiki-create.scss
...@@ -27,6 +27,7 @@ form#wiki_revision { ...@@ -27,6 +27,7 @@ form#wiki_revision {
color: #999; color: #999;
float: right; float: right;
text-decoration: underline; text-decoration: underline;
font-weight: normal;
} }
input[type="submit"] { input[type="submit"] {
...@@ -37,18 +38,25 @@ form#wiki_revision { ...@@ -37,18 +38,25 @@ form#wiki_revision {
#wiki_edit_instructions { #wiki_edit_instructions {
float: left; float: left;
width: flex-grid(3, 9); width: flex-grid(3, 9);
margin-top: lh();
color: #666;
.markdown-example { &:hover {
background-color: $light-gray; color: #333;
padding-top: 5px; }
padding-right: 2px;
padding-bottom: 5px;
padding-left: 5px;
margin-top: 5px; .markdown-example {
margin-bottom: 7px; background-color: #e3e3e3;
margin-left: 5px; text-shadow: 0 1px 0 #fff;
padding: {
top: 5px;
right: 2px;
bottom: 5px;
left: 5px;
}
margin: 5px 0 7px;
line-height: 1.0; line-height: 1.0;
} }
} }
sass/marketing-ie.scss 0 → 100644
body {
margin: 0;
padding: 0;
}
.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
margin: 0;
overflow: hidden;
}
simplewiki_edit.html
...@@ -12,7 +12,7 @@ ${ wiki_article.title } ...@@ -12,7 +12,7 @@ ${ wiki_article.title }
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/> <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div> </div>
${wiki_form} ${wiki_form}
<input type="submit" id="submit_edit" name="edit" value="Edit article" /> <input type="submit" id="submit_edit" name="edit" value="Save Changes" />
<input type="submit" id="submit_delete" name="delete" value="Delete article" /> <input type="submit" id="submit_delete" name="delete" value="Delete article" />
</form> </form>
......
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