Skip to content

E
edx-platform
Commit b2e1ba74 by Kyle Fiedler
Options

Manualy switch over some styles from Fancybox to leanbox

parents b5e40a69 e0251650
Showing with 205 additions and 71 deletions
.hgignore
......@@ -2,3 +2,5 @@ syntax: glob
*.pyc
*~
*.scssc
*.swp
*.orig
index.html
......@@ -4,14 +4,14 @@
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
<a class="" rel="leanModal" href="#login">Log In</a>
</nav>
<section class="course">
<section>
<h1>Circuits &amp; Electronics</h1>
<h2>6.002</h2>
<a class="modal enroll" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a>
</section>
<p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
</section>
......@@ -50,7 +50,7 @@
</section>
<section class="cta">
<a class="modal enroll" href="#enroll">Enroll in Circuits &amp; Electronics</a>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in Circuits &amp; Electronics</a>
</section>
</section>
......@@ -101,21 +101,10 @@
<!-- </div> -->
</section>
<div style="display:none">
<div id="enroll" name="enroll"><%include file="create_account.html" /></div>
</div>
<div style="display:none">
<div id="login"><%include file="login.html" /></div>
</div>
<div style="display:none">
<div id="pwd_reset"><%include file="password_reset_form.html" /></div>
</div>
<div style="display:none">
<div id="reset_done"></div>
</div>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
<div id="login" class="leanModal_box"><%include file="login.html" /></div>
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div>
<script>
......
login.html
......@@ -25,6 +25,6 @@ ${ error }
</form>
<div class="lost-password">
<div id="lost_password"><a class="modal" href="#pwd_reset">Lost password?</a></div>
<div id="lost_password"><a class="" rel="leanModal" href="#pwd_reset">Lost password?</a></div>
</div>
</div>
main.html
......@@ -12,6 +12,7 @@
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.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/cktsim.js"></script>
......@@ -31,15 +32,11 @@
</script>
<script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script>
$(function() {
// Set up FancyBox pop-ups
$("a.modal").fancybox({
'hideOnContentClick': false
});
});
</script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/>
</head>
......@@ -54,38 +51,34 @@ $(function() {
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<ul>
<li><a href="#feedback_div" class="modal">Feedback</a></li>
<li><a href="#calculator_div" class="modal">Calculator</a></li>
<li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
<li><a href="#calculator_div" rel="leanModal">Calculator</a></li>
<li><a href="/s/help.html">Help</a></li>
<li><a href="/logout">Log out</a></li>
</ul>
</footer>
<div style="display:none">
<div id="feedback_div">
Found a bug? Got an idea for improving our system? Let us know.
<div id="feedback_div" class="leanModal_box">
<p>Found a bug? Got an idea for improving our system? Let us know.</p>
<form>
<ol>
<li><label>Subject:</label> <input id="feedback_subject" size=40></li>
<li><label>Feedback: </label><textarea id="feedback_message" cols="40" rows="5"></textarea></li>
<li><label>Subject:</label> <input type="text" id="feedback_subject"></li>
<li><label>Feedback: </label><textarea id="feedback_message"></textarea></li>
<li><input id="feedback_button" type="button" value="Submit"></li>
</ol>
</form>
</div>
</div>
<div style="display:none">
<div id="calculator_div">
<input id="calculator_input" >
<div id="calculator_div" class="leanModal_box">
<input type="text" id="calculator_input">
<input id="calculator_button" type=button value="=&gt;">
<input id="calculator_output" readonly>
<input type="text" id="calculator_output" readonly>
<p>Supported operations: ^ * / + - || ()</p>
<p>Supported suffixes: %kMGTcmunp</p>
<p>Supported operations: ^ * / + - || ()</p>
</div>
</div>
<script>
// Feedback form
......
marketing.html
......@@ -12,23 +12,17 @@
<!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
<script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
<link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script>
$(function() {
// Set up FancyBox pop-ups
$("a.modal").fancybox({
'hideOnContentClick': false
});
});
</script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/>
......
sass/_courseware.scss
......@@ -4,6 +4,17 @@ div.course-wrapper {
div#accordion {
@extend .sidebar;
div#open_close_accordion {
position: absolute;
right: 0px;
width: 20px;
height: 20px;
background: #ccc;
border: 1px solid black;
right: -22px;
top: 5px;
}
h3 {
overflow: hidden;
margin: 0;
......@@ -160,7 +171,7 @@ div.course-wrapper {
float: left;
li {
margin-bottom: 8px;
margin-bottom: 0px;
cursor: pointer;
border: 0;
padding: 0;
......@@ -174,6 +185,14 @@ div.course-wrapper {
&:hover {
color: $mit-red;
}
div {
margin-bottom: 8px;
}
div:empty {
margin-bottom: 0px;
}
}
}
}
......
sass/_fancybox.scss
......@@ -77,20 +77,6 @@ div#fancybox-wrap {
width: auto;
float: none;
}
ul {
list-style: disc outside none;
margin: lh(.5) 0 lh() lh();
li {
list-style: disc outside none;
margin-bottom: lh(.5);
color: #666;
font-size: 14px;
float: none;
}
}
}
}
......
sass/_leanmodal.scss 0 → 100644
#lean_overlay {
position: fixed;
z-index:100;
top: 0px;
left: 0px;
height:100%;
width:100%;
background: #000;
display: none;
}
div.leanModal_box {
@include border-radius(3px);
@include box-shadow(0 0 6px #000);
@include box-sizing(border-box);
display: none;
border: none;
max-width: 600px;
background: #fff;
padding: lh(2);
h1 {
font-size: 24px;
margin-top: 0;
padding-bottom: lh();
border-bottom: 1px solid #eee;
margin-bottom: lh();
}
form {
text-align: left;
div#enroll_error, div#login_error {
-webkit-font-smoothing: antialiased;
background-color: #F50200;
color: #fff;
font-weight: bold;
letter-spacing: 1px;
margin-bottom: lh();
padding: lh(.2);
text-transform: uppercase;
&:empty {
padding: 0;
}
}
ol {
list-style: none;
li {
margin-bottom: lh(.5);
&.terms, &.remember {
float: none;
width: auto;
clear: both;
padding-top: lh();
border-top: 1px solid #eee;
}
&.honor-code {
width: auto;
float: none;
}
label {
display: block;
font-weight: bold;
}
#{$all-text-inputs}, textarea {
width: 100%;
@include box-sizing(border-box);
}
input[type="checkbox"] {
margin-right: 10px;
}
ul {
list-style: disc outside none;
margin: lh(.5) 0 lh() lh();
li {
list-style: disc outside none;
margin-bottom: lh(.5);
color: #666;
font-size: 14px;
float: none;
}
}
}
}
input[type="button"] {
@include button($mit-red);
font-size: 18px;
padding: lh(.5);
}
}
}
div#login {
min-width: 400px;
ol {
li {
width: auto;
float: none;
}
}
}
div.lost-password {
text-align: left;
margin-top: lh();
a {
color: #999;
&:hover {
color: #444;
}
}
}
div#pwd_reset {
p {
margin-bottom: lh();
}
input[type="email"] {
margin-bottom: lh();
}
}
div#feedback_div{
form{
ol {
li {
float: none;
width: 100%;
textarea#feedback_message {
height: 100px;
}
}
}
}
}
sass/application.scss
......@@ -5,7 +5,7 @@
// Base layout
@import "base-variables", "base-extends", "base";
@import "layout";
@import "fancybox";
@import "leanmodal";
// pages
@import "courseware";
......
sass/marketing.scss
......@@ -3,4 +3,4 @@
// pages
@import "index-functions", "index-variables", "index";
@import "fancybox";
@import "leanmodal";
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