diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py index 273c0ff19a..7722b3db6c 100644 --- a/djangoapps/courseware/module_render.py +++ b/djangoapps/courseware/module_render.py @@ -106,8 +106,9 @@ def grade_histogram(module_id): cursor.execute("select courseware_studentmodule.grade,COUNT(courseware_studentmodule.student_id) from courseware_studentmodule where courseware_studentmodule.module_id=%s group by courseware_studentmodule.grade", [module_id]) grades = list(cursor.fetchall()) - print grades grades.sort(key=lambda x:x[0]) # Probably not necessary + if (len(grades) == 1 and grades[0][0] == None): + return [] return grades def render_x_module(user, request, xml_module, module_object_preload): @@ -147,12 +148,21 @@ def render_x_module(user, request, xml_module, module_object_preload): module_object_preload.append(smod) # Grab content content = instance.get_html() + init_js = instance.get_init_js() + destory_js = instance.get_destroy_js() if user.is_staff: + histogram = grade_histogram(module_id) + render_histogram = len(histogram) > 0 content=content+render_to_string("staff_problem_info.html", {'xml':etree.tostring(xml_module), - 'histogram':grade_histogram(module_id)}) + 'module_id' : module_id, + 'render_histogram' : render_histogram}) + if render_histogram: + init_js = init_js+render_to_string("staff_problem_histogram.js", {'histogram' : histogram, + 'module_id' : module_id}) + content = {'content':content, - "destroy_js":instance.get_destroy_js(), - 'init_js':instance.get_init_js(), + "destroy_js":destory_js, + 'init_js':init_js, 'type':module_type} return content diff --git a/djangoapps/courseware/modules/video_module.py b/djangoapps/courseware/modules/video_module.py index 2063c18953..a893d1f3bb 100644 --- a/djangoapps/courseware/modules/video_module.py +++ b/djangoapps/courseware/modules/video_module.py @@ -42,7 +42,8 @@ class Module(XModule): return render_to_string('video.html',{'streams':self.video_list(), 'id':self.item_id, 'position':self.position, - 'name':self.name}) + 'name':self.name, + 'annotations':self.annotations}) def get_init_js(self): '''JavaScript code to be run when problem is shown. Be aware @@ -52,19 +53,23 @@ class Module(XModule): log.debug(u"INIT POSITION {0}".format(self.position)) return render_to_string('video_init.js',{'streams':self.video_list(), 'id':self.item_id, - 'position':self.position}) + 'position':self.position})+self.annotations_init def get_destroy_js(self): - return "videoDestroy(\"{0}\");".format(self.item_id) + return "videoDestroy(\"{0}\");".format(self.item_id)+self.annotations_destroy def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None): XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function) - self.youtube = etree.XML(xml).get('youtube') - self.name = etree.XML(xml).get('name') + xmltree=etree.fromstring(xml) + self.youtube = xmltree.get('youtube') + self.name = xmltree.get('name') self.position = 0 if state != None: state = json.loads(state) if 'position' in state: self.position = int(float(state['position'])) - #log.debug("POSITION IN STATE") - #log.debug(u"LOAD POSITION {0}".format(self.position)) + + self.annotations=[(e.get("name"),self.render_function(e)) \ + for e in xmltree] + self.annotations_init="".join([e[1]['init_js'] for e in self.annotations if 'init_js' in e[1]]) + self.annotations_destroy="".join([e[1]['destroy_js'] for e in self.annotations if 'destroy_js' in e[1]]) diff --git a/djangoapps/student/views.py b/djangoapps/student/views.py index a7b02b5bb1..da9e58c486 100644 --- a/djangoapps/student/views.py +++ b/djangoapps/student/views.py @@ -13,7 +13,7 @@ from django.contrib.auth.models import User from django.core.context_processors import csrf from django.core.mail import send_mail from django.core.validators import validate_email, validate_slug, ValidationError -from django.db import connection +from django.db import IntegrityError from django.http import HttpResponse, Http404 from django.shortcuts import redirect from mitxmako.shortcuts import render_to_response, render_to_string @@ -162,15 +162,6 @@ def create_account(request, post_override=None): - # Confirm username and e-mail are unique. TODO: This should be in a transaction - if len(User.objects.filter(username=post_vars['username']))>0: - js['value']="An account with this username already exists." - return HttpResponse(json.dumps(js)) - - if len(User.objects.filter(email=post_vars['email']))>0: - js['value']="An account with this e-mail already exists." - return HttpResponse(json.dumps(js)) - u=User(username=post_vars['username'], email=post_vars['email'], is_active=False) @@ -178,7 +169,20 @@ def create_account(request, post_override=None): r=Registration() # TODO: Rearrange so that if part of the process fails, the whole process fails. # Right now, we can have e.g. no registration e-mail sent out and a zombie account - u.save() + try: + u.save() + except IntegrityError: + # Figure out the cause of the integrity error + if len(User.objects.filter(username=post_vars['username']))>0: + js['value']="An account with this username already exists." + return HttpResponse(json.dumps(js)) + + if len(User.objects.filter(email=post_vars['email']))>0: + js['value']="An account with this e-mail already exists." + return HttpResponse(json.dumps(js)) + + raise + r.register(u) up = UserProfile(user=u) diff --git a/envs/aws.py b/envs/aws.py index 9ce621c2bd..de770a2399 100644 --- a/envs/aws.py +++ b/envs/aws.py @@ -24,7 +24,6 @@ with open(ENV_ROOT / "env.json") as env_file: ENV_TOKENS = json.load(env_file) SITE_NAME = ENV_TOKENS['SITE_NAME'] -CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN'] BOOK_URL = ENV_TOKENS['BOOK_URL'] MEDIA_URL = ENV_TOKENS['MEDIA_URL'] @@ -47,4 +46,4 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY'] AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"] -DATABASES = AUTH_TOKENS['DATABASES'] \ No newline at end of file +DATABASES = AUTH_TOKENS['DATABASES'] diff --git a/envs/common.py b/envs/common.py index 6a21fafc71..efb6885403 100644 --- a/envs/common.py +++ b/envs/common.py @@ -114,7 +114,6 @@ TEMPLATE_DEBUG = False # Site info SITE_ID = 1 SITE_NAME = "localhost:8000" -CSRF_COOKIE_DOMAIN = '127.0.0.1' HTTPS = 'on' ROOT_URLCONF = 'mitx.urls' IGNORABLE_404_ENDS = ('favicon.ico') @@ -135,13 +134,13 @@ STATIC_ROOT = ENV_ROOT / "staticfiles" # We don't run collectstatic -- this is t # FIXME: We should iterate through the courses we have, adding the static # contents for each of them. (Right now we just use symlinks.) -STATICFILES_DIRS = ( +STATICFILES_DIRS = [ PROJECT_ROOT / "static", ASKBOT_ROOT / "askbot" / "skins", # This is how you would use the textbook images locally # ("book", ENV_ROOT / "book_images") -) +] # Locale/Internationalization TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/envs/dev.py b/envs/dev.py index 1a62eaf382..52796d1c42 100644 --- a/envs/dev.py +++ b/envs/dev.py @@ -73,7 +73,8 @@ DEBUG_TOOLBAR_PANELS = ( ############################ FILE UPLOADS (ASKBOT) ############################# DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' MEDIA_ROOT = ENV_ROOT / "uploads" -MEDIA_URL = "/discussion/upfiles/" +MEDIA_URL = "/static/uploads/" +STATICFILES_DIRS.append(("uploads", MEDIA_ROOT)) FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads" FILE_UPLOAD_HANDLERS = ( 'django.core.files.uploadhandler.MemoryFileUploadHandler', diff --git a/envs/static.py b/envs/static.py new file mode 100644 index 0000000000..1e7adeb9db --- /dev/null +++ b/envs/static.py @@ -0,0 +1,58 @@ +""" +This config file runs the simplest dev environment using sqlite, and db-based +sessions. Assumes structure: + +/envroot/ + /db # This is where it'll write the database file + /mitx # The location of this repo + /log # Where we're going to write log files +""" +from common import * + +STATIC_GRAB = True + +LOGGING = logsettings.get_logger_config(ENV_ROOT / "log", + logging_env="dev", + tracking_filename="tracking.log", + debug=False) + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ENV_ROOT / "db" / "mitx.db", + } +} + +CACHES = { + # This is the cache used for most things. Askbot will not work without a + # functioning cache -- it relies on caching to load its settings in places. + # In staging/prod envs, the sessions also live here. + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + 'LOCATION': 'mitx_loc_mem_cache' + }, + + # The general cache is what you get if you use our util.cache. It's used for + # things like caching the course.xml file for different A/B test groups. + # We set it to be a DummyCache to force reloading of course.xml in dev. + # In staging environments, we would grab VERSION from data uploaded by the + # push process. + 'general': { + 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', + 'KEY_PREFIX': 'general', + 'VERSION': 4, + } +} + +# Dummy secret key for dev +SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' + +############################ FILE UPLOADS (ASKBOT) ############################# +DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' +MEDIA_ROOT = ENV_ROOT / "uploads" +MEDIA_URL = "/discussion/upfiles/" +FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads" +FILE_UPLOAD_HANDLERS = ( + 'django.core.files.uploadhandler.MemoryFileUploadHandler', + 'django.core.files.uploadhandler.TemporaryFileUploadHandler', +) diff --git a/requirements.txt b/requirements.txt index f589c7c732..cadd221efe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ python-memcached django-celery path.py django_debug_toolbar - +django-masquerade diff --git a/settings.py b/settings.py index 84fbac2333..f20f51ffb8 100644 --- a/settings.py +++ b/settings.py @@ -28,7 +28,6 @@ sys.path.append(BASE_DIR + "/mitx/lib") COURSEWARE_ENABLED = True ASKBOT_ENABLED = True -CSRF_COOKIE_DOMAIN = '127.0.0.1' # Defaults to be overridden EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' @@ -116,6 +115,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', #'django.contrib.auth.middleware.AuthenticationMiddleware', 'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware', + 'masquerade.middleware.MasqueradeMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'track.middleware.TrackMiddleware', 'mitxmako.middleware.MakoMiddleware', @@ -146,6 +146,7 @@ INSTALLED_APPS = ( 'circuit', 'perfstats', 'util', + 'masquerade', # Uncomment the next line to enable the admin: # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: diff --git a/static/css/application.css b/static/css/application.css index 55ec0430a2..4d3d26e40c 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -734,10 +734,12 @@ li.calc-main { -ms-transition-delay: 0; -o-transition-delay: 0; transition-delay: 0; - z-index: 9999; + z-index: 99; -webkit-appearance: none; } li.calc-main.open { bottom: -36px; } +li.calc-main.open div#calculator_wrapper form div.input-wrapper div.help-wrapper dl { + display: block; } li.calc-main a.calc { text-indent: -9999px; overflow: hidden; @@ -869,6 +871,7 @@ li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl { right: -40px; top: -110px; width: 500px; + display: none; -webkit-transition-property: all; -moz-transition-property: all; -ms-transition-property: all; @@ -3751,27 +3754,30 @@ nav.sequence-nav ul li.next a { nav.sequence-nav ul li.next a:hover { background-color: none; } -section.course-content div#seq_content { - margin-bottom: 60px; } -section.course-content nav.sequence-bottom { - bottom: -22.652px; +section.course-content { position: relative; } +section.course-content nav.sequence-bottom { + margin: 45.304px 0 0; + text-align: center; } section.course-content nav.sequence-bottom ul { background-color: #f2e7bf; background-color: #f2e7bf; border: 1px solid #e4d080; - border-bottom: 0; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - -ms-border-radius: 3px 3px 0 0; - -o-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: inset 0 0 0 1px #faf7e9; -moz-box-shadow: inset 0 0 0 1px #faf7e9; box-shadow: inset 0 0 0 1px #faf7e9; - margin: 0 auto; - overflow: hidden; - width: 106px; } + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; } section.course-content nav.sequence-bottom ul li { float: left; } section.course-content nav.sequence-bottom ul li.prev, section.course-content nav.sequence-bottom ul li.next { @@ -3781,8 +3787,7 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content background-repeat: no-repeat; border-bottom: none; display: block; - display: block; - padding: 16.989px 4px; + padding: 11.326px 4px; text-indent: -9999px; -webkit-transition-property: all; -moz-transition-property: all; @@ -3808,14 +3813,14 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content section.course-content nav.sequence-bottom ul li.prev a:hover, section.course-content nav.sequence-bottom ul li.next a:hover { background-color: #eddfaa; color: #7e691a; - color: #7e691a; opacity: .5; text-decoration: none; } section.course-content nav.sequence-bottom ul li.prev a.disabled, section.course-content nav.sequence-bottom ul li.next a.disabled { background-color: #fffffe; opacity: .4; } section.course-content nav.sequence-bottom ul li.prev a { - background-image: url("/static/images/sequence-nav/previous-icon.png"); } + background-image: url("/static/images/sequence-nav/previous-icon.png"); + border-right: 1px solid #e4d080; } section.course-content nav.sequence-bottom ul li.prev a:hover { background-color: none; } section.course-content nav.sequence-bottom ul li.next a { diff --git a/static/css/marketing-ie.css b/static/css/marketing-ie.css index 18d829fdeb..6be7bdbff4 100644 --- a/static/css/marketing-ie.css +++ b/static/css/marketing-ie.css @@ -1,10 +1,13 @@ +/* line 1, sass/marketing-ie.scss */ body { margin: 0; padding: 0; } +/* line 6, sass/marketing-ie.scss */ .wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { margin: 0; overflow: hidden; } +/* line 12, sass/marketing-ie.scss */ div#enroll form { display: none; } diff --git a/static/css/marketing.css b/static/css/marketing.css index a73f1125c8..2b17edeebd 100644 --- a/static/css/marketing.css +++ b/static/css/marketing.css @@ -5,7 +5,18 @@ Last Updated: 2010-09-17 Author: Richard Clark - http://richclarkdesign.com Twitter: @rich_clark */ -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { +html, body, div, span, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +abbr, address, cite, code, +del, dfn, em, img, ins, kbd, q, samp, +small, strong, var, +b, i, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, figcaption, figure, +footer, header, hgroup, menu, nav, section, summary, +time, mark, audio, video { margin: 0; padding: 0; border: 0; @@ -17,7 +28,8 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr body { line-height: 1; } -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { display: block; } nav ul { @@ -26,7 +38,8 @@ nav ul { blockquote, q { quotes: none; } -blockquote:before, blockquote:after, q:before, q:after { +blockquote:before, blockquote:after, +q:before, q:after { content: ''; content: none; } @@ -127,27 +140,27 @@ input, select { .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { padding-left: 34.171%; } -@media screen and (max-width: 940px) { - .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { - padding-left: 0; } } -.subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p { - margin-bottom: 25.888px; - line-height: 25.888px; } -.subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 { - margin-bottom: 12.944px; } -.subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 { - font: 18px "Open Sans", Helvetica, Arial, sans-serif; - color: #000; - margin-bottom: 12.944px; } -.subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul { - list-style: disc outside none; } -.subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li { - list-style: disc outside none; - line-height: 25.888px; } -.subpage > div dl, section.copyright > div dl, section.tos > div dl, section.privacy-policy > div dl, section.honor-code > div dl { - margin-bottom: 25.888px; } -.subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd { - margin-bottom: 12.944px; } + @media screen and (max-width: 940px) { + .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { + padding-left: 0; } } + .subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p { + margin-bottom: 25.888px; + line-height: 25.888px; } + .subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 { + margin-bottom: 12.944px; } + .subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 { + font: 18px "Open Sans", Helvetica, Arial, sans-serif; + color: #000; + margin-bottom: 12.944px; } + .subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul { + list-style: disc outside none; } + .subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li { + list-style: disc outside none; + line-height: 25.888px; } + .subpage > div dl, section.copyright > div dl, section.tos > div dl, section.privacy-policy > div dl, section.honor-code > div dl { + margin-bottom: 25.888px; } + .subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd { + margin-bottom: 12.944px; } .clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, footer:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, div.leanModal_box#enroll ol:after { content: "."; @@ -200,12 +213,12 @@ input, select { -moz-box-shadow: inset 0 1px 0 #b83d3d; box-shadow: inset 0 1px 0 #b83d3d; -webkit-font-smoothing: antialiased; } -.button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover { - background-color: #732626; - border-color: #4d1919; } -.button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span { - font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; - font-style: italic; } + .button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover { + background-color: #732626; + border-color: #4d1919; } + .button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span { + font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; + font-style: italic; } p.ie-warning { display: block !important; @@ -218,37 +231,37 @@ body { background-color: #fff; color: #444; font: 16px Georgia, serif; } -body :focus { - outline-color: #ccc; } -body h1 { - font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } -body li { - margin-bottom: 25.888px; } -body em { - font-style: italic; } -body a { - color: #993333; - font-style: italic; - text-decoration: none; } -body a:hover, body a:focus { - color: #732626; } -body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { - -webkit-box-shadow: 0 -1px 0 white; - -moz-box-shadow: 0 -1px 0 white; - box-shadow: 0 -1px 0 white; - background-color: #eeeeee; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, white)); - background-image: -webkit-linear-gradient(top, #eeeeee, white); - background-image: -moz-linear-gradient(top, #eeeeee, white); - background-image: -ms-linear-gradient(top, #eeeeee, white); - background-image: -o-linear-gradient(top, #eeeeee, white); - background-image: linear-gradient(top, #eeeeee, white); - border: 1px solid #999; - font: 16px Georgia, serif; - padding: 4px; - width: 100%; } -body input[type="email"]:focus, body input[type="number"]:focus, body input[type="password"]:focus, body input[type="search"]:focus, body input[type="tel"]:focus, body input[type="text"]:focus, body input[type="url"]:focus, body input[type="color"]:focus, body input[type="date"]:focus, body input[type="datetime"]:focus, body input[type="datetime-local"]:focus, body input[type="month"]:focus, body input[type="time"]:focus, body input[type="week"]:focus, body textarea:focus { - border-color: #993333; } + body :focus { + outline-color: #ccc; } + body h1 { + font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } + body li { + margin-bottom: 25.888px; } + body em { + font-style: italic; } + body a { + color: #993333; + font-style: italic; + text-decoration: none; } + body a:hover, body a:focus { + color: #732626; } + body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { + -webkit-box-shadow: 0 -1px 0 white; + -moz-box-shadow: 0 -1px 0 white; + box-shadow: 0 -1px 0 white; + background-color: #eeeeee; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, white)); + background-image: -webkit-linear-gradient(top, #eeeeee, white); + background-image: -moz-linear-gradient(top, #eeeeee, white); + background-image: -ms-linear-gradient(top, #eeeeee, white); + background-image: -o-linear-gradient(top, #eeeeee, white); + background-image: linear-gradient(top, #eeeeee, white); + border: 1px solid #999; + font: 16px Georgia, serif; + padding: 4px; + width: 100%; } + body input[type="email"]:focus, body input[type="number"]:focus, body input[type="password"]:focus, body input[type="search"]:focus, body input[type="tel"]:focus, body input[type="text"]:focus, body input[type="url"]:focus, body input[type="color"]:focus, body input[type="date"]:focus, body input[type="datetime"]:focus, body input[type="datetime-local"]:focus, body input[type="month"]:focus, body input[type="time"]:focus, body input[type="week"]:focus, body textarea:focus { + border-color: #993333; } header.announcement { -webkit-background-size: cover; @@ -260,474 +273,479 @@ header.announcement { border-bottom: 1px solid #000; color: #fff; -webkit-font-smoothing: antialiased; } -header.announcement.home { - background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); } -@media screen and (min-width: 1200px) { header.announcement.home { - background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } } -header.announcement.home div { - padding: 258.88px 25.888px 77.664px; } -@media screen and (max-width:780px) { - header.announcement.home div { - padding: 64.72px 25.888px 51.776px; } } -header.announcement.home div nav h1 { - margin-right: 0; } -header.announcement.home div nav a.login { - display: none; } -header.announcement.course { - background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); } -@media screen and (min-width: 1200px) { + background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); } + @media screen and (min-width: 1200px) { + header.announcement.home { + background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } } + header.announcement.home div { + padding: 258.88px 25.888px 77.664px; } + @media screen and (max-width:780px) { + header.announcement.home div { + padding: 64.72px 25.888px 51.776px; } } + header.announcement.home div nav h1 { + margin-right: 0; } + header.announcement.home div nav a.login { + display: none; } header.announcement.course { - background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); } } -@media screen and (max-width: 1199px) and (min-width: 700px) { - header.announcement.course { - background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); } } -header.announcement.course div { - padding: 103.552px 25.888px 51.776px; } -@media screen and (max-width:780px) { - header.announcement.course div { - padding: 64.72px 25.888px 51.776px; } } -header.announcement div { - position: relative; } -header.announcement div nav { - position: absolute; - top: 0; - right: 25.888px; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - -ms-border-radius: 0 0 3px 3px; - -o-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - background: #333; - background: rgba(0, 0, 0, 0.7); - padding: 12.944px 25.888px; } -header.announcement div nav h1 { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-right: 12.944px; } -header.announcement div nav h1 a { - font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif; - color: #fff; - text-decoration: none; } -header.announcement div nav h1 a:hover, header.announcement div nav h1 a:focus { - color: #999; } -header.announcement div nav a.login { - text-decoration: none; - color: #fff; - font-size: 12px; - font-style: normal; - font-family: "Open Sans", Helvetica, Arial, sans-serif; } -header.announcement div nav a.login:hover, header.announcement div nav a.login:focus { - color: #999; } -header.announcement div section { - background: #993333; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-left: 34.171%; - padding: 25.888px 38.832px; } -@media screen and (max-width: 780px) { - header.announcement div section { - margin-left: 0; } } -header.announcement div section h1 { - font-family: "Open Sans"; - font-size: 30px; - font-weight: 800; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - line-height: 1.2em; - margin: 0 25.888px 0 0; } -header.announcement div section h2 { - font-family: "Open Sans"; - font-size: 24px; - font-weight: 400; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - line-height: 1.2em; } -header.announcement div section.course section { - float: left; - margin-left: 0; - margin-right: 3.817%; - padding: 0; - width: 48.092%; } -@media screen and (max-width: 780px) { - header.announcement div section.course section { - float: none; - width: 100%; - margin-right: 0; } } -header.announcement div section.course section a { - background-color: #4d1919; - border-color: #260d0d; - -webkit-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - -moz-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - display: block; - padding: 12.944px 25.888px; - text-align: center; } -header.announcement div section.course section a:hover { - background-color: #732626; - border-color: #4d1919; } -header.announcement div section.course p { - width: 48.092%; - line-height: 25.888px; - float: left; } -@media screen and (max-width: 780px) { - header.announcement div section.course p { - float: none; - width: 100%; } } + background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); } + @media screen and (min-width: 1200px) { + header.announcement.course { + background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); } } + @media screen and (max-width: 1199px) and (min-width: 700px) { + header.announcement.course { + background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); } } + header.announcement.course div { + padding: 103.552px 25.888px 51.776px; } + @media screen and (max-width:780px) { + header.announcement.course div { + padding: 64.72px 25.888px 51.776px; } } + header.announcement div { + position: relative; } + header.announcement div nav { + position: absolute; + top: 0; + right: 25.888px; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + -ms-border-radius: 0 0 3px 3px; + -o-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + background: #333; + background: rgba(0, 0, 0, 0.7); + padding: 12.944px 25.888px; } + header.announcement div nav h1 { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + margin-right: 12.944px; } + header.announcement div nav h1 a { + font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif; + color: #fff; + text-decoration: none; } + header.announcement div nav h1 a:hover, header.announcement div nav h1 a:focus { + color: #999; } + header.announcement div nav a.login { + text-decoration: none; + color: #fff; + font-size: 12px; + font-style: normal; + font-family: "Open Sans", Helvetica, Arial, sans-serif; } + header.announcement div nav a.login:hover, header.announcement div nav a.login:focus { + color: #999; } + header.announcement div section { + background: #993333; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + margin-left: 34.171%; + padding: 25.888px 38.832px; } + @media screen and (max-width: 780px) { + header.announcement div section { + margin-left: 0; } } + header.announcement div section h1 { + font-family: "Open Sans"; + font-size: 30px; + font-weight: 800; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + line-height: 1.2em; + margin: 0 25.888px 0 0; } + header.announcement div section h2 { + font-family: "Open Sans"; + font-size: 24px; + font-weight: 400; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + line-height: 1.2em; } + header.announcement div section.course section { + float: left; + margin-left: 0; + margin-right: 3.817%; + padding: 0; + width: 48.092%; } + @media screen and (max-width: 780px) { + header.announcement div section.course section { + float: none; + width: 100%; + margin-right: 0; } } + header.announcement div section.course section a { + background-color: #4d1919; + border-color: #260d0d; + -webkit-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; + -moz-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; + box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; + display: block; + padding: 12.944px 25.888px; + text-align: center; } + header.announcement div section.course section a:hover { + background-color: #732626; + border-color: #4d1919; } + header.announcement div section.course p { + width: 48.092%; + line-height: 25.888px; + float: left; } + @media screen and (max-width: 780px) { + header.announcement div section.course p { + float: none; + width: 100%; } } footer { padding-top: 0; } -footer div.footer-wrapper { - border-top: 1px solid #e5e5e5; - padding: 25.888px 0; - background: url("/static/images/marketing/mit-logo.png") right center no-repeat; } -@media screen and (max-width: 780px) { footer div.footer-wrapper { - background-position: left bottom; - padding-bottom: 77.664px; } } -footer div.footer-wrapper a { - color: #888; - text-decoration: none; - -webkit-transition-property: all; - -moz-transition-property: all; - -ms-transition-property: all; - -o-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.15s; - -moz-transition-duration: 0.15s; - -ms-transition-duration: 0.15s; - -o-transition-duration: 0.15s; - transition-duration: 0.15s; - -webkit-transition-timing-function: ease-out; - -moz-transition-timing-function: ease-out; - -ms-transition-timing-function: ease-out; - -o-transition-timing-function: ease-out; - transition-timing-function: ease-out; - -webkit-transition-delay: 0; - -moz-transition-delay: 0; - -ms-transition-delay: 0; - -o-transition-delay: 0; - transition-delay: 0; } -footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus { - color: #666; } -footer div.footer-wrapper p { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-right: 25.888px; } -footer div.footer-wrapper ul { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; } -@media screen and (max-width: 780px) { - footer div.footer-wrapper ul { - margin-top: 25.888px; } } -footer div.footer-wrapper ul li { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-bottom: 0; } -footer div.footer-wrapper ul li:after { - content: ' |'; - display: inline; - color: #ccc; } -footer div.footer-wrapper ul li:last-child:after { - content: none; } -footer div.footer-wrapper ul.social { - float: right; - margin-right: 60px; - position: relative; - top: -5px; } -@media screen and (max-width: 780px) { - footer div.footer-wrapper ul.social { - float: none; } } -footer div.footer-wrapper ul.social li { - float: left; - margin-right: 12.944px; } -footer div.footer-wrapper ul.social li:after { - content: none; - display: none; } -footer div.footer-wrapper ul.social li a { - display: block; - height: 29px; - width: 28px; - text-indent: -9999px; } -footer div.footer-wrapper ul.social li a:hover { - opacity: .8; } -footer div.footer-wrapper ul.social li.twitter a { - background: url("/static/images/marketing/twitter.png") 0 0 no-repeat; } -footer div.footer-wrapper ul.social li.facebook a { - background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; } -footer div.footer-wrapper ul.social li.linkedin a { - background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; } + border-top: 1px solid #e5e5e5; + padding: 25.888px 0; + background: url("/static/images/marketing/mit-logo.png") right center no-repeat; } + @media screen and (max-width: 780px) { + footer div.footer-wrapper { + background-position: left bottom; + padding-bottom: 77.664px; } } + footer div.footer-wrapper a { + color: #888; + text-decoration: none; + -webkit-transition-property: all; + -moz-transition-property: all; + -ms-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.15s; + -moz-transition-duration: 0.15s; + -ms-transition-duration: 0.15s; + -o-transition-duration: 0.15s; + transition-duration: 0.15s; + -webkit-transition-timing-function: ease-out; + -moz-transition-timing-function: ease-out; + -ms-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out; + transition-timing-function: ease-out; + -webkit-transition-delay: 0; + -moz-transition-delay: 0; + -ms-transition-delay: 0; + -o-transition-delay: 0; + transition-delay: 0; } + footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus { + color: #666; } + footer div.footer-wrapper p { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + margin-right: 25.888px; } + footer div.footer-wrapper ul { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; } + @media screen and (max-width: 780px) { + footer div.footer-wrapper ul { + margin-top: 25.888px; } } + footer div.footer-wrapper ul li { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + margin-bottom: 0; } + footer div.footer-wrapper ul li:after { + content: ' |'; + display: inline; + color: #ccc; } + footer div.footer-wrapper ul li:last-child:after { + content: none; } + footer div.footer-wrapper ul.social { + float: right; + margin-right: 60px; + position: relative; + top: -5px; } + @media screen and (max-width: 780px) { + footer div.footer-wrapper ul.social { + float: none; } } + footer div.footer-wrapper ul.social li { + float: left; + margin-right: 12.944px; } + footer div.footer-wrapper ul.social li:after { + content: none; + display: none; } + footer div.footer-wrapper ul.social li a { + display: block; + height: 29px; + width: 28px; + text-indent: -9999px; } + footer div.footer-wrapper ul.social li a:hover { + opacity: .8; } + footer div.footer-wrapper ul.social li.twitter a { + background: url("/static/images/marketing/twitter.png") 0 0 no-repeat; } + footer div.footer-wrapper ul.social li.facebook a { + background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; } + footer div.footer-wrapper ul.social li.linkedin a { + background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; } section.index-content section { float: left; } -@media screen and (max-width: 780px) { - section.index-content section { - float: none; - width: auto; - margin-right: 0; } } -section.index-content section h1 { - font-size: 800 24px "Open Sans"; - margin-bottom: 25.888px; } -section.index-content section p { - line-height: 25.888px; - margin-bottom: 25.888px; } -section.index-content section ul { - margin: 0; } -section.index-content section.about { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-right: 1px solid #e5e5e5; - margin-right: 2.513%; - padding-right: 1.256%; - width: 65.829%; } -@media screen and (max-width: 780px) { + @media screen and (max-width: 780px) { + section.index-content section { + float: none; + width: auto; + margin-right: 0; } } + section.index-content section h1 { + font-size: 800 24px "Open Sans"; + margin-bottom: 25.888px; } + section.index-content section p { + line-height: 25.888px; + margin-bottom: 25.888px; } + section.index-content section ul { + margin: 0; } section.index-content section.about { - width: 100%; - border-right: 0; - margin-right: 0; - padding-right: 0; } } -section.index-content section.about section { - margin-bottom: 25.888px; } -section.index-content section.about section p { - width: 48.092%; - float: left; } -@media screen and (max-width: 780px) { - section.index-content section.about section p { - float: none; - width: auto; } } -section.index-content section.about section p:nth-child(odd) { - margin-right: 3.817%; } -@media screen and (max-width: 780px) { - section.index-content section.about section p:nth-child(odd) { - margin-right: 0; } } -section.index-content section.about section.intro section { - margin-bottom: 0; } -section.index-content section.about section.intro section.intro-text { - margin-right: 3.817%; - width: 48.092%; } -@media screen and (max-width: 780px) { - section.index-content section.about section.intro section.intro-text { - margin-right: 0; - width: auto; } } -section.index-content section.about section.intro section.intro-text p { - margin-right: 0; - width: auto; - float: none; } -section.index-content section.about section.intro section.intro-video { - width: 48.092%; } -@media screen and (max-width: 780px) { - section.index-content section.about section.intro section.intro-video { - width: auto; } } -section.index-content section.about section.intro section.intro-video a { - display: block; - width: 100%; } -section.index-content section.about section.intro section.intro-video a img { - width: 100%; } -section.index-content section.about section.intro section.intro-video a span { - display: none; } -section.index-content section.about section.features { - border-top: 1px solid #E5E5E5; - padding-top: 25.888px; - margin-bottom: 0; } -section.index-content section.about section.features h2 { - text-transform: uppercase; - letter-spacing: 1px; - color: #888; - margin-bottom: 25.888px; - font-weight: normal; - font-size: 14px; } -section.index-content section.about section.features h2 span { - text-transform: none; } -section.index-content section.about section.features p { - width: auto; - clear: both; } -section.index-content section.about section.features p strong { - font-family: "Open sans"; - font-weight: 800; } -section.index-content section.about section.features p a { - color: #993333; - text-decoration: none; - -webkit-transition-property: all; - -moz-transition-property: all; - -ms-transition-property: all; - -o-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.15s; - -moz-transition-duration: 0.15s; - -ms-transition-duration: 0.15s; - -o-transition-duration: 0.15s; - transition-duration: 0.15s; - -webkit-transition-timing-function: ease-out; - -moz-transition-timing-function: ease-out; - -ms-transition-timing-function: ease-out; - -o-transition-timing-function: ease-out; - transition-timing-function: ease-out; - -webkit-transition-delay: 0; - -moz-transition-delay: 0; - -ms-transition-delay: 0; - -o-transition-delay: 0; - transition-delay: 0; } -section.index-content section.about section.features p a:hover, section.index-content section.about section.features p a:focus { - color: #602020; } -section.index-content section.about section.features ul { - margin-bottom: 0; } -section.index-content section.about section.features ul li { - line-height: 25.888px; - width: 48.092%; - float: left; - margin-bottom: 12.944px; } -@media screen and (max-width: 780px) { - section.index-content section.about section.features ul li { - width: auto; - float: none; } } -section.index-content section.about section.features ul li:nth-child(odd) { - margin-right: 3.817%; } -@media screen and (max-width: 780px) { - section.index-content section.about section.features ul li:nth-child(odd) { - margin-right: 0; } } -section.index-content section.course, section.index-content section.staff { - width: 31.658%; } -@media screen and (max-width: 780px) { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + border-right: 1px solid #e5e5e5; + margin-right: 2.513%; + padding-right: 1.256%; + width: 65.829%; } + @media screen and (max-width: 780px) { + section.index-content section.about { + width: 100%; + border-right: 0; + margin-right: 0; + padding-right: 0; } } + section.index-content section.about section { + margin-bottom: 25.888px; } + section.index-content section.about section p { + width: 48.092%; + float: left; } + @media screen and (max-width: 780px) { + section.index-content section.about section p { + float: none; + width: auto; } } + section.index-content section.about section p:nth-child(odd) { + margin-right: 3.817%; } + @media screen and (max-width: 780px) { + section.index-content section.about section p:nth-child(odd) { + margin-right: 0; } } + section.index-content section.about section.intro section { + margin-bottom: 0; } + section.index-content section.about section.intro section.intro-text { + margin-right: 3.817%; + width: 48.092%; } + @media screen and (max-width: 780px) { + section.index-content section.about section.intro section.intro-text { + margin-right: 0; + width: auto; } } + section.index-content section.about section.intro section.intro-text p { + margin-right: 0; + width: auto; + float: none; } + section.index-content section.about section.intro section.intro-video { + width: 48.092%; } + @media screen and (max-width: 780px) { + section.index-content section.about section.intro section.intro-video { + width: auto; } } + section.index-content section.about section.intro section.intro-video a { + display: block; + width: 100%; } + section.index-content section.about section.intro section.intro-video a img { + width: 100%; } + section.index-content section.about section.intro section.intro-video a span { + display: none; } + section.index-content section.about section.features { + border-top: 1px solid #E5E5E5; + padding-top: 25.888px; + margin-bottom: 0; } + section.index-content section.about section.features h2 { + text-transform: uppercase; + letter-spacing: 1px; + color: #888; + margin-bottom: 25.888px; + font-weight: normal; + font-size: 14px; } + section.index-content section.about section.features h2 span { + text-transform: none; } + section.index-content section.about section.features p { + width: auto; + clear: both; } + section.index-content section.about section.features p strong { + font-family: "Open sans"; + font-weight: 800; } + section.index-content section.about section.features p a { + color: #993333; + text-decoration: none; + -webkit-transition-property: all; + -moz-transition-property: all; + -ms-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.15s; + -moz-transition-duration: 0.15s; + -ms-transition-duration: 0.15s; + -o-transition-duration: 0.15s; + transition-duration: 0.15s; + -webkit-transition-timing-function: ease-out; + -moz-transition-timing-function: ease-out; + -ms-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out; + transition-timing-function: ease-out; + -webkit-transition-delay: 0; + -moz-transition-delay: 0; + -ms-transition-delay: 0; + -o-transition-delay: 0; + transition-delay: 0; } + section.index-content section.about section.features p a:hover, section.index-content section.about section.features p a:focus { + color: #602020; } + section.index-content section.about section.features ul { + margin-bottom: 0; } + section.index-content section.about section.features ul li { + line-height: 25.888px; + width: 48.092%; + float: left; + margin-bottom: 12.944px; } + @media screen and (max-width: 780px) { + section.index-content section.about section.features ul li { + width: auto; + float: none; } } + section.index-content section.about section.features ul li:nth-child(odd) { + margin-right: 3.817%; } + @media screen and (max-width: 780px) { + section.index-content section.about section.features ul li:nth-child(odd) { + margin-right: 0; } } section.index-content section.course, section.index-content section.staff { - width: auto; } } -section.index-content section.course h1, section.index-content section.staff h1 { - color: #888; - font: normal 16px Georgia, serif; - font-size: 14px; - letter-spacing: 1px; - margin-bottom: 25.888px; - text-transform: uppercase; } -section.index-content section.course h2, section.index-content section.staff h2 { - font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } -section.index-content section.course h3, section.index-content section.staff h3 { - font: 400 18px "Open Sans", Helvetica, Arial, sans-serif; } -section.index-content section.course a span.arrow, section.index-content section.staff a span.arrow { - color: rgba(255, 255, 255, 0.6); - font-style: normal; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - padding-left: 10px; } -section.index-content section.course ul, section.index-content section.staff ul { - list-style: none; } -section.index-content section.course ul li img, section.index-content section.staff ul li img { - float: left; - margin-right: 12.944px; } -section.index-content section.course h2 { - padding-top: 129.44px; - background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; - -webkit-background-size: contain; - -moz-background-size: contain; - -ms-background-size: contain; - -o-background-size: contain; - background-size: contain; } -@media screen and (max-width: 998px) and (min-width: 781px) { - section.index-content section.course h2 { - background: url("/static/images/marketing/circuits-medium-bg.jpg") 0 0 no-repeat; } } -@media screen and (max-width: 780px) { + width: 31.658%; } + @media screen and (max-width: 780px) { + section.index-content section.course, section.index-content section.staff { + width: auto; } } + section.index-content section.course h1, section.index-content section.staff h1 { + color: #888; + font: normal 16px Georgia, serif; + font-size: 14px; + letter-spacing: 1px; + margin-bottom: 25.888px; + text-transform: uppercase; } + section.index-content section.course h2, section.index-content section.staff h2 { + font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } + section.index-content section.course h3, section.index-content section.staff h3 { + font: 400 18px "Open Sans", Helvetica, Arial, sans-serif; } + section.index-content section.course a span.arrow, section.index-content section.staff a span.arrow { + color: rgba(255, 255, 255, 0.6); + font-style: normal; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + padding-left: 10px; } + section.index-content section.course ul, section.index-content section.staff ul { + list-style: none; } + section.index-content section.course ul li img, section.index-content section.staff ul li img { + float: left; + margin-right: 12.944px; } section.index-content section.course h2 { padding-top: 129.44px; - background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; } } -@media screen and (min-width: 500px) and (max-width: 781px) { - section.index-content section.course h2 { - padding-top: 207.104px; } } -section.index-content section.about-course { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-right: 1px solid #e5e5e5; - margin-right: 2.513%; - padding-right: 1.256%; - width: 65.829%; } -@media screen and (max-width: 780px) { + background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; + -webkit-background-size: contain; + -moz-background-size: contain; + -ms-background-size: contain; + -o-background-size: contain; + background-size: contain; } + @media screen and (max-width: 998px) and (min-width: 781px) { + section.index-content section.course h2 { + background: url("/static/images/marketing/circuits-medium-bg.jpg") 0 0 no-repeat; } } + @media screen and (max-width: 780px) { + section.index-content section.course h2 { + padding-top: 129.44px; + background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; } } + @media screen and (min-width: 500px) and (max-width: 781px) { + section.index-content section.course h2 { + padding-top: 207.104px; } } + section.index-content section.course div.announcement p.announcement-button a { + margin-top: 0; } + section.index-content section.course div.announcement img { + max-width: 100%; + margin-bottom: 25.888px; } section.index-content section.about-course { - width: auto; - border-right: 0; - margin-right: 0; - padding-right: 0; } } -section.index-content section.about-course section { - width: 48.092%; } -@media screen and (max-width: 780px) { - section.index-content section.about-course section { - width: auto; } } -section.index-content section.about-course section.about-info { - margin-right: 3.817%; } -@media screen and (max-width: 780px) { - section.index-content section.about-course section.about-info { - margin-right: 0; } } -section.index-content section.about-course section.requirements { - clear: both; - width: 100%; - border-top: 1px solid #E5E5E5; - padding-top: 25.888px; - margin-bottom: 0; } -section.index-content section.about-course section.requirements p { - float: left; - width: 48.092%; - margin-right: 3.817%; } -@media screen and (max-width: 780px) { - section.index-content section.about-course section.requirements p { - margin-right: 0; - float: none; - width: auto; } } -section.index-content section.about-course section.requirements p:nth-child(odd) { - margin-right: 0; } -section.index-content section.about-course section.cta { - width: 100%; - text-align: center; } -section.index-content section.about-course section.cta a.enroll { - padding: 12.944px 51.776px; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - text-align: center; - font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; } -section.index-content section.staff h1 { - margin-top: 25.888px; } + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + border-right: 1px solid #e5e5e5; + margin-right: 2.513%; + padding-right: 1.256%; + width: 65.829%; } + @media screen and (max-width: 780px) { + section.index-content section.about-course { + width: auto; + border-right: 0; + margin-right: 0; + padding-right: 0; } } + section.index-content section.about-course section { + width: 48.092%; } + @media screen and (max-width: 780px) { + section.index-content section.about-course section { + width: auto; } } + section.index-content section.about-course section.about-info { + margin-right: 3.817%; } + @media screen and (max-width: 780px) { + section.index-content section.about-course section.about-info { + margin-right: 0; } } + section.index-content section.about-course section.requirements { + clear: both; + width: 100%; + border-top: 1px solid #E5E5E5; + padding-top: 25.888px; + margin-bottom: 0; } + section.index-content section.about-course section.requirements p { + float: left; + width: 48.092%; + margin-right: 3.817%; } + @media screen and (max-width: 780px) { + section.index-content section.about-course section.requirements p { + margin-right: 0; + float: none; + width: auto; } } + section.index-content section.about-course section.requirements p:nth-child(odd) { + margin-right: 0; } + section.index-content section.about-course section.cta { + width: 100%; + text-align: center; } + section.index-content section.about-course section.cta a.enroll { + padding: 12.944px 51.776px; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + text-align: center; + font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; } + section.index-content section.staff h1 { + margin-top: 25.888px; } #lean_overlay { position: fixed; @@ -756,184 +774,244 @@ div.leanModal_box { display: none; padding: 51.776px; text-align: left; } -div.leanModal_box a.modal_close { - color: #aaa; - display: block; - font-style: normal; - height: 14px; - position: absolute; - right: 12px; - top: 12px; - width: 14px; - z-index: 2; } -div.leanModal_box a.modal_close:hover { - text-decoration: none; - color: #993333; } -div.leanModal_box h1 { - border-bottom: 1px solid #eee; - font-size: 24px; - margin-bottom: 25.888px; - margin-top: 0; - padding-bottom: 25.888px; - text-align: left; } -div.leanModal_box#enroll { - max-width: 600px; } -div.leanModal_box#enroll ol { - padding-top: 25.888px; } -div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code { - width: auto; - float: none; } -div.leanModal_box#enroll ol li div.tip { - display: none; } -div.leanModal_box#enroll ol li:hover div.tip { - background: #333; - color: #fff; - display: block; - font-size: 16px; - line-height: 25.888px; - margin: 0 0 0 -10px; - padding: 10px; - position: absolute; - -webkit-font-smoothing: antialiased; - width: 500px; } -div.leanModal_box form { - text-align: left; } -div.leanModal_box form div#enroll_error, div.leanModal_box form div#login_error, div.leanModal_box form div#pwd_error { - background-color: #333333; - border: black; - color: #fff; - font-family: "Open sans"; - font-weight: bold; - letter-spacing: 1px; - margin: -25.888px -25.888px 25.888px; - padding: 12.944px; - text-shadow: 0 1px 0 #1a1a1a; - -webkit-font-smoothing: antialiased; } -div.leanModal_box form div#enroll_error:empty, div.leanModal_box form div#login_error:empty, div.leanModal_box form div#pwd_error:empty { - padding: 0; } -div.leanModal_box form ol { - list-style: none; - margin-bottom: 25.888px; } -div.leanModal_box form ol li { - margin-bottom: 12.944px; } -div.leanModal_box form ol li.terms, div.leanModal_box form ol li.remember { - border-top: 1px solid #eee; - clear: both; - float: none; - padding-top: 25.888px; - width: auto; } -div.leanModal_box form ol li.honor-code { - width: auto; - float: none; } -div.leanModal_box form ol li label { - display: block; - font-weight: bold; } -div.leanModal_box form ol li input[type="email"], div.leanModal_box form ol li input[type="number"], div.leanModal_box form ol li input[type="password"], div.leanModal_box form ol li input[type="search"], div.leanModal_box form ol li input[type="tel"], div.leanModal_box form ol li input[type="text"], div.leanModal_box form ol li input[type="url"], div.leanModal_box form ol li input[type="color"], div.leanModal_box form ol li input[type="date"], div.leanModal_box form ol li input[type="datetime"], div.leanModal_box form ol li input[type="datetime-local"], div.leanModal_box form ol li input[type="month"], div.leanModal_box form ol li input[type="time"], div.leanModal_box form ol li input[type="week"], div.leanModal_box form ol li textarea { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } -div.leanModal_box form ol li input[type="checkbox"] { - margin-right: 10px; } -div.leanModal_box form ol li ul { - list-style: disc outside none; - margin: 12.944px 0 25.888px 25.888px; } -div.leanModal_box form ol li ul li { - color: #666; - float: none; - font-size: 14px; - list-style: disc outside none; - margin-bottom: 12.944px; } -div.leanModal_box form input[type="button"], div.leanModal_box form input[type="submit"] { - border: 1px solid #691b1b; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 0 #bc5c5c; - -moz-box-shadow: inset 0 1px 0 0 #bc5c5c; - box-shadow: inset 0 1px 0 0 #bc5c5c; - color: white; - display: inline; - font-size: 11px; - font-weight: bold; - background-color: #993333; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #993333), color-stop(100%, #761e1e)); - background-image: -webkit-linear-gradient(top, #993333, #761e1e); - background-image: -moz-linear-gradient(top, #993333, #761e1e); - background-image: -ms-linear-gradient(top, #993333, #761e1e); - background-image: -o-linear-gradient(top, #993333, #761e1e); - background-image: linear-gradient(top, #993333, #761e1e); - padding: 6px 18px 7px; - text-shadow: 0 1px 0 #5d1414; - -webkit-background-clip: padding-box; - font-size: 18px; - padding: 12.944px; } -div.leanModal_box form input[type="button"]:hover, div.leanModal_box form input[type="submit"]:hover { - -webkit-box-shadow: inset 0 1px 0 0 #a44141; - -moz-box-shadow: inset 0 1px 0 0 #a44141; - box-shadow: inset 0 1px 0 0 #a44141; - cursor: pointer; - background-color: #823030; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #823030), color-stop(100%, #691c1c)); - background-image: -webkit-linear-gradient(top, #823030, #691c1c); - background-image: -moz-linear-gradient(top, #823030, #691c1c); - background-image: -ms-linear-gradient(top, #823030, #691c1c); - background-image: -o-linear-gradient(top, #823030, #691c1c); - background-image: linear-gradient(top, #823030, #691c1c); } -div.leanModal_box form input[type="button"]:active, div.leanModal_box form input[type="submit"]:active { - border: 1px solid #691b1b; - -webkit-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - -moz-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; } + div.leanModal_box a.modal_close { + color: #aaa; + display: block; + font-style: normal; + height: 14px; + position: absolute; + right: 12px; + top: 12px; + width: 14px; + z-index: 2; } + div.leanModal_box a.modal_close:hover { + text-decoration: none; + color: #993333; } + div.leanModal_box h1 { + border-bottom: 1px solid #eee; + font-size: 24px; + margin-bottom: 25.888px; + margin-top: 0; + padding-bottom: 25.888px; + text-align: left; } + div.leanModal_box#enroll { + max-width: 600px; } + div.leanModal_box#enroll ol { + padding-top: 25.888px; } + div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code { + width: auto; + float: none; } + div.leanModal_box#enroll ol li div.tip { + display: none; } + div.leanModal_box#enroll ol li:hover div.tip { + background: #333; + color: #fff; + display: block; + font-size: 16px; + line-height: 25.888px; + margin: 0 0 0 -10px; + padding: 10px; + position: absolute; + -webkit-font-smoothing: antialiased; + width: 500px; } + div.leanModal_box form { + text-align: left; } + div.leanModal_box form div#enroll_error, div.leanModal_box form div#login_error, div.leanModal_box form div#pwd_error { + background-color: #333333; + border: black; + color: #fff; + font-family: "Open sans"; + font-weight: bold; + letter-spacing: 1px; + margin: -25.888px -25.888px 25.888px; + padding: 12.944px; + text-shadow: 0 1px 0 #1a1a1a; + -webkit-font-smoothing: antialiased; } + div.leanModal_box form div#enroll_error:empty, div.leanModal_box form div#login_error:empty, div.leanModal_box form div#pwd_error:empty { + padding: 0; } + div.leanModal_box form ol { + list-style: none; + margin-bottom: 25.888px; } + div.leanModal_box form ol li { + margin-bottom: 12.944px; } + div.leanModal_box form ol li.terms, div.leanModal_box form ol li.remember { + border-top: 1px solid #eee; + clear: both; + float: none; + padding-top: 25.888px; + width: auto; } + div.leanModal_box form ol li.honor-code { + width: auto; + float: none; } + div.leanModal_box form ol li label { + display: block; + font-weight: bold; } + div.leanModal_box form ol li input[type="email"], div.leanModal_box form ol li input[type="number"], div.leanModal_box form ol li input[type="password"], div.leanModal_box form ol li input[type="search"], div.leanModal_box form ol li input[type="tel"], div.leanModal_box form ol li input[type="text"], div.leanModal_box form ol li input[type="url"], div.leanModal_box form ol li input[type="color"], div.leanModal_box form ol li input[type="date"], div.leanModal_box form ol li input[type="datetime"], div.leanModal_box form ol li input[type="datetime-local"], div.leanModal_box form ol li input[type="month"], div.leanModal_box form ol li input[type="time"], div.leanModal_box form ol li input[type="week"], div.leanModal_box form ol li textarea { + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + div.leanModal_box form ol li input[type="checkbox"] { + margin-right: 10px; } + div.leanModal_box form ol li ul { + list-style: disc outside none; + margin: 12.944px 0 25.888px 25.888px; } + div.leanModal_box form ol li ul li { + color: #666; + float: none; + font-size: 14px; + list-style: disc outside none; + margin-bottom: 12.944px; } + div.leanModal_box form input[type="button"], div.leanModal_box form input[type="submit"] { + border: 1px solid #691b1b; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 0 #bc5c5c; + -moz-box-shadow: inset 0 1px 0 0 #bc5c5c; + box-shadow: inset 0 1px 0 0 #bc5c5c; + color: white; + display: inline; + font-size: 11px; + font-weight: bold; + background-color: #993333; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #993333), color-stop(100%, #761e1e)); + background-image: -webkit-linear-gradient(top, #993333, #761e1e); + background-image: -moz-linear-gradient(top, #993333, #761e1e); + background-image: -ms-linear-gradient(top, #993333, #761e1e); + background-image: -o-linear-gradient(top, #993333, #761e1e); + background-image: linear-gradient(top, #993333, #761e1e); + padding: 6px 18px 7px; + text-shadow: 0 1px 0 #5d1414; + -webkit-background-clip: padding-box; + font-size: 18px; + padding: 12.944px; } + div.leanModal_box form input[type="button"]:hover, div.leanModal_box form input[type="submit"]:hover { + -webkit-box-shadow: inset 0 1px 0 0 #a44141; + -moz-box-shadow: inset 0 1px 0 0 #a44141; + box-shadow: inset 0 1px 0 0 #a44141; + cursor: pointer; + background-color: #823030; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #823030), color-stop(100%, #691c1c)); + background-image: -webkit-linear-gradient(top, #823030, #691c1c); + background-image: -moz-linear-gradient(top, #823030, #691c1c); + background-image: -ms-linear-gradient(top, #823030, #691c1c); + background-image: -o-linear-gradient(top, #823030, #691c1c); + background-image: linear-gradient(top, #823030, #691c1c); } + div.leanModal_box form input[type="button"]:active, div.leanModal_box form input[type="submit"]:active { + border: 1px solid #691b1b; + -webkit-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; + -moz-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; + box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; } div#login { min-width: 400px; } -div#login header { - border-bottom: 1px solid #ddd; - margin-bottom: 25.888px; - padding-bottom: 25.888px; } -div#login header h1 { - border-bottom: 0; - padding-bottom: 0; - margin-bottom: 6.472px; } -div#login ol li { - width: auto; - float: none; } + div#login header { + border-bottom: 1px solid #ddd; + margin-bottom: 25.888px; + padding-bottom: 25.888px; } + div#login header h1 { + border-bottom: 0; + padding-bottom: 0; + margin-bottom: 6.472px; } + div#login ol li { + width: auto; + float: none; } div.lost-password { text-align: left; margin-top: 25.888px; } -div.lost-password a { - color: #999; } -div.lost-password a:hover { - color: #444; } + div.lost-password a { + color: #999; } + div.lost-password a:hover { + color: #444; } div#pwd_reset p { margin-bottom: 25.888px; } div#pwd_reset input[type="email"] { margin-bottom: 25.888px; } -div#apply_name_change, div#change_email, div#unenroll, div#deactivate-account { +div#apply_name_change, +div#change_email, +div#unenroll, +div#deactivate-account { max-width: 700px; } -div#apply_name_change ul, div#change_email ul, div#unenroll ul, div#deactivate-account ul { - list-style: none; } -div#apply_name_change ul li, div#change_email ul li, div#unenroll ul li, div#deactivate-account ul li { - margin-bottom: 12.944px; } -div#apply_name_change ul li textarea, div#apply_name_change ul li input[type="email"], div#apply_name_change ul li input[type="number"], div#apply_name_change ul li input[type="password"], div#apply_name_change ul li input[type="search"], div#apply_name_change ul li input[type="tel"], div#apply_name_change ul li input[type="text"], div#apply_name_change ul li input[type="url"], div#apply_name_change ul li input[type="color"], div#apply_name_change ul li input[type="date"], div#apply_name_change ul li input[type="datetime"], div#apply_name_change ul li input[type="datetime-local"], div#apply_name_change ul li input[type="month"], div#apply_name_change ul li input[type="time"], div#apply_name_change ul li input[type="week"], div#change_email ul li textarea, div#change_email ul li input[type="email"], div#change_email ul li input[type="number"], div#change_email ul li input[type="password"], div#change_email ul li input[type="search"], div#change_email ul li input[type="tel"], div#change_email ul li input[type="text"], div#change_email ul li input[type="url"], div#change_email ul li input[type="color"], div#change_email ul li input[type="date"], div#change_email ul li input[type="datetime"], div#change_email ul li input[type="datetime-local"], div#change_email ul li input[type="month"], div#change_email ul li input[type="time"], div#change_email ul li input[type="week"], div#unenroll ul li textarea, div#unenroll ul li input[type="email"], div#unenroll ul li input[type="number"], div#unenroll ul li input[type="password"], div#unenroll ul li input[type="search"], div#unenroll ul li input[type="tel"], div#unenroll ul li input[type="text"], div#unenroll ul li input[type="url"], div#unenroll ul li input[type="color"], div#unenroll ul li input[type="date"], div#unenroll ul li input[type="datetime"], div#unenroll ul li input[type="datetime-local"], div#unenroll ul li input[type="month"], div#unenroll ul li input[type="time"], div#unenroll ul li input[type="week"], div#deactivate-account ul li textarea, div#deactivate-account ul li input[type="email"], div#deactivate-account ul li input[type="number"], div#deactivate-account ul li input[type="password"], div#deactivate-account ul li input[type="search"], div#deactivate-account ul li input[type="tel"], div#deactivate-account ul li input[type="text"], div#deactivate-account ul li input[type="url"], div#deactivate-account ul li input[type="color"], div#deactivate-account ul li input[type="date"], div#deactivate-account ul li input[type="datetime"], div#deactivate-account ul li input[type="datetime-local"], div#deactivate-account ul li input[type="month"], div#deactivate-account ul li input[type="time"], div#deactivate-account ul li input[type="week"] { - display: block; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } -div#apply_name_change ul li textarea, div#change_email ul li textarea, div#unenroll ul li textarea, div#deactivate-account ul li textarea { - height: 60px; } -div#apply_name_change ul li input[type="submit"], div#change_email ul li input[type="submit"], div#unenroll ul li input[type="submit"], div#deactivate-account ul li input[type="submit"] { - white-space: normal; } + div#apply_name_change ul, + div#change_email ul, + div#unenroll ul, + div#deactivate-account ul { + list-style: none; } + div#apply_name_change ul li, + div#change_email ul li, + div#unenroll ul li, + div#deactivate-account ul li { + margin-bottom: 12.944px; } + div#apply_name_change ul li textarea, div#apply_name_change ul li input[type="email"], div#apply_name_change ul li input[type="number"], div#apply_name_change ul li input[type="password"], div#apply_name_change ul li input[type="search"], div#apply_name_change ul li input[type="tel"], div#apply_name_change ul li input[type="text"], div#apply_name_change ul li input[type="url"], div#apply_name_change ul li input[type="color"], div#apply_name_change ul li input[type="date"], div#apply_name_change ul li input[type="datetime"], div#apply_name_change ul li input[type="datetime-local"], div#apply_name_change ul li input[type="month"], div#apply_name_change ul li input[type="time"], div#apply_name_change ul li input[type="week"], + div#change_email ul li textarea, + div#change_email ul li input[type="email"], + div#change_email ul li input[type="number"], + div#change_email ul li input[type="password"], + div#change_email ul li input[type="search"], + div#change_email ul li input[type="tel"], + div#change_email ul li input[type="text"], + div#change_email ul li input[type="url"], + div#change_email ul li input[type="color"], + div#change_email ul li input[type="date"], + div#change_email ul li input[type="datetime"], + div#change_email ul li input[type="datetime-local"], + div#change_email ul li input[type="month"], + div#change_email ul li input[type="time"], + div#change_email ul li input[type="week"], + div#unenroll ul li textarea, + div#unenroll ul li input[type="email"], + div#unenroll ul li input[type="number"], + div#unenroll ul li input[type="password"], + div#unenroll ul li input[type="search"], + div#unenroll ul li input[type="tel"], + div#unenroll ul li input[type="text"], + div#unenroll ul li input[type="url"], + div#unenroll ul li input[type="color"], + div#unenroll ul li input[type="date"], + div#unenroll ul li input[type="datetime"], + div#unenroll ul li input[type="datetime-local"], + div#unenroll ul li input[type="month"], + div#unenroll ul li input[type="time"], + div#unenroll ul li input[type="week"], + div#deactivate-account ul li textarea, + div#deactivate-account ul li input[type="email"], + div#deactivate-account ul li input[type="number"], + div#deactivate-account ul li input[type="password"], + div#deactivate-account ul li input[type="search"], + div#deactivate-account ul li input[type="tel"], + div#deactivate-account ul li input[type="text"], + div#deactivate-account ul li input[type="url"], + div#deactivate-account ul li input[type="color"], + div#deactivate-account ul li input[type="date"], + div#deactivate-account ul li input[type="datetime"], + div#deactivate-account ul li input[type="datetime-local"], + div#deactivate-account ul li input[type="month"], + div#deactivate-account ul li input[type="time"], + div#deactivate-account ul li input[type="week"] { + display: block; + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + div#apply_name_change ul li textarea, + div#change_email ul li textarea, + div#unenroll ul li textarea, + div#deactivate-account ul li textarea { + height: 60px; } + div#apply_name_change ul li input[type="submit"], + div#change_email ul li input[type="submit"], + div#unenroll ul li input[type="submit"], + div#deactivate-account ul li input[type="submit"] { + white-space: normal; } div#feedback_div form ol li { float: none; width: 100%; } -div#feedback_div form ol li textarea#feedback_message { - height: 100px; } + div#feedback_div form ol li textarea#feedback_message { + height: 100px; } diff --git a/static/images/marketing/edx-logo.png b/static/images/marketing/edx-logo.png new file mode 100644 index 0000000000..71dbafc375 Binary files /dev/null and b/static/images/marketing/edx-logo.png differ diff --git a/templates/accordion.html b/templates/accordion.html index a94f738d29..9a8f7ddefe 100644 --- a/templates/accordion.html +++ b/templates/accordion.html @@ -7,21 +7,12 @@