diff --git a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_local.scssc b/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_local.scssc deleted file mode 100644 index ff1f29cf58..0000000000 Binary files a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_local.scssc and /dev/null differ diff --git a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_reset.scssc b/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_reset.scssc deleted file mode 100644 index 38bc887589..0000000000 Binary files a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_reset.scssc and /dev/null differ diff --git a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_theme.scssc b/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_theme.scssc deleted file mode 100644 index 9e07958d19..0000000000 Binary files a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_theme.scssc and /dev/null differ diff --git a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/application.scssc b/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/application.scssc deleted file mode 100644 index 7590fe826d..0000000000 Binary files a/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/application.scssc and /dev/null differ diff --git a/djangoapps/courseware/content_parser.py b/djangoapps/courseware/content_parser.py index 4bbef650fa..eb1678536d 100644 --- a/djangoapps/courseware/content_parser.py +++ b/djangoapps/courseware/content_parser.py @@ -11,10 +11,11 @@ from lxml import etree try: # This lets us do __name__ == ='__main__' from django.conf import settings - from django.core.cache import cache + from student.models import UserProfile from student.models import UserTestGroup from mitxmako.shortcuts import render_to_response, render_to_string + from util.cache import cache except: settings = None @@ -157,10 +158,7 @@ def user_groups(user): cache_expiration = 60 * 60 # one hour # Kill caching on dev machines -- we switch groups a lot - if "dev" not in settings.DEFAULT_GROUPS: - group_names = cache.get(fasthash(key)) - else: - group_names = None + group_names = cache.get(fasthash(key)) if group_names is None: group_names = [u.name for u in UserTestGroup.objects.filter(users=user)] @@ -194,7 +192,11 @@ def course_file(user): cache_key = filename + "_processed?dev_content:" + str(options['dev_content']) + "&groups:" + str(sorted(groups)) - tree_string = cache.get(fasthash(cache_key)) + if "dev" not in settings.DEFAULT_GROUPS: + tree_string = cache.get(fasthash(cache_key)) + else: + tree_string = None + if not tree_string: tree = course_xml_process(etree.XML(render_to_string(filename, options, namespace = 'course'))) tree_string = etree.tostring(tree) diff --git a/djangoapps/simplewiki/models.py b/djangoapps/simplewiki/models.py index 58173e0ca0..33c9b0403e 100644 --- a/djangoapps/simplewiki/models.py +++ b/djangoapps/simplewiki/models.py @@ -3,7 +3,6 @@ import os from django import forms from django.contrib.auth.models import User -from django.core.cache import cache from django.core.urlresolvers import reverse from django.db import models from django.db.models import signals @@ -11,6 +10,8 @@ from django.utils.translation import ugettext_lazy as _ from markdown import markdown from settings import * +from util.cache import cache + class ShouldHaveExactlyOneRootSlug(Exception): pass diff --git a/lib/util/cache.py b/lib/util/cache.py new file mode 100644 index 0000000000..b0c370a035 --- /dev/null +++ b/lib/util/cache.py @@ -0,0 +1,16 @@ +""" +This module aims to give a little more fine-tuned control of caching and cache +invalidation. Import these instead of django.core.cache. + +Note that 'default' is being preserved for user session caching, which we're +not migrating so as not to inconvenience users by logging them all out. +""" +from django.core import cache + +# If we can't find a 'general' CACHE defined in settings.py, we simply fall back +# to returning the default cache. This will happen with dev machines. +try: + cache = cache.get_cache('general') +except ValueError: + cache = cache.cache + diff --git a/pre-requirements.txt b/pre-requirements.txt new file mode 100644 index 0000000000..24ce15ab7e --- /dev/null +++ b/pre-requirements.txt @@ -0,0 +1 @@ +numpy diff --git a/rakefile b/rakefile new file mode 100644 index 0000000000..014f9acf47 --- /dev/null +++ b/rakefile @@ -0,0 +1,50 @@ +require 'rake/clean' +require 'tempfile' + +REPO_ROOT = File.dirname(__FILE__) +BUILD_DIR = File.join(REPO_ROOT, "build") +CLOBBER.include('build') +CLEAN.include("#{BUILD_DIR}/*.deb") + +task :package do + commit = (ENV["GIT_COMMIT"] || `git rev-parse HEAD`).chomp() + branch = (ENV["GIT_BRANCH"] || `git symbolic-ref -q HEAD`).chomp() + branch = branch.gsub('refs/heads/', '').gsub('origin/', '').gsub('/', '_') + build_number = (ENV["BUILD_NUMBER"] || "dev").chomp() + + if branch == "master" + package_name = "mitx" + else + package_name = "mitx-#{branch}" + end + + FileUtils.mkdir_p(BUILD_DIR) + + Dir.chdir(BUILD_DIR) do + args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb", + "--exclude=build", + "--exclude=rakefile", + "--exclude=.git", + "--prefix=/opt/wwc/mitx-#{commit}", + "--depends=python-mysqldb", + "--depends=python-django", + "--depends=python-pip", + "--depends=python-flup", + "--depends=python-numpy", + "--depends=python-scipy", + "--depends=python-matplotlib", + "--depends=python-libxml2", + "--depends=python2.7-dev", + "--depends=libxml2-dev", + "--depends=libxslt-dev", + "--depends=python-markdown", + "--depends=python-pygments", + "--depends=mysql-client", + "--name=#{package_name}-#{commit}", + "--version=0.1", + "--iteration=#{build_number}", + "-a", "all", + "#{REPO_ROOT}"] + system(*args) || raise("fpm failed to build the .deb") + end +end diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..44eab85dc8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,14 @@ +django +pip +flup +scipy +matplotlib +markdown +pygments +django-mako +django-ses +lxml +boto +mako +python-memcached +django-celery diff --git a/settings.py b/settings.py index 371dc628f7..f819019122 100644 --- a/settings.py +++ b/settings.py @@ -166,8 +166,17 @@ MAKO_TEMPLATES = {} LOGGING_ENV = "dev" # override this in different environments +# Default dev cache (i.e. no caching) +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', + } +} + # Make sure we execute correctly regardless of where we're called from -execfile(os.path.join(BASE_DIR, "settings.py")) +override_settings = os.path.join(BASE_DIR, "settings.py") +if os.path.isfile(override_settings): + execfile(override_settings) # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to @@ -448,7 +457,7 @@ LIVESETTINGS_OPTIONS = { 'MIN_TITLE_LENGTH' : 1, 'MIN_QUESTION_BODY_LENGTH' : 1, 'MIN_ANSWER_BODY_LENGTH' : 1, - 'WIKI_ON' : True, + 'WIKI_ON' : False, 'ALLOW_ASK_ANONYMOUSLY' : True, 'ALLOW_POSTING_BEFORE_LOGGING_IN' : False, 'ALLOW_SWAPPING_QUESTION_WITH_ANSWER' : False, @@ -541,16 +550,16 @@ LIVESETTINGS_OPTIONS = { 'MIN_REP' : { 'MIN_REP_TO_ACCEPT_OWN_ANSWER' : 1, 'MIN_REP_TO_ANSWER_OWN_QUESTION' : 1, - 'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS' : 250, + 'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS' : 1200, 'MIN_REP_TO_CLOSE_OWN_QUESTIONS' : 1, - 'MIN_REP_TO_DELETE_OTHERS_COMMENTS' : 2000, - 'MIN_REP_TO_DELETE_OTHERS_POSTS' : 5000, - 'MIN_REP_TO_EDIT_OTHERS_POSTS' : 2000, - 'MIN_REP_TO_EDIT_WIKI' : 50, + 'MIN_REP_TO_DELETE_OTHERS_COMMENTS' : 5000, + 'MIN_REP_TO_DELETE_OTHERS_POSTS' : 10000, + 'MIN_REP_TO_EDIT_OTHERS_POSTS' : 5000, + 'MIN_REP_TO_EDIT_WIKI' : 200, 'MIN_REP_TO_FLAG_OFFENSIVE' : 1, 'MIN_REP_TO_HAVE_STRONG_URL' : 250, 'MIN_REP_TO_LEAVE_COMMENTS' : 1, - 'MIN_REP_TO_LOCK_POSTS' : 4000, + 'MIN_REP_TO_LOCK_POSTS' : 10000, 'MIN_REP_TO_REOPEN_OWN_QUESTIONS' : 1, 'MIN_REP_TO_RETAG_OTHERS_QUESTIONS' : 100, 'MIN_REP_TO_UPLOAD_FILES' : 1, diff --git a/static/css/application.css b/static/css/application.css index 1acdd88b9a..c1c2711603 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -129,7 +129,7 @@ input, select { font-weight: 800; font-style: italic; } -.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info > ol > li:after, div.gradebook-wrapper section.gradebook-content > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after { +.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, li.calc-main div#calculator_wrapper form div.input-wrapper:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after { content: "."; display: block; height: 0; @@ -161,8 +161,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #a2a2a2, 0 0 3px #cccccc; -moz-box-shadow: inset 0 1px 0 #a2a2a2, 0 0 3px #cccccc; - -ms-box-shadow: inset 0 1px 0 #a2a2a2, 0 0 3px #cccccc; - -o-box-shadow: inset 0 1px 0 #a2a2a2, 0 0 3px #cccccc; box-shadow: inset 0 1px 0 #a2a2a2, 0 0 3px #cccccc; color: #fff; cursor: pointer; @@ -181,8 +179,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se .button:hover, input[type="submit"]:hover, input[type="button"]:hover, button:hover, div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.answer-block div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.paginator div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.question-header div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.paginator div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:hover, .button:focus, input[type="submit"]:focus, input[type="button"]:focus, button:focus, div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.answer-block div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.paginator div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.question-header div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.paginator div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus, div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit:focus { -webkit-box-shadow: inset 0 1px 0 #bbbbbb, 0 0 3px #cccccc; -moz-box-shadow: inset 0 1px 0 #bbbbbb, 0 0 3px #cccccc; - -ms-box-shadow: inset 0 1px 0 #bbbbbb, 0 0 3px #cccccc; - -o-box-shadow: inset 0 1px 0 #bbbbbb, 0 0 3px #cccccc; box-shadow: inset 0 1px 0 #bbbbbb, 0 0 3px #cccccc; background-color: #a2a2a2; background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #a2a2a2), color-stop(100%, #7b7b7b)); @@ -196,13 +192,9 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se .content, div.course-wrapper section.course-content, div.book-wrapper section.book, div.info-wrapper section.updates, div.profile-wrapper section.course-info, div.gradebook-wrapper section.gradebook-content, div.wiki-wrapper section.wiki-body { -webkit-box-shadow: inset 0 0 2px 3px #f3f3f3; -moz-box-shadow: inset 0 0 2px 3px #f3f3f3; - -ms-box-shadow: inset 0 0 2px 3px #f3f3f3; - -o-box-shadow: inset 0 0 2px 3px #f3f3f3; box-shadow: inset 0 0 2px 3px #f3f3f3; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: table-cell; padding: 22.652px; @@ -212,8 +204,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se .content, div.course-wrapper section.course-content, div.book-wrapper section.book, div.info-wrapper section.updates, div.profile-wrapper section.course-info, div.gradebook-wrapper section.gradebook-content, div.wiki-wrapper section.wiki-body { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; } } .sidebar, section.course-index, div.book-wrapper section.book-sidebar, div.info-wrapper section.handouts, div.profile-wrapper section.user-info, div#wiki_panel, div.discussion-wrapper aside { @@ -226,13 +216,9 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-right: 1px solid #d3d3d3; -webkit-box-shadow: inset 0 0 0 1px #f6f6f6; -moz-box-shadow: inset 0 0 0 1px #f6f6f6; - -ms-box-shadow: inset 0 0 0 1px #f6f6f6; - -o-box-shadow: inset 0 0 0 1px #f6f6f6; box-shadow: inset 0 0 0 1px #f6f6f6; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: table-cell; font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; @@ -242,14 +228,15 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se width: 23.482%; } .sidebar h1, section.course-index h1, div.book-wrapper section.book-sidebar h1, div.info-wrapper section.handouts h1, div.profile-wrapper section.user-info h1, div#wiki_panel h1, div.discussion-wrapper aside h1, .sidebar h2, section.course-index h2, div.book-wrapper section.book-sidebar h2, div.info-wrapper section.handouts h2, div.profile-wrapper section.user-info h2, div#wiki_panel h2, div.discussion-wrapper aside h2 { font-size: 18px; - font-weight: 800; + font-weight: bold; letter-spacing: 0; text-transform: none; } + .sidebar a, section.course-index a, div.book-wrapper section.book-sidebar a, div.info-wrapper section.handouts a, div.profile-wrapper section.user-info a, div#wiki_panel a, div.discussion-wrapper aside a { + font-style: normal; + border: none; } .sidebar .bottom-border, section.course-index .bottom-border, div.book-wrapper section.book-sidebar .bottom-border, div.info-wrapper section.handouts .bottom-border, div.profile-wrapper section.user-info .bottom-border, div#wiki_panel .bottom-border, div.discussion-wrapper aside .bottom-border, .sidebar h3, section.course-index .sidebar h3, .sidebar section.course-index h3, div.book-wrapper section.book-sidebar .sidebar h3, .sidebar div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts .sidebar h3, .sidebar div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info .sidebar h3, .sidebar div.profile-wrapper section.user-info h3, div#wiki_panel .sidebar h3, .sidebar div#wiki_panel h3, div.discussion-wrapper aside .sidebar h3, .sidebar div.discussion-wrapper aside h3, .sidebar section.course-index h3, section.course-index .sidebar h3, section.course-index h3, div.book-wrapper section.book-sidebar section.course-index h3, section.course-index div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts section.course-index h3, section.course-index div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info section.course-index h3, section.course-index div.profile-wrapper section.user-info h3, div#wiki_panel section.course-index h3, section.course-index div#wiki_panel h3, div.discussion-wrapper aside section.course-index h3, section.course-index div.discussion-wrapper aside h3, .sidebar div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar .sidebar h3, section.course-index div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar section.course-index h3, div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar div.profile-wrapper section.user-info h3, div#wiki_panel div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar div#wiki_panel h3, div.discussion-wrapper aside div.book-wrapper section.book-sidebar h3, div.book-wrapper section.book-sidebar div.discussion-wrapper aside h3, .sidebar div.info-wrapper section.handouts h3, div.info-wrapper section.handouts .sidebar h3, section.course-index div.info-wrapper section.handouts h3, div.info-wrapper section.handouts section.course-index h3, div.book-wrapper section.book-sidebar div.info-wrapper section.handouts h3, div.info-wrapper section.handouts div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info div.info-wrapper section.handouts h3, div.info-wrapper section.handouts div.profile-wrapper section.user-info h3, div#wiki_panel div.info-wrapper section.handouts h3, div.info-wrapper section.handouts div#wiki_panel h3, div.discussion-wrapper aside div.info-wrapper section.handouts h3, div.info-wrapper section.handouts div.discussion-wrapper aside h3, .sidebar div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info .sidebar h3, section.course-index div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info section.course-index h3, div.book-wrapper section.book-sidebar div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info h3, div#wiki_panel div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info div#wiki_panel h3, div.discussion-wrapper aside div.profile-wrapper section.user-info h3, div.profile-wrapper section.user-info div.discussion-wrapper aside h3, .sidebar div#wiki_panel h3, div#wiki_panel .sidebar h3, section.course-index div#wiki_panel h3, div#wiki_panel section.course-index h3, div.book-wrapper section.book-sidebar div#wiki_panel h3, div#wiki_panel div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts div#wiki_panel h3, div#wiki_panel div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info div#wiki_panel h3, div#wiki_panel div.profile-wrapper section.user-info h3, div#wiki_panel h3, div.discussion-wrapper aside div#wiki_panel h3, div#wiki_panel div.discussion-wrapper aside h3, .sidebar div.discussion-wrapper aside h3, div.discussion-wrapper aside .sidebar h3, section.course-index div.discussion-wrapper aside h3, div.discussion-wrapper aside section.course-index h3, div.book-wrapper section.book-sidebar div.discussion-wrapper aside h3, div.discussion-wrapper aside div.book-wrapper section.book-sidebar h3, div.info-wrapper section.handouts div.discussion-wrapper aside h3, div.discussion-wrapper aside div.info-wrapper section.handouts h3, div.profile-wrapper section.user-info div.discussion-wrapper aside h3, div.discussion-wrapper aside div.profile-wrapper section.user-info h3, div#wiki_panel div.discussion-wrapper aside h3, div.discussion-wrapper aside div#wiki_panel h3, div.discussion-wrapper aside h3, .sidebar div#wiki_panel input[type="button"], section.course-index .sidebar div#wiki_panel input[type="button"], .sidebar div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar .sidebar div#wiki_panel input[type="button"], .sidebar div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts .sidebar div#wiki_panel input[type="button"], .sidebar div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info .sidebar div#wiki_panel input[type="button"], .sidebar div#wiki_panel div.profile-wrapper section.user-info input[type="button"], .sidebar div#wiki_panel input[type="button"], div.discussion-wrapper aside .sidebar div#wiki_panel input[type="button"], .sidebar div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel .sidebar input[type="button"], section.course-index div#wiki_panel .sidebar input[type="button"], div#wiki_panel .sidebar section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel .sidebar input[type="button"], div#wiki_panel .sidebar div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel .sidebar input[type="button"], div#wiki_panel .sidebar div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel .sidebar input[type="button"], div#wiki_panel .sidebar div.profile-wrapper section.user-info input[type="button"], div#wiki_panel .sidebar input[type="button"], div.discussion-wrapper aside div#wiki_panel .sidebar input[type="button"], div#wiki_panel .sidebar div.discussion-wrapper aside input[type="button"], .sidebar section.course-index div#wiki_panel input[type="button"], section.course-index div#wiki_panel .sidebar input[type="button"], section.course-index div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar section.course-index div#wiki_panel input[type="button"], section.course-index div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts section.course-index div#wiki_panel input[type="button"], section.course-index div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info section.course-index div#wiki_panel input[type="button"], section.course-index div#wiki_panel div.profile-wrapper section.user-info input[type="button"], section.course-index div#wiki_panel input[type="button"], div.discussion-wrapper aside section.course-index div#wiki_panel input[type="button"], section.course-index div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div#wiki_panel section.course-index input[type="button"], div#wiki_panel section.course-index .sidebar input[type="button"], div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel section.course-index input[type="button"], div#wiki_panel section.course-index div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel section.course-index input[type="button"], div#wiki_panel section.course-index div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel section.course-index input[type="button"], div#wiki_panel section.course-index div.profile-wrapper section.user-info input[type="button"], div#wiki_panel section.course-index input[type="button"], div.discussion-wrapper aside div#wiki_panel section.course-index input[type="button"], div#wiki_panel section.course-index div.discussion-wrapper aside input[type="button"], .sidebar div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel .sidebar input[type="button"], section.course-index div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.info-wrapper section.handouts div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.discussion-wrapper aside div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar .sidebar input[type="button"], section.course-index div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar section.course-index input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.discussion-wrapper aside div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar div.discussion-wrapper aside input[type="button"], .sidebar div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.info-wrapper section.handouts div#wiki_panel .sidebar input[type="button"], section.course-index div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.info-wrapper section.handouts div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.discussion-wrapper aside div.info-wrapper section.handouts div#wiki_panel input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div#wiki_panel div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.info-wrapper section.handouts .sidebar input[type="button"], section.course-index div#wiki_panel div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.info-wrapper section.handouts section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.info-wrapper section.handouts div.book-wrapper section.book-sidebar input[type="button"], div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.info-wrapper section.handouts div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.discussion-wrapper aside div#wiki_panel div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.info-wrapper section.handouts div.discussion-wrapper aside input[type="button"], .sidebar div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel .sidebar input[type="button"], section.course-index div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.discussion-wrapper aside div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info .sidebar input[type="button"], section.course-index div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info div.info-wrapper section.handouts input[type="button"], div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div.discussion-wrapper aside div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.profile-wrapper section.user-info div.discussion-wrapper aside input[type="button"], .sidebar div#wiki_panel input[type="button"], div#wiki_panel .sidebar input[type="button"], section.course-index div#wiki_panel input[type="button"], div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"], div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel input[type="button"], div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel input[type="button"], div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel input[type="button"], div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel .sidebar input[type="button"], section.course-index div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel section.course-index input[type="button"], div.book-wrapper section.book-sidebar div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel div.profile-wrapper section.user-info input[type="button"], div.discussion-wrapper aside div#wiki_panel input[type="button"], div.discussion-wrapper aside div#wiki_panel input[type="button"], .sidebar div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside .sidebar input[type="button"], section.course-index div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside section.course-index input[type="button"], div.book-wrapper section.book-sidebar div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside div.book-wrapper section.book-sidebar input[type="button"], div.info-wrapper section.handouts div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside div.info-wrapper section.handouts input[type="button"], div.profile-wrapper section.user-info div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside div.profile-wrapper section.user-info input[type="button"], div#wiki_panel div.discussion-wrapper aside input[type="button"], div#wiki_panel div.discussion-wrapper aside input[type="button"], .sidebar div.info-wrapper section.handouts h1, div.info-wrapper section.handouts .sidebar h1, section.course-index div.info-wrapper section.handouts h1, div.info-wrapper section.handouts section.course-index h1, div.book-wrapper section.book-sidebar div.info-wrapper section.handouts h1, div.info-wrapper section.handouts div.book-wrapper section.book-sidebar h1, div.info-wrapper section.handouts h1, div.profile-wrapper section.user-info div.info-wrapper section.handouts h1, div.info-wrapper section.handouts div.profile-wrapper section.user-info h1, div#wiki_panel div.info-wrapper section.handouts h1, div.info-wrapper section.handouts div#wiki_panel h1, div.discussion-wrapper aside div.info-wrapper section.handouts h1, div.info-wrapper section.handouts div.discussion-wrapper aside h1, .sidebar div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info .sidebar h1, section.course-index div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info section.course-index h1, div.book-wrapper section.book-sidebar div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info div.book-wrapper section.book-sidebar h1, div.info-wrapper section.handouts div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info div.info-wrapper section.handouts h1, div.profile-wrapper section.user-info h1, div#wiki_panel div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info div#wiki_panel h1, div.discussion-wrapper aside div.profile-wrapper section.user-info h1, div.profile-wrapper section.user-info div.discussion-wrapper aside h1, .sidebar div#wiki_panel h2, div#wiki_panel .sidebar h2, section.course-index div#wiki_panel h2, div#wiki_panel section.course-index h2, div.book-wrapper section.book-sidebar div#wiki_panel h2, div#wiki_panel div.book-wrapper section.book-sidebar h2, div.info-wrapper section.handouts div#wiki_panel h2, div#wiki_panel div.info-wrapper section.handouts h2, div.profile-wrapper section.user-info div#wiki_panel h2, div#wiki_panel div.profile-wrapper section.user-info h2, div#wiki_panel h2, div.discussion-wrapper aside div#wiki_panel h2, div#wiki_panel div.discussion-wrapper aside h2, .sidebar div.discussion-wrapper aside h1, div.discussion-wrapper aside .sidebar h1, section.course-index div.discussion-wrapper aside h1, div.discussion-wrapper aside section.course-index h1, div.book-wrapper section.book-sidebar div.discussion-wrapper aside h1, div.discussion-wrapper aside div.book-wrapper section.book-sidebar h1, div.info-wrapper section.handouts div.discussion-wrapper aside h1, div.discussion-wrapper aside div.info-wrapper section.handouts h1, div.profile-wrapper section.user-info div.discussion-wrapper aside h1, div.discussion-wrapper aside div.profile-wrapper section.user-info h1, div#wiki_panel div.discussion-wrapper aside h1, div.discussion-wrapper aside div#wiki_panel h1, div.discussion-wrapper aside h1 { -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; border-bottom: 1px solid #d3d3d3; } @media print { @@ -293,8 +280,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se background: #efefef; -webkit-box-shadow: 0 1px 0 white; -moz-box-shadow: 0 1px 0 white; - -ms-box-shadow: 0 1px 0 white; - -o-box-shadow: 0 1px 0 white; box-shadow: 0 1px 0 white; } .sidebar h3 span.ui-icon, section.course-index h3 span.ui-icon, div.book-wrapper section.book-sidebar h3 span.ui-icon, div.info-wrapper section.handouts h3 span.ui-icon, div.profile-wrapper section.user-info h3 span.ui-icon, div#wiki_panel h3 span.ui-icon, div.discussion-wrapper aside h3 span.ui-icon, .sidebar div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel .sidebar input[type="button"] span.ui-icon, section.course-index div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel section.course-index input[type="button"] span.ui-icon, div.book-wrapper section.book-sidebar div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel div.book-wrapper section.book-sidebar input[type="button"] span.ui-icon, div.info-wrapper section.handouts div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel div.info-wrapper section.handouts input[type="button"] span.ui-icon, div.profile-wrapper section.user-info div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel div.profile-wrapper section.user-info input[type="button"] span.ui-icon, div#wiki_panel input[type="button"] span.ui-icon, div.discussion-wrapper aside div#wiki_panel input[type="button"] span.ui-icon, div#wiki_panel div.discussion-wrapper aside input[type="button"] span.ui-icon { background-image: url(images/ui-icons_454545_256x240.png); } @@ -304,8 +289,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-bottom: 1px solid #bbb; -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; color: #000; font-weight: bold; } @@ -315,8 +298,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-bottom: 1px solid #d3d3d3; -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; padding: 11.326px 22.652px; position: relative; } @@ -348,8 +329,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-bottom: 1px solid #eddfaa; -webkit-box-shadow: inset 0 1px 0 white, inset 1px 0 0 white; -moz-box-shadow: inset 0 1px 0 white, inset 1px 0 0 white; - -ms-box-shadow: inset 0 1px 0 white, inset 1px 0 0 white; - -o-box-shadow: inset 0 1px 0 white, inset 1px 0 0 white; box-shadow: inset 0 1px 0 white, inset 1px 0 0 white; font-size: 12px; margin: -22.652px -22.652px 22.652px; @@ -360,6 +339,7 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se .topbar, nav.sequence-nav, div.book-wrapper section.book nav, div.wiki-wrapper section.wiki-body header { display: none; } } .topbar a, nav.sequence-nav a, div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header a { + border-bottom: 0; color: #292309; } .topbar a:hover, nav.sequence-nav a:hover, div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header a:hover { color: #7e691a; @@ -369,8 +349,6 @@ h1.top-header, div.course-wrapper section.course-content h1, div.info-wrapper se border-left: 1px solid #e4d080; -webkit-box-shadow: inset 1px 0 0 #faf7e9; -moz-box-shadow: inset 1px 0 0 #faf7e9; - -ms-box-shadow: inset 1px 0 0 #faf7e9; - -o-box-shadow: inset 1px 0 0 #faf7e9; box-shadow: inset 1px 0 0 #faf7e9; display: block; text-transform: uppercase; } @@ -437,8 +415,6 @@ img { input[type="email"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="url"], input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="time"], input[type="week"], textarea { -webkit-box-shadow: 0 -1px 0 white; -moz-box-shadow: 0 -1px 0 white; - -ms-box-shadow: 0 -1px 0 white; - -o-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)); @@ -461,8 +437,11 @@ a { color: #732626; } a:link, a:visited { text-decoration: none; } + p a, li > a, span > a, a .inline { + border-bottom: 1px solid #bbb; + font-style: italic; } a:hover, a:focus { - text-decoration: underline; } + color: #000; } html { margin-top: 0; } @@ -478,13 +457,9 @@ html { border-bottom: 1px solid #bbb; -webkit-box-shadow: 0 0 4px #dfdfdf; -moz-box-shadow: 0 0 4px #dfdfdf; - -ms-box-shadow: 0 0 4px #dfdfdf; - -o-box-shadow: 0 0 4px #dfdfdf; box-shadow: 0 0 4px #dfdfdf; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin-top: 3px; overflow: hidden; } @@ -515,8 +490,6 @@ div.header-wrapper { border-bottom: 1px solid #fff; -webkit-box-shadow: inset 0 -4px 6px #862d2d; -moz-box-shadow: inset 0 -4px 6px #862d2d; - -ms-box-shadow: inset 0 -4px 6px #862d2d; - -o-box-shadow: inset 0 -4px 6px #862d2d; box-shadow: inset 0 -4px 6px #862d2d; } @media print { div.header-wrapper { @@ -524,8 +497,6 @@ div.header-wrapper { div.header-wrapper header { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; padding: 0 22.652px; } div.header-wrapper header hgroup { @@ -572,7 +543,7 @@ div.header-wrapper { -webkit-font-smoothing: antialiased; } div.header-wrapper header hgroup h2 a { color: #fff; - text-decoration: none; } + border: none; } div.header-wrapper header hgroup h2 a:hover { color: rgba(255, 255, 255, 0.7); } @media screen and (max-width: 900px) { @@ -596,8 +567,6 @@ div.header-wrapper { border-radius: 3px 3px 0 0; -webkit-box-shadow: inset 0 0 0 1px #3b0c10, inset 0 2px 0 #65141c; -moz-box-shadow: inset 0 0 0 1px #3b0c10, inset 0 2px 0 #65141c; - -ms-box-shadow: inset 0 0 0 1px #3b0c10, inset 0 2px 0 #65141c; - -o-box-shadow: inset 0 0 0 1px #3b0c10, inset 0 2px 0 #65141c; box-shadow: inset 0 0 0 1px #3b0c10, inset 0 2px 0 #65141c; display: block; float: left; @@ -616,7 +585,8 @@ div.header-wrapper { display: block; font-weight: bold; padding: 10px 22.652px 8px; - text-decoration: none; } + border: none; + font-style: normal; } @media screen and (max-width: 1020px) { div.header-wrapper header nav ul li a { padding: 10px 15.856px 8px; } } @@ -643,8 +613,6 @@ div.header-wrapper { border-radius: 3px 3px 0 0; -webkit-box-shadow: 0 2px 0 #f4f4f4, inset 0 1px 0 white; -moz-box-shadow: 0 2px 0 #f4f4f4, inset 0 1px 0 white; - -ms-box-shadow: 0 2px 0 #f4f4f4, inset 0 1px 0 white; - -o-box-shadow: 0 2px 0 #f4f4f4, inset 0 1px 0 white; box-shadow: 0 2px 0 #f4f4f4, inset 0 1px 0 white; color: #333; text-shadow: 0 1px 0 #fff; } @@ -652,8 +620,6 @@ div.header-wrapper { footer { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; color: #777; margin-top: 22.652px; @@ -699,7 +665,8 @@ footer { display: block; height: 29px; width: 28px; - text-indent: -9999px; } + text-indent: -9999px; + border-bottom: 0; } footer nav ul.social li a:hover { opacity: .8; } footer nav ul.social li.twitter a { @@ -709,6 +676,162 @@ footer { footer nav ul.social li.linkedin a { background: url("/static/images/linkedin.png") 0 0 no-repeat; } +li.calc-main { + bottom: 0; + left: 0; + position: fixed; + width: 100%; } + li.calc-main a.calc { + text-indent: -9999px; + overflow: hidden; + display: block; + background: url("/static/images/calc-icon.png") rgba(17, 17, 17, 0.9) no-repeat center; + border-bottom: 0; + color: #fff; + float: right; + margin-right: 10px; + -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; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + padding: 8px 12px; + width: 16px; + height: 20px; } + li.calc-main a.calc:hover { + opacity: .8; } + li.calc-main a.calc.closed { + background-image: url("/static/images/close-calc-icon.png"); } + li.calc-main div#calculator_wrapper { + background: rgba(17, 17, 17, 0.9); + clear: both; } + li.calc-main div#calculator_wrapper form { + padding: 22.652px; } + li.calc-main div#calculator_wrapper form input#calculator_button { + background: #111; + border: 1px solid #000; + -webkit-border-radius: 0; + -moz-border-radius: 0; + -ms-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + color: #fff; + font-size: 30px; + font-weight: bold; + padding: 0; + text-shadow: none; + width: 4.251%; + float: left; + margin: 0 1.012%; } + li.calc-main div#calculator_wrapper form input#calculator_button:hover { + color: #333; } + li.calc-main div#calculator_wrapper form input#calculator_output { + background: #222; + border: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + color: #fff; + float: left; + font-size: 16px; + font-weight: bold; + margin: 1px 0 0; + padding: 10px; + width: 31.984%; } + li.calc-main div#calculator_wrapper form div.input-wrapper { + position: relative; + width: 61.741%; + margin: 0; + float: left; } + li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input { + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + font-size: 16px; + padding: 10px; + width: 100%; } + li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input:focus { + outline: none; + border: none; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper { + position: absolute; + right: 8px; + top: 15px; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper a { + text-indent: -9999px; + overflow: hidden; + display: block; + width: 17px; + height: 17px; + background: url("/static/images/info-icon.png") center center no-repeat; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl { + background: #fff; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 0 3px #999999; + -moz-box-shadow: 0 0 3px #999999; + box-shadow: 0 0 3px #999999; + color: #333; + opacity: 0; + padding: 10px; + position: absolute; + right: -40px; + top: -110px; + width: 500px; + -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; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl.shown { + opacity: 1; + top: -115px; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dt { + clear: both; + float: left; + font-weight: bold; + padding-right: 11.326px; } + li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dd { + float: left; } + #lean_overlay { position: fixed; z-index: 100; @@ -729,13 +852,9 @@ div.leanModal_box { border-radius: 3px; -webkit-box-shadow: 0 0 6px black; -moz-box-shadow: 0 0 6px black; - -ms-box-shadow: 0 0 6px black; - -o-box-shadow: 0 0 6px black; box-shadow: 0 0 6px black; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: none; padding: 45.304px; } @@ -815,8 +934,6 @@ div.leanModal_box { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } div.leanModal_box form ol li input[type="checkbox"] { margin-right: 10px; } @@ -838,8 +955,6 @@ div.leanModal_box { border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 0 #bc5c5c; -moz-box-shadow: inset 0 1px 0 0 #bc5c5c; - -ms-box-shadow: inset 0 1px 0 0 #bc5c5c; - -o-box-shadow: inset 0 1px 0 0 #bc5c5c; box-shadow: inset 0 1px 0 0 #bc5c5c; color: white; display: inline; @@ -860,8 +975,6 @@ div.leanModal_box { 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; - -ms-box-shadow: inset 0 1px 0 0 #a44141; - -o-box-shadow: inset 0 1px 0 0 #a44141; box-shadow: inset 0 1px 0 0 #a44141; cursor: pointer; background-color: #823030; @@ -875,8 +988,6 @@ div.leanModal_box { 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; - -ms-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - -o-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 { @@ -912,43 +1023,6 @@ div#feedback_div form ol li { div#feedback_div form ol li textarea#feedback_message { height: 100px; } -div#calculator_div { - max-width: 500px; } - div#calculator_div form { - padding-bottom: 22.652px; - margin-bottom: 22.652px; - border-bottom: 1px solid #ddd; } - div#calculator_div form input#calculator_input { - width: 400px; } - div#calculator_div form input#calculator_button { - background: 0; - color: #993333; - border: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; - box-shadow: none; - padding: 0; - text-shadow: none; } - div#calculator_div form input#calculator_button:hover { - color: #333; } - div#calculator_div form input#calculator_output { - border: 0; - background: none; - padding: 7.928px; - font-size: 24px; - width: 378px; - font-weight: bold; - margin-top: 4px; } - div#calculator_div dl dt { - float: left; - clear: both; - padding-right: 11.326px; - font-weight: bold; } - div#calculator_div dl dd { - float: left; } - /* * jQuery UI CSS Framework 1.8.16 * @@ -2454,8 +2528,6 @@ div.course-wrapper section.course-content .problem-set, div.course-wrapper secti border-right: 1px dashed #ddd; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: table-cell; vertical-align: top; } @@ -2571,8 +2643,6 @@ div.course-wrapper section.course-content div.ui-slider { background: #ddd; -webkit-box-shadow: inset 0 1px 0 #eeeeee; -moz-box-shadow: inset 0 1px 0 #eeeeee; - -ms-box-shadow: inset 0 1px 0 #eeeeee; - -o-box-shadow: inset 0 1px 0 #eeeeee; box-shadow: inset 0 1px 0 #eeeeee; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -2582,8 +2652,6 @@ div.course-wrapper section.course-content div.ui-slider { div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle { -webkit-box-shadow: inset 0 1px 0 #bf4040; -moz-box-shadow: inset 0 1px 0 #bf4040; - -ms-box-shadow: inset 0 1px 0 #bf4040; - -o-box-shadow: inset 0 1px 0 #bf4040; box-shadow: inset 0 1px 0 #bf4040; background: #993333 url(/static/images/slider-bars.png) center center no-repeat; border: 1px solid #4d1919; @@ -2614,8 +2682,6 @@ section.course-index div#accordion h3, section.course-index div#accordion div#wi section.course-index div#accordion h3:last-child, section.course-index div#accordion div#wiki_panel input[type="button"]:last-child, div#wiki_panel section.course-index div#accordion input[type="button"]:last-child { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; } section.course-index div#accordion h3.ui-accordion-header, section.course-index div#accordion div#wiki_panel input.ui-accordion-header[type="button"], div#wiki_panel section.course-index div#accordion input.ui-accordion-header[type="button"] { color: #000; } @@ -2633,28 +2699,29 @@ section.course-index div#accordion ul.ui-accordion-content { border-radius: 0; -webkit-box-shadow: inset -1px 0 0 #e6e6e6; -moz-box-shadow: inset -1px 0 0 #e6e6e6; - -ms-box-shadow: inset -1px 0 0 #e6e6e6; - -o-box-shadow: inset -1px 0 0 #e6e6e6; box-shadow: inset -1px 0 0 #e6e6e6; - background: #d6d6d6; + background: #dadada; border: none; border-bottom: 1px solid #c3c3c3; font-size: 12px; - margin: 0; - overflow: hidden; } - section.course-index div#accordion ul.ui-accordion-content li.active { - font-weight: bold; } - section.course-index div#accordion ul.ui-accordion-content li a { - text-decoration: none; - margin-bottom: 11.326px; - display: block; - color: #000; } - section.course-index div#accordion ul.ui-accordion-content li a:hover { - color: #666; } - section.course-index div#accordion ul.ui-accordion-content li a p { - margin-bottom: 0; } - section.course-index div#accordion ul.ui-accordion-content li a p.subtitle { + margin: 0; } + section.course-index div#accordion ul.ui-accordion-content li { + position: relative; } + section.course-index div#accordion ul.ui-accordion-content li.active { + font-weight: bold; } + section.course-index div#accordion ul.ui-accordion-content li.active p.subtitle { + font-weight: normal; } + section.course-index div#accordion ul.ui-accordion-content li a { + text-decoration: none; + margin-bottom: 11.326px; + display: block; + color: #000; } + section.course-index div#accordion ul.ui-accordion-content li a:hover { color: #666; } + section.course-index div#accordion ul.ui-accordion-content li a p { + margin-bottom: 0; } + section.course-index div#accordion ul.ui-accordion-content li a p.subtitle { + color: #666; } section.course-content div.video-subtitles { position: relative; } @@ -2695,8 +2762,6 @@ section.course-content div.video-subtitles { border-radius: 0; -webkit-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; -moz-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; - -ms-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; - -o-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; background: #c2c2c2; border: none; @@ -2710,8 +2775,6 @@ section.course-content div.video-subtitles { border-radius: 20px; -webkit-box-shadow: inset 0 1px 0 #bf4040; -moz-box-shadow: inset 0 1px 0 #bf4040; - -ms-box-shadow: inset 0 1px 0 #bf4040; - -o-box-shadow: inset 0 1px 0 #bf4040; box-shadow: inset 0 1px 0 #bf4040; background: #993333 url(/static/images/slider-handle.png) center center no-repeat; border: 1px solid #4d1919; @@ -2732,9 +2795,8 @@ section.course-content div.video-subtitles { section.course-content div.video-subtitles div.video-wrapper section.video-controls ul.vcr li a { -webkit-box-shadow: 1px 0 0 #555555; -moz-box-shadow: 1px 0 0 #555555; - -ms-box-shadow: 1px 0 0 #555555; - -o-box-shadow: 1px 0 0 #555555; box-shadow: 1px 0 0 #555555; + border-bottom: none; border-right: 1px solid #000; display: block; cursor: pointer; @@ -2762,13 +2824,32 @@ section.course-content div.video-subtitles { border-left: 1px solid #000; -webkit-box-shadow: 1px 0 0 #555555, inset 1px 0 0 #555555; -moz-box-shadow: 1px 0 0 #555555, inset 1px 0 0 #555555; - -ms-box-shadow: 1px 0 0 #555555, inset 1px 0 0 #555555; - -o-box-shadow: 1px 0 0 #555555, inset 1px 0 0 #555555; box-shadow: 1px 0 0 #555555, inset 1px 0 0 #555555; float: left; line-height: 46px; margin-right: 0; - -webkit-font-smoothing: antialiased; } + -webkit-font-smoothing: antialiased; + opacity: .7; + -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.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"], div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] { display: -moz-inline-box; -moz-box-orient: vertical; @@ -2776,19 +2857,9 @@ section.course-content div.video-subtitles { vertical-align: baseline; zoom: 1; *display: inline; - *vertical-align: auto; } - section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3 a, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"] a, div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] a { - color: #fff; - padding: 0 11.326px; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; } - section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds h3 a:hover, section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds div#wiki_panel input[type="button"] a:hover, div#wiki_panel section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds input[type="button"] a:hover { - text-decoration: none; } + *vertical-align: auto; + padding: 0 11.326px; + font-weight: normal; } section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds { display: -moz-inline-box; -moz-box-orient: vertical; @@ -2800,6 +2871,7 @@ section.course-content div.video-subtitles { padding-right: 11.326px; } section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li { cursor: pointer; + color: #fff; display: -moz-inline-box; -moz-box-orient: vertical; display: inline-block; @@ -2809,6 +2881,11 @@ section.course-content div.video-subtitles { *vertical-align: auto; } section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li.active { font-weight: bold; } + section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li:hover { + color: #aaa; } + section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds:hover { + opacity: 1; + background-color: #444; } section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles { float: left; display: block; @@ -2819,7 +2896,27 @@ section.course-content div.video-subtitles { line-height: 46px; font-weight: 800; background: url("/static/images/cc.png") 16px center no-repeat; - -webkit-font-smoothing: antialiased; } + -webkit-font-smoothing: antialiased; + -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.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles:hover { color: #fff; text-decoration: none; @@ -2868,8 +2965,6 @@ nav.sequence-nav { background-repeat: no-repeat; -webkit-box-shadow: inset 0 0 3px #ceb97d; -moz-box-shadow: inset 0 0 3px #ceb97d; - -ms-box-shadow: inset 0 0 3px #ceb97d; - -o-box-shadow: inset 0 0 3px #ceb97d; box-shadow: inset 0 0 3px #ceb97d; } nav.sequence-nav ol li .visited:hover, nav.sequence-nav ol li a.seq_video_visited:hover, nav.sequence-nav ol li a.seq_other_visited:hover, nav.sequence-nav ol li a.seq_vertical_visited:hover, nav.sequence-nav ol li a.seq_problem_visited:hover { background-color: #f6efd4; @@ -2877,8 +2972,6 @@ nav.sequence-nav { nav.sequence-nav ol li .active, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a, nav.sequence-nav ol div.header-wrapper header nav.book li.book a, div.header-wrapper header nav.book nav.sequence-nav ol li.book a, nav.sequence-nav ol div.header-wrapper header nav.info li.info a, div.header-wrapper header nav.info nav.sequence-nav ol li.info a, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"], section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"], div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li a.seq_video_active, nav.sequence-nav ol li a.seq_other_active, nav.sequence-nav ol li a.seq_vertical_active, nav.sequence-nav ol li a.seq_problem_active { -webkit-box-shadow: 0 1px 0 white; -moz-box-shadow: 0 1px 0 white; - -ms-box-shadow: 0 1px 0 white; - -o-box-shadow: 0 1px 0 white; box-shadow: 0 1px 0 white; background-color: #fff; background-repeat: no-repeat; } @@ -2888,8 +2981,6 @@ nav.sequence-nav { nav.sequence-nav ol li a { -webkit-box-shadow: 1px 0 0 white; -moz-box-shadow: 1px 0 0 white; - -ms-box-shadow: 1px 0 0 white; - -o-box-shadow: 1px 0 0 white; box-shadow: 1px 0 0 white; background-position: center center; border: none; @@ -2897,7 +2988,27 @@ nav.sequence-nav { cursor: pointer; padding: 15px 4px 14px; width: 28px; - height: 17px; } + height: 17px; + -webkit-transition-property: all; + -moz-transition-property: all; + -ms-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.4s; + -moz-transition-duration: 0.4s; + -ms-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + transition-duration: 0.4s; + -webkit-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -moz-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -ms-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -o-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -webkit-transition-delay: 0; + -moz-transition-delay: 0; + -ms-transition-delay: 0; + -o-transition-delay: 0; + transition-delay: 0; } nav.sequence-nav ol li a.seq_video_inactive { background-image: url("/static/images/sequence-nav/video-icon-normal.png"); background-position: center; } @@ -2926,16 +3037,39 @@ nav.sequence-nav { background-image: url("/static/images/sequence-nav/list-icon-current.png"); background-position: center; } nav.sequence-nav ol li p { - position: absolute; - display: none; background: #333; - padding: 6px; - white-space: pre-wrap; - z-index: 99; - margin: 4px 0 0 -5px; - text-shadow: 0 -1px 0 black; color: #fff; - line-height: 22.652px; } + line-height: 22.652px; + margin: 0px 0 0 -5px; + opacity: 0; + padding: 6px; + position: absolute; + text-shadow: 0 -1px 0 black; + -webkit-transition-property: all; + -moz-transition-property: all; + -ms-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.6s; + -moz-transition-duration: 0.6s; + -ms-transition-duration: 0.6s; + -o-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transition-timing-function: cubic-bezier(0.77, 0, 0.175, 1); + -moz-transition-timing-function: cubic-bezier(0.77, 0, 0.175, 1); + -ms-transition-timing-function: cubic-bezier(0.77, 0, 0.175, 1); + -o-transition-timing-function: cubic-bezier(0.77, 0, 0.175, 1); + transition-timing-function: cubic-bezier(0.77, 0, 0.175, 1); + -webkit-transition-delay: 0; + -moz-transition-delay: 0; + -ms-transition-delay: 0; + -o-transition-delay: 0; + transition-delay: 0; + white-space: pre-wrap; + z-index: 99; } + nav.sequence-nav ol li p.shown { + opacity: 1; + margin-top: 4px; } nav.sequence-nav ol li p:empty { background: none; } nav.sequence-nav ol li p:empty::after { @@ -2953,26 +3087,6 @@ nav.sequence-nav { -ms-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); - -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; width: 10px; } nav.sequence-nav ul { float: right; @@ -2984,8 +3098,6 @@ nav.sequence-nav { nav.sequence-nav ul li.prev a, nav.sequence-nav ul li.next a { -webkit-box-shadow: inset 1px 0 0 #faf7e9; -moz-box-shadow: inset 1px 0 0 #faf7e9; - -ms-box-shadow: inset 1px 0 0 #faf7e9; - -o-box-shadow: inset 1px 0 0 #faf7e9; box-shadow: inset 1px 0 0 #faf7e9; background-color: #f2e7bf; background-position: center center; @@ -3013,53 +3125,80 @@ nav.sequence-nav { nav.sequence-nav ul li.next a:hover { background-color: none; } -section.course-content nav.sequence-bottom { - margin-bottom: -22.652px; } - section.course-content nav.sequence-bottom ul { - 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; - margin: 22.652px auto 0; - overflow: hidden; - width: 106px; - background-color: #f2e7bf; - -webkit-box-shadow: inset 0 0 0 1px #faf7e9; - -moz-box-shadow: inset 0 0 0 1px #faf7e9; - -ms-box-shadow: inset 0 0 0 1px #faf7e9; - -o-box-shadow: inset 0 0 0 1px #faf7e9; - box-shadow: inset 0 0 0 1px #faf7e9; } - 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 { - margin-bottom: 0; } - section.course-content nav.sequence-bottom ul li.prev a, section.course-content nav.sequence-bottom ul li.next a { - background-position: center center; - background-repeat: no-repeat; - padding: 16.989px 4px; - text-indent: -9999px; - width: 45px; - display: block; } - section.course-content nav.sequence-bottom ul li.prev a:hover, section.course-content nav.sequence-bottom ul li.next a:hover { - text-decoration: none; - color: #7e691a; - text-decoration: none; - opacity: .5; - background-color: #eddfaa; } - section.course-content nav.sequence-bottom ul li.prev a.disabled, section.course-content nav.sequence-bottom ul li.next a.disabled { - opacity: .4; - background-color: #fffffe; } - section.course-content nav.sequence-bottom ul li.prev a { - background-image: url("/static/images/sequence-nav/previous-icon.png"); } - section.course-content nav.sequence-bottom ul li.prev a:hover { - background-color: none; } - section.course-content nav.sequence-bottom ul li.next a { - background-image: url("/static/images/sequence-nav/next-icon.png"); } - section.course-content nav.sequence-bottom ul li.next a:hover { - background-color: none; } +section.course-content { + position: relative; } + section.course-content div#seq_content { + margin-bottom: 60px; } + section.course-content nav.sequence-bottom { + position: absolute; + bottom: 0; + right: 50%; + margin-right: -53px; } + section.course-content nav.sequence-bottom ul { + 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; + overflow: hidden; + width: 106px; + background-color: #f2e7bf; + -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; } + 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 { + margin-bottom: 0; } + section.course-content nav.sequence-bottom ul li.prev a, section.course-content nav.sequence-bottom ul li.next a { + background-position: center center; + background-repeat: no-repeat; + border-bottom: none; + display: block; + padding: 16.989px 4px; + text-indent: -9999px; + width: 45px; + display: block; + -webkit-transition-property: all; + -moz-transition-property: all; + -ms-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.4s; + -moz-transition-duration: 0.4s; + -ms-transition-duration: 0.4s; + -o-transition-duration: 0.4s; + transition-duration: 0.4s; + -webkit-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -moz-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -ms-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -o-transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + transition-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955); + -webkit-transition-delay: 0; + -moz-transition-delay: 0; + -ms-transition-delay: 0; + -o-transition-delay: 0; + transition-delay: 0; } + 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"); } + section.course-content nav.sequence-bottom ul li.prev a:hover { + background-color: none; } + section.course-content nav.sequence-bottom ul li.next a { + background-image: url("/static/images/sequence-nav/next-icon.png"); } + section.course-content nav.sequence-bottom ul li.next a:hover { + background-color: none; } div#graph-container { border-top: 1px solid #ddd; @@ -3119,8 +3258,6 @@ div.graph-controls label[for="vrCheckbox"], div.graph-controls label[for="vrRadi div.book-wrapper section.book-sidebar { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } div.book-wrapper section.book-sidebar ul#booknav { font-size: 12px; } @@ -3145,8 +3282,6 @@ div.book-wrapper section.book-sidebar { border-bottom: 1px solid #d3d3d3; -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; padding: 7px 7px 7px 30px; } div.book-wrapper section.book nav a { @@ -3157,8 +3292,6 @@ div.book-wrapper section.book nav ul li.last { div.book-wrapper section.book nav ul li.last a { -webkit-box-shadow: inset -1px 0 0 #faf7e9; -moz-box-shadow: inset -1px 0 0 #faf7e9; - -ms-box-shadow: inset -1px 0 0 #faf7e9; - -o-box-shadow: inset -1px 0 0 #faf7e9; box-shadow: inset -1px 0 0 #faf7e9; border-right: 1px solid #e4d080; border-left: 0; } @@ -3202,11 +3335,6 @@ div.info-wrapper section.updates > ol { padding-bottom: 11.326px; margin-bottom: 11.326px; border-bottom: 1px solid #e3e3e3; } - div.info-wrapper section.updates > ol > li:first-child { - padding: 11.326px; - margin-left: -11.326px; - background: #f6efd4; - border-bottom: 1px solid #eddfaa; } div.info-wrapper section.updates > ol > li h2 { float: left; width: 20.109%; @@ -3215,6 +3343,8 @@ div.info-wrapper section.updates > ol { float: left; width: 77.174%; margin-bottom: 0; } + div.info-wrapper section.updates > ol > li section.update-description li { + margin-bottom: 11.326px; } div.info-wrapper section.updates > ol > li section.update-description p:last-child { margin-bottom: 0; } div.info-wrapper section.handouts { @@ -3234,8 +3364,6 @@ div.info-wrapper section.handouts { div.info-wrapper section.handouts ol li { -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; border-bottom: 1px solid #d3d3d3; } div.info-wrapper section.handouts ol li p { @@ -3322,8 +3450,6 @@ div.profile-wrapper { text-decoration: none; -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; padding: 7px 22.652px; border-bottom: 1px solid #d3d3d3; @@ -3344,8 +3470,6 @@ div.profile-wrapper { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } div.profile-wrapper section.user-info ul li div#location_sub:empty, div.profile-wrapper section.user-info ul li div#language_sub:empty { padding: 0; } @@ -3381,8 +3505,6 @@ div.profile-wrapper { border-right: 1px dashed #ddd; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: table-cell; margin: 0; @@ -3408,29 +3530,6 @@ div.profile-wrapper { display: inline-block; padding-right: 1em; } -div.gradebook-wrapper section.gradebook-content > ol { - list-style: none; - margin-top: 22.652px; } - div.gradebook-wrapper section.gradebook-content > ol > li { - border-bottom: 1px solid #e3e3e3; - display: table; - padding: 22.652px 0; - width: 100%; } - div.gradebook-wrapper section.gradebook-content > ol > li:last-child { - border-bottom: 0px; } - div.gradebook-wrapper section.gradebook-content > ol > li h2 { - border-right: 1px dashed #ddd; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; - box-sizing: border-box; - display: table-cell; - margin: 0; - padding: 0; - width: 20.109%; - vertical-align: top; } - section.wiki-body h1 { font-weight: bold; font-size: 2em; @@ -3572,15 +3671,11 @@ div#wiki_panel { div#wiki_panel input[type="button"]:hover { -webkit-box-shadow: 0 1px 0 white; -moz-box-shadow: 0 1px 0 white; - -ms-box-shadow: 0 1px 0 white; - -o-box-shadow: 0 1px 0 white; box-shadow: 0 1px 0 white; background: #efefef; } div#wiki_panel ul li.search { -webkit-box-shadow: 0 1px 0 #eeeeee; -moz-box-shadow: 0 1px 0 #eeeeee; - -ms-box-shadow: 0 1px 0 #eeeeee; - -o-box-shadow: 0 1px 0 #eeeeee; box-shadow: 0 1px 0 #eeeeee; border-bottom: 1px solid #d3d3d3; padding: 7px 22.652px; } @@ -3598,8 +3693,6 @@ div#wiki_panel { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } div#wiki_panel div#wiki_create_form ul { list-style: none; } @@ -3619,8 +3712,6 @@ form#wiki_revision { form#wiki_revision textarea { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin-bottom: 20px; min-height: 450px; @@ -3631,8 +3722,6 @@ form#wiki_revision { form#wiki_revision #submit_delete { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; background: none; border: none; @@ -3669,8 +3758,6 @@ div.wiki-wrapper { height: 46px; -webkit-box-shadow: inset 0 1px 0 white; -moz-box-shadow: inset 0 1px 0 white; - -ms-box-shadow: inset 0 1px 0 white; - -o-box-shadow: inset 0 1px 0 white; box-shadow: inset 0 1px 0 white; } div.wiki-wrapper section.wiki-body header:empty { display: none !important; @@ -3699,8 +3786,6 @@ div.wiki-wrapper { border-radius: 0; -webkit-box-shadow: inset 1px 0 0 #faf7e9; -moz-box-shadow: inset 1px 0 0 #faf7e9; - -ms-box-shadow: inset 1px 0 0 #faf7e9; - -o-box-shadow: inset 1px 0 0 #faf7e9; box-shadow: inset 1px 0 0 #faf7e9; color: #292309; display: block; @@ -3743,8 +3828,6 @@ div.wiki-wrapper { div.wiki-wrapper section.wiki-body h2.wiki-title { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: inline-block; float: left; @@ -3768,8 +3851,6 @@ div.wiki-wrapper { div.wiki-wrapper section.wiki-body section.results { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: inline-block; border-left: 1px dashed #ddd; @@ -4828,8 +4909,6 @@ pre.prettyprint { .light-button, div.history-controls input[type="submit"], body.askbot section.main-content div.discussion-wrapper div.discussion-content a.tabula-rasa, html body.askbot section.outside-app div.discussion-wrapper div.discussion-content a.tabula-rasa, body.askbot section.main-content div.discussion-wrapper div.discussion-content .tabula-rasa, html body.askbot section.outside-app div.discussion-wrapper div.discussion-content .tabula-rasa, ul.question-list div.post-own-question a, div#question-list div.post-own-question a, div.question-header div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.question-header div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.question-header div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator span.next, div.paginator span.prev, form.answer-form div.preview-toggle a, form.question-form div.preview-toggle a, a.light-button, body.askbot section.main-content div.discussion-wrapper div.discussion-content a.tabula-rasa, html body.askbot section.outside-app div.discussion-wrapper div.discussion-content a.tabula-rasa, ul.question-list div.post-own-question a, div#question-list div.post-own-question a, form.answer-form div.preview-toggle a, form.question-form div.preview-toggle a { -webkit-box-shadow: inset 0 1px 0 white; -moz-box-shadow: inset 0 1px 0 white; - -ms-box-shadow: inset 0 1px 0 white; - -o-box-shadow: inset 0 1px 0 white; box-shadow: inset 0 1px 0 white; background-color: white; background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eeeeee)); @@ -4870,8 +4949,6 @@ pre.prettyprint { body.askbot section.main-content div.discussion-wrapper div.discussion-content, html body.askbot section.outside-app div.discussion-wrapper div.discussion-content { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: table-cell; min-width: 650px; @@ -4907,8 +4984,6 @@ body.askbot section.main-content div.discussion-wrapper div.discussion-content, padding: 0px; -webkit-box-shadow: 0 2px 2px #bbbbbb; -moz-box-shadow: 0 2px 2px #bbbbbb; - -ms-box-shadow: 0 2px 2px #bbbbbb; - -o-box-shadow: 0 2px 2px #bbbbbb; box-shadow: 0 2px 2px #bbbbbb; } .acResults ul { list-style-position: outside; @@ -4944,8 +5019,6 @@ div.discussion-wrapper aside { border-right: 1px solid #f6f6f6; -webkit-box-shadow: inset 1px 0 0 #f6f6f6; -moz-box-shadow: inset 1px 0 0 #f6f6f6; - -ms-box-shadow: inset 1px 0 0 #f6f6f6; - -o-box-shadow: inset 1px 0 0 #f6f6f6; box-shadow: inset 1px 0 0 #f6f6f6; padding: 22.652px; width: 23.482%; } @@ -4972,8 +5045,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.box:last-child { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; border: 0; } div.discussion-wrapper aside div.box h2 { @@ -4984,8 +5055,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.box h2:not(.first) { -webkit-box-shadow: inset 0 1px 0 #eeeeee; -moz-box-shadow: inset 0 1px 0 #eeeeee; - -ms-box-shadow: inset 0 1px 0 #eeeeee; - -o-box-shadow: inset 0 1px 0 #eeeeee; box-shadow: inset 0 1px 0 #eeeeee; border-top: 1px solid #d3d3d3; margin: 0 -22.652px 0; @@ -5009,8 +5078,6 @@ div.discussion-wrapper aside { border-radius: 3px; -webkit-box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 0.4); -moz-box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 0.4); - -ms-box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 0.4); - -o-box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 0.4); box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 0.4); top: 1px; left: 1px; @@ -5032,15 +5099,11 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.search-box input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: inline; } div.discussion-wrapper aside div.search-box input[type='submit'] { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; opacity: 0.5; background: url(/static/images/askbot/search-icon.png) no-repeat center; @@ -5060,8 +5123,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.search-box input#clear { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -5078,8 +5139,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div#tagSelector h2 { -webkit-box-shadow: inset 0 1px 0 #eeeeee; -moz-box-shadow: inset 0 1px 0 #eeeeee; - -ms-box-shadow: inset 0 1px 0 #eeeeee; - -o-box-shadow: inset 0 1px 0 #eeeeee; box-shadow: inset 0 1px 0 #eeeeee; border-top: 1px solid #d3d3d3; margin: 0 -22.652px 0; @@ -5107,8 +5166,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.follow-buttons a.button, div.discussion-wrapper aside div.follow-buttons div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.answer-block div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.answer-block div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.paginator div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.paginator div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.question-header div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.answer-block div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.paginator div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.answer-block div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.question-header div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.question-header div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.paginator div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.paginator div.question-header div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit, div.discussion-wrapper aside div.follow-buttons div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit, div.paginator div.answer-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta div.discussion-wrapper aside div.follow-buttons a.edit { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: block; text-align: center; @@ -5121,8 +5178,6 @@ div.discussion-wrapper aside { div.discussion-wrapper aside div.question-stats ul li:last-child, div.discussion-wrapper aside div.user-info ul li:last-child, div.discussion-wrapper aside div.user-stats ul li:last-child { -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; border: 0; } div.discussion-wrapper aside div.question-stats ul li strong, div.discussion-wrapper aside div.user-info ul li strong, div.discussion-wrapper aside div.user-stats ul li strong { @@ -5143,13 +5198,9 @@ div.discussion-wrapper aside { border-radius: 3px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; -webkit-box-shadow: inset 0 0 0 1px white, 0 1px 0 white; -moz-box-shadow: inset 0 0 0 1px white, 0 1px 0 white; - -ms-box-shadow: inset 0 0 0 1px white, 0 1px 0 white; - -o-box-shadow: inset 0 0 0 1px white, 0 1px 0 white; box-shadow: inset 0 0 0 1px white, 0 1px 0 white; padding: 9.061px 0; text-align: center; @@ -5163,15 +5214,11 @@ div.discussion-wrapper aside { padding-right: 4.31%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } div.discussion-wrapper aside div.user-info div.meta h2, div.discussion-wrapper aside div.user-stats div.meta h2 { border: 0; -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; margin: 0 0 8px 0; padding: 0; } @@ -5199,15 +5246,11 @@ div.discussion-wrapper aside { border-top: 0; -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; } div.discussion-wrapper aside div.view-profile a { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; text-align: center; padding: 10px; @@ -5293,8 +5336,6 @@ ul.question-list, div#question-list { ul.question-list li.single-question div.question-body, ul.question-list li.single-question div.answer-block div.answer-container div.answer-content div.answer-body, div.answer-block div.answer-container div.answer-content ul.question-list li.single-question div.answer-body, ul.question-list li.single-question div.paginator div.answer-container div.answer-content div.answer-body, div.paginator div.answer-container div.answer-content ul.question-list li.single-question div.answer-body, div#question-list li.single-question div.question-body, div#question-list li.single-question div.answer-block div.answer-container div.answer-content div.answer-body, div.answer-block div.answer-container div.answer-content div#question-list li.single-question div.answer-body, div#question-list li.single-question div.paginator div.answer-container div.answer-content div.answer-body, div.paginator div.answer-container div.answer-content div#question-list li.single-question div.answer-body { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin-right: 2.024%; width: 60.054%; } @@ -5326,8 +5367,6 @@ ul.question-list, div#question-list { border: 1px solid #ddd; -webkit-box-shadow: 0 1px 0 white; -moz-box-shadow: 0 1px 0 white; - -ms-box-shadow: 0 1px 0 white; - -o-box-shadow: 0 1px 0 white; box-shadow: 0 1px 0 white; display: inline-block; height: 60px; @@ -5360,8 +5399,6 @@ ul.question-list, div#question-list { ul.question-list li.single-question div.question-meta ul li span, ul.question-list li.single-question div.question-meta ul li div, div#question-list li.single-question div.question-meta ul li span, div#question-list li.single-question div.question-meta ul li div { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; color: #888; display: block; @@ -5402,8 +5439,6 @@ ul.tags { border-radius: 4px; -webkit-box-shadow: 0px 1px 0px #cccccc; -moz-box-shadow: 0px 1px 0px #cccccc; - -ms-box-shadow: 0px 1px 0px #cccccc; - -o-box-shadow: 0px 1px 0px #cccccc; box-shadow: 0px 1px 0px #cccccc; color: #555; display: inline-block; @@ -5442,7 +5477,9 @@ ul.tags { opacity: 1; } ul.tags li a { color: #555; - text-decoration: none; } + text-decoration: none; + border-bottom: none; + font-style: normal; } span.tag-number { display: none; } @@ -5472,15 +5509,11 @@ div.question-header div.vote-buttons, div.answer-block div.vote-buttons, div.pag border: 1px solid #eddfaa; -webkit-box-shadow: inset 0 1px 0px white; -moz-box-shadow: inset 0 1px 0px white; - -ms-box-shadow: inset 0 1px 0px white; - -o-box-shadow: inset 0 1px 0px white; box-shadow: inset 0 1px 0px white; } div.question-header div.vote-buttons ul li.question-img-upvote, div.answer-block div.vote-buttons ul li.question-img-upvote, div.paginator div.vote-buttons ul li.question-img-upvote, div.question-header div.vote-buttons ul li.answer-img-upvote, div.answer-block div.vote-buttons ul li.answer-img-upvote, div.paginator div.vote-buttons ul li.answer-img-upvote { background-image: url(/static/images/askbot/vote-arrow-up.png); -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); - -ms-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); - -o-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); } div.question-header div.vote-buttons ul li.question-img-upvote:hover, div.answer-block div.vote-buttons ul li.question-img-upvote:hover, div.paginator div.vote-buttons ul li.question-img-upvote:hover, div.question-header div.vote-buttons ul li.question-img-upvote.on, div.answer-block div.vote-buttons ul li.question-img-upvote.on, div.paginator div.vote-buttons ul li.question-img-upvote.on, div.question-header div.vote-buttons ul li.answer-img-upvote:hover, div.answer-block div.vote-buttons ul li.answer-img-upvote:hover, div.paginator div.vote-buttons ul li.answer-img-upvote:hover, div.question-header div.vote-buttons ul li.answer-img-upvote.on, div.answer-block div.vote-buttons ul li.answer-img-upvote.on, div.paginator div.vote-buttons ul li.answer-img-upvote.on { background-color: #d1e3a8; @@ -5540,11 +5573,12 @@ div.question-header div.question-container, div.answer-block div.question-contai float: left; width: 20%; border-left: 1px dashed #ddd; } + div.question-header div.question-container div.question-content div.post-update-container a, div.answer-block div.question-container div.question-content div.post-update-container a, div.paginator div.question-container div.question-content div.post-update-container a, div.question-header div.answer-block div.answer-container div.question-content div.post-update-container a, div.answer-block div.question-header div.answer-container div.question-content div.post-update-container a, div.answer-block div.answer-container div.question-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container a, div.question-header div.paginator div.answer-container div.question-content div.post-update-container a, div.paginator div.question-header div.answer-container div.question-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container a, div.paginator div.answer-container div.question-content div.post-update-container a, div.question-header div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.answer-container div.question-header div.question-container div.answer-content div.post-update-container a, div.answer-block div.question-container div.answer-container div.answer-content div.post-update-container a, div.answer-block div.answer-container div.question-container div.answer-content div.post-update-container a, div.paginator div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.answer-container div.paginator div.question-container div.answer-content div.post-update-container a, div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container a, div.answer-block div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.question-header div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.question-header div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.question-header div.question-container div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-container div.question-header div.question-container div.answer-content div.post-update-container a, div.answer-block div.question-container div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-container div.answer-block div.question-container div.answer-content div.post-update-container a, div.paginator div.question-container div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-container div.question-container div.answer-content div.post-update-container a, div.question-header div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.question-header div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.question-header div.answer-container div.answer-content div.post-update-container a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container a, div.paginator div.answer-container div.answer-content div.post-update-container a { + border-bottom: none; + font-style: normal; } div.question-header div.question-container div.question-content div.post-update-container div.post-update-info, div.answer-block div.question-container div.question-content div.post-update-container div.post-update-info, div.paginator div.question-container div.question-content div.post-update-container div.post-update-info, div.question-header div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info, div.answer-block div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info, div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info, div.question-header div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info, div.paginator div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info, div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info, div.question-header div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.answer-container div.paginator div.question-container div.answer-content div.post-update-container div.post-update-info, div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.question-header div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.question-header div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-container div.answer-block div.question-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info, div.question-header div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info, div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; padding: 10px; margin-bottom: 10px; } @@ -5555,8 +5589,6 @@ div.question-header div.question-container, div.answer-block div.question-contai background: #fcfaf2; } div.question-header div.question-container div.question-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-container div.question-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-container div.question-content div.post-update-container div.post-update-info.revision a, div.question-header div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.question-header div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info.revision a, div.question-header div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.answer-container div.paginator div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.question-header div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.question-header div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-container div.answer-block div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info.revision a, div.question-header div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a, div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info.revision a { color: black; } - div.question-header div.question-container div.question-content div.post-update-container div.post-update-info a, div.answer-block div.question-container div.question-content div.post-update-container div.post-update-info a, div.paginator div.question-container div.question-content div.post-update-container div.post-update-info a, div.question-header div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info a, div.answer-block div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info a, div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info a, div.question-header div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info a, div.paginator div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info a, div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info a, div.question-header div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.answer-container div.paginator div.question-container div.answer-content div.post-update-container div.post-update-info a, div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.question-header div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.question-header div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-container div.answer-block div.question-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info a, div.question-header div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info a, div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info a { - color: #993333; } div.question-header div.question-container div.question-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-container div.question-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-container div.question-content div.post-update-container div.post-update-info div.change-date, div.question-header div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.question-header div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-header div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-container div.question-content div.post-update-container div.post-update-info div.change-date, div.question-header div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-container div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.answer-container div.paginator div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.question-header div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.question-header div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-container div.question-header div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-container div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-container div.answer-block div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-container div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-container div.question-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.question-header div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-header div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.question-header div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.question-header div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.answer-block div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-block div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date, div.paginator div.answer-container div.answer-content div.post-update-container div.post-update-info div.change-date { font-size: 12px; margin-bottom: 2px; } @@ -5568,8 +5600,6 @@ div.question-header div.question-container, div.answer-block div.question-contai div.question-header div.question-container div.comments-container, div.answer-block div.question-container div.comments-container, div.paginator div.question-container div.comments-container, div.question-header div.answer-block div.answer-container div.comments-container, div.answer-block div.question-header div.answer-container div.comments-container, div.answer-block div.answer-container div.comments-container, div.paginator div.answer-block div.answer-container div.comments-container, div.answer-block div.paginator div.answer-container div.comments-container, div.question-header div.paginator div.answer-container div.comments-container, div.paginator div.question-header div.answer-container div.comments-container, div.answer-block div.paginator div.answer-container div.comments-container, div.paginator div.answer-block div.answer-container div.comments-container, div.paginator div.answer-container div.comments-container { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: inline-block; padding: 0 0 3% 0; @@ -5607,8 +5637,6 @@ div.question-header div.question-container, div.answer-block div.question-contai border: none; -webkit-box-shadow: none; -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; box-shadow: none; display: inline-block; margin-top: -8px; @@ -5713,8 +5741,6 @@ div.share-question { div.answer-controls { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: inline-block; margin: 0 0 15px; @@ -5782,7 +5808,8 @@ div.paginator { font-weight: bold; } div.paginator span a { color: #555; - text-decoration: none; } + text-decoration: none; + border-bottom: none; } div.answer-own { border-top: 1px solid #eee; @@ -5804,8 +5831,6 @@ div.answer-actions { form.answer-form, form.question-form { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; border-top: 1px solid #ddd; overflow: hidden; @@ -5813,8 +5838,6 @@ form.answer-form, form.question-form { form.answer-form textarea, form.question-form textarea { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin-top: 15px; resize: vertical; @@ -5827,8 +5850,6 @@ form.answer-form, form.question-form { form.answer-form div.form-item .title-desc, form.question-form div.form-item .title-desc { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -5901,8 +5922,6 @@ form.question-form { form.question-form input[type="text"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; width: 48.988%; } form.question-form input[type="checkbox"] { @@ -5911,8 +5930,6 @@ form.question-form { background-color: rgba(255, 255, 255, 0.95); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin-top: -15px; max-width: 505px; @@ -6090,8 +6107,6 @@ form.question-form { border-radius: 4px; -webkit-box-shadow: 0px 2px 9px #aaaaaa; -moz-box-shadow: 0px 2px 9px #aaaaaa; - -ms-box-shadow: 0px 2px 9px #aaaaaa; - -o-box-shadow: 0px 2px 9px #aaaaaa; box-shadow: 0px 2px 9px #aaaaaa; color: white; cursor: pointer; @@ -6110,8 +6125,6 @@ form.question-form { border-bottom: #5b0000 1px solid; -webkit-box-shadow: 0 1px 0 #bf4040; -moz-box-shadow: 0 1px 0 #bf4040; - -ms-box-shadow: 0 1px 0 #bf4040; - -o-box-shadow: 0 1px 0 #bf4040; box-shadow: 0 1px 0 #bf4040; color: #fff; font-weight: normal; @@ -6136,8 +6149,6 @@ body.user-profile-page ul.sub-info { border-right: 1px dashed #efefef; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; } body.user-profile-page ul.sub-info > li:first-child { padding-left: 0; } diff --git a/static/css/marketing-ie.css b/static/css/marketing-ie.css index ef8764294a..18d829fdeb 100644 --- a/static/css/marketing-ie.css +++ b/static/css/marketing-ie.css @@ -6,8 +6,5 @@ body { margin: 0; overflow: hidden; } -div#enroll p.ie-warning { - display: block !important; - line-height: 1.3em; } div#enroll form { display: none; } diff --git a/static/css/marketing.css b/static/css/marketing.css index a4d8136642..c8be05206b 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; } @@ -119,8 +132,6 @@ input, select { .wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, footer, section.index-content { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; margin: 0 auto; max-width: 1400px; @@ -129,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,16 +211,14 @@ input, select { font-style: normal; -webkit-box-shadow: inset 0 1px 0 #b83d3d; -moz-box-shadow: inset 0 1px 0 #b83d3d; - -ms-box-shadow: inset 0 1px 0 #b83d3d; - -o-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; @@ -222,39 +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; - -ms-box-shadow: 0 -1px 0 white; - -o-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; @@ -266,480 +273,474 @@ 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; - -ms-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - -o-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; - -ms-box-sizing: border-box; - -o-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; - -ms-box-sizing: border-box; - -o-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.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; @@ -761,177 +762,165 @@ div.leanModal_box { border-radius: 3px; -webkit-box-shadow: 0 0 6px black; -moz-box-shadow: 0 0 6px black; - -ms-box-shadow: 0 0 6px black; - -o-box-shadow: 0 0 6px black; box-shadow: 0 0 6px black; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; box-sizing: border-box; display: none; padding: 51.776px; } -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; - -ms-box-sizing: border-box; - -o-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; - -ms-box-shadow: inset 0 1px 0 0 #bc5c5c; - -o-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; - -ms-box-shadow: inset 0 1px 0 0 #a44141; - -o-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; - -ms-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - -o-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; } @@ -941,42 +930,5 @@ div#pwd_reset input[type="email"] { div#feedback_div form ol li { float: none; width: 100%; } -div#feedback_div form ol li textarea#feedback_message { - height: 100px; } - -div#calculator_div { - max-width: 500px; } -div#calculator_div form { - padding-bottom: 25.888px; - margin-bottom: 25.888px; - border-bottom: 1px solid #ddd; } -div#calculator_div form input#calculator_input { - width: 400px; } -div#calculator_div form input#calculator_button { - background: 0; - color: #993333; - border: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - -ms-box-shadow: none; - -o-box-shadow: none; - box-shadow: none; - padding: 0; - text-shadow: none; } -div#calculator_div form input#calculator_button:hover { - color: #333; } -div#calculator_div form input#calculator_output { - border: 0; - background: none; - padding: 9.061px; - font-size: 24px; - width: 378px; - font-weight: bold; - margin-top: 4px; } -div#calculator_div dl dt { - float: left; - clear: both; - padding-right: 12.944px; - font-weight: bold; } -div#calculator_div dl dd { - float: left; } + div#feedback_div form ol li textarea#feedback_message { + height: 100px; } diff --git a/static/images/calc-icon.png b/static/images/calc-icon.png new file mode 100644 index 0000000000..a37423dff1 Binary files /dev/null and b/static/images/calc-icon.png differ diff --git a/static/images/close-calc-icon.png b/static/images/close-calc-icon.png new file mode 100644 index 0000000000..0a421757bf Binary files /dev/null and b/static/images/close-calc-icon.png differ diff --git a/static/images/info-icon.png b/static/images/info-icon.png new file mode 100644 index 0000000000..736b2f2374 Binary files /dev/null and b/static/images/info-icon.png differ diff --git a/templates/courseware.html b/templates/courseware.html index 2d6cdbf937..ec4be8c6c4 100644 --- a/templates/courseware.html +++ b/templates/courseware.html @@ -1,4 +1,5 @@ <%inherit file="main.html" /> +<%block name="title">Courseware – MITx 6.002x <%block name="js_extra"> @@ -7,7 +8,7 @@ ${init} $(".sequence-nav li a").hover(function(){ - $(this).siblings().toggle(); + $(this).siblings().toggleClass("shown"); }); }); diff --git a/templates/gradebook.html b/templates/gradebook.html index 244055cb04..99d3af7515 100644 --- a/templates/gradebook.html +++ b/templates/gradebook.html @@ -73,4 +73,4 @@ %endif - + \ No newline at end of file diff --git a/templates/help.html b/templates/help.html index b542829c1b..24ecd4e485 100644 --- a/templates/help.html +++ b/templates/help.html @@ -1,4 +1,5 @@ <%inherit file="main.html" /> +<%block name="title">Help - MITx 6.002x <%include file="navigation.html" args="active_page='help'"/> diff --git a/templates/info.html b/templates/info.html index 6171e90b0c..9489f5f1b1 100644 --- a/templates/info.html +++ b/templates/info.html @@ -1,4 +1,5 @@ <%inherit file="main.html" /> +<%block name="title">Course Info - MITx 6.002x <%include file="navigation.html" args="active_page='info'" /> diff --git a/templates/main.html b/templates/main.html index 119e861036..07e1d75695 100644 --- a/templates/main.html +++ b/templates/main.html @@ -52,7 +52,38 @@ @@ -60,6 +91,7 @@
+

Feedback for MITx

Found a bug? Got an idea for improving our system? Let us know.

@@ -72,28 +104,6 @@
-
- - - - - - -
-
Suffixes:
-
%kMGTcmunp
-
Operations:
-
^ * / + - ()
-
Functions:
-
sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
-
Constants
-
e, pi
- - -
-
@@ -120,6 +130,24 @@ $(function() { // Calculator $(function() { + + $("#calculator_wrapper").hide(); + + $(".calc").click(function(){ + $("#calculator_wrapper").slideToggle("fast"); + $("#calculator_wrapper #calculator_input").focus(); + $(this).toggleClass("closed"); + return false; + }); + + $("div.help-wrapper a").hover(function(){ + $(".help").toggleClass("shown"); + + }); + + $("div.help-wrapper a").click(function(){ + return false; + }); $("form#calculator").submit(function(e){ e.preventDefault(); $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, diff --git a/templates/profile.html b/templates/profile.html index 4d7915ae58..2d36d8d751 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -1,6 +1,8 @@ <%inherit file="main.html" /> <%namespace name="profile_graphs" file="profile_graphs.js"/> +<%block name="title">Profile - MITx 6.002x + <%! from django.core.urlresolvers import reverse %> diff --git a/templates/sass/README b/templates/sass/README index fcd2d290a5..f1a4618963 100644 --- a/templates/sass/README +++ b/templates/sass/README @@ -8,7 +8,7 @@ We are also using Bourbon with sass. They are a generic set of mixins, and funct To use bourbon you need to install it with: $ gem install bourbon -Then to generate Sass files cd to templates directory and watch the sass files for developement: +Then to generate Sass files cd to templates directory and watch the sass files for development: $ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb To generate a compressed css file for production: diff --git a/templates/sass/_gradebook.scss b/templates/sass/_gradebook.scss index 5213c928fd..b94f5de178 100644 --- a/templates/sass/_gradebook.scss +++ b/templates/sass/_gradebook.scss @@ -7,31 +7,5 @@ div.gradebook-wrapper { h1 { @extend .top-header; } - > ol { - list-style: none; - margin-top: lh(); - - > li { - @extend .clearfix; - border-bottom: 1px solid #e3e3e3; - display: table; - padding: lh() 0; - width: 100%; - - &:last-child { - border-bottom: 0px; - } - - h2 { - border-right: 1px dashed #ddd; - @include box-sizing(border-box); - display: table-cell; - margin: 0; - padding: 0; - width: flex-grid(2, 9); - vertical-align: top; - } - } - } } -} +} \ No newline at end of file diff --git a/templates/sass/_info.scss b/templates/sass/_info.scss index 910036b093..fe0265050d 100644 --- a/templates/sass/_info.scss +++ b/templates/sass/_info.scss @@ -21,12 +21,12 @@ div.info-wrapper { @extend .clearfix; border-bottom: 1px solid #e3e3e3; - &:first-child { - padding: lh(.5); - margin-left: (-(lh(.5))); - background: $cream; - border-bottom: 1px solid darken($cream, 10%); - } + // &:first-child { + // padding: lh(.5); + // margin-left: (-(lh(.5))); + // background: $cream; + // border-bottom: 1px solid darken($cream, 10%); + // } h2 { float: left; @@ -39,6 +39,10 @@ div.info-wrapper { width: flex-grid(7, 9); margin-bottom: 0; + li { + margin-bottom: lh(.5); + } + p { &:last-child { margin-bottom: 0; diff --git a/templates/sass/application.scss b/templates/sass/application.scss index b949b2fac7..a5377b03fd 100644 --- a/templates/sass/application.scss +++ b/templates/sass/application.scss @@ -3,7 +3,7 @@ // Base layout @import "base/reset", "base/font-face"; @import "base/variables", "base/functions", "base/extends", "base/base"; -@import "layout/layout", "layout/header", "layout/footer", "layout/leanmodal"; +@import "layout/layout", "layout/header", "layout/footer", "layout/calculator", "layout/leanmodal"; @import "plugins/jquery-ui-1.8.16.custom"; // pages diff --git a/templates/sass/base/_base.scss b/templates/sass/base/_base.scss index fd3f7774f7..3f985ea666 100644 --- a/templates/sass/base/_base.scss +++ b/templates/sass/base/_base.scss @@ -61,8 +61,13 @@ a { text-decoration:none; } + p &, li > &, span > &, .inline { + border-bottom: 1px solid #bbb; + font-style: italic; + } + &:hover, &:focus { - text-decoration:underline; + color: #000; } } diff --git a/templates/sass/base/_extends.scss b/templates/sass/base/_extends.scss index 5aa3aa1816..aa9e4e65dc 100644 --- a/templates/sass/base/_extends.scss +++ b/templates/sass/base/_extends.scss @@ -74,11 +74,16 @@ h1.top-header { h1, h2 { font-size: 18px; - font-weight: 800; + font-weight: bold; letter-spacing: 0; text-transform: none; } + a { + font-style: normal; + border: none; + } + .bottom-border { @include box-shadow(0 1px 0 #eee); border-bottom: 1px solid #d3d3d3; @@ -180,6 +185,7 @@ h1.top-header { } a { + border-bottom: 0; color: darken($cream, 80%); &:hover { diff --git a/templates/sass/base/_functions.scss b/templates/sass/base/_functions.scss index 2c4195d41b..8efe9e5796 100644 --- a/templates/sass/base/_functions.scss +++ b/templates/sass/base/_functions.scss @@ -20,3 +20,9 @@ @function lh($amount: 1) { @return $body-line-height * $amount; } + +@mixin hide-text(){ + text-indent: -9999px; + overflow: hidden; + display: block; +} diff --git a/templates/sass/bourbon/_bourbon.scss b/templates/sass/bourbon/_bourbon.scss index 447167c5ab..27b056e303 100644 --- a/templates/sass/bourbon/_bourbon.scss +++ b/templates/sass/bourbon/_bourbon.scss @@ -1,7 +1,11 @@ // Custom Functions @import "functions/deprecated-webkit-gradient"; +@import "functions/flex-grid"; @import "functions/grid-width"; +@import "functions/linear-gradient"; @import "functions/modular-scale"; +@import "functions/radial-gradient"; +@import "functions/render-gradients"; @import "functions/tint-shade"; // CSS3 Mixins @@ -20,9 +24,11 @@ @import "css3/radial-gradient"; @import "css3/transform"; @import "css3/transition"; +@import "css3/user-select"; // Addons & other mixins @import "addons/button"; +@import "addons/clearfix"; @import "addons/font-family"; @import "addons/html5-input-types"; @import "addons/position"; diff --git a/templates/sass/bourbon/addons/_clearfix.scss b/templates/sass/bourbon/addons/_clearfix.scss new file mode 100644 index 0000000000..a9f6a795c5 --- /dev/null +++ b/templates/sass/bourbon/addons/_clearfix.scss @@ -0,0 +1,29 @@ +// Micro clearfix provides an easy way to contain floats without adding additional markup +// +// Example usage: +// +// // Contain all floats within .wrapper +// .wrapper { +// @include clearfix; +// .content, +// .sidebar { +// float : left; +// } +// } + +@mixin clearfix { + zoom: 1; + + &:before, + &:after { + content: ""; + display: table; + } + + &:after { + clear: both; + } +} + +// Acknowledgements +// Micro clearfix: [Nicolas Gallagher](http://nicolasgallagher.com/micro-clearfix-hack/) diff --git a/templates/sass/bourbon/css3/_background-image.scss b/templates/sass/bourbon/css3/_background-image.scss index b11ab3fd53..c23cef7c31 100644 --- a/templates/sass/bourbon/css3/_background-image.scss +++ b/templates/sass/bourbon/css3/_background-image.scss @@ -2,8 +2,6 @@ // Background-image property for adding multiple background images with // gradients, or for stringing multiple gradients together. //************************************************************************// -@import "../functions/linear-gradient"; -@import "../functions/radial-gradient"; @mixin background-image( $image-1 , $image-2: false, @@ -50,18 +48,6 @@ } -@function render-gradients($gradients, $gradient-type, $vendor: false) { - $vendor-gradients: false; - @if $vendor { - $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient($gradients); - } - - @else if $vendor == false { - $vendor-gradients: "#{$gradient-type}-gradient(#{$gradients})"; - $vendor-gradients: unquote($vendor-gradients); - } - @return $vendor-gradients; -} //Examples: //@include background-image(linear-gradient(top, orange, red)); diff --git a/templates/sass/bourbon/css3/_border-image.scss b/templates/sass/bourbon/css3/_border-image.scss index 0373980422..637be8a012 100644 --- a/templates/sass/bourbon/css3/_border-image.scss +++ b/templates/sass/bourbon/css3/_border-image.scss @@ -1,7 +1,56 @@ -@mixin border-image ($image) { - -webkit-border-image: $image; - -moz-border-image: $image; - -ms-border-image: $image; - -o-border-image: $image; - border-image: $image; +@mixin border-image($images) { + -webkit-border-image: border-add-prefix($images, webkit); + -moz-border-image: border-add-prefix($images, moz); + -o-border-image: border-add-prefix($images, o); + border-image: border-add-prefix($images); } + +@function border-add-prefix($images, $vendor: false) { + $border-image: (); + $images-type: type-of(nth($images, 1)); + $first-var: nth(nth($images, 1), 1); // Get type of Gradient (Linear || radial) + + // If input is a gradient + @if $images-type == string { + @if ($first-var == "linear") or ($first-var == "radial") { + @for $i from 2 through length($images) { + $gradient-type: nth($images, 1); // Get type of gradient (linear || radial) + $gradient-args: nth($images, $i); // Get actual gradient (red, blue) + $border-image: render-gradients($gradient-args, $gradient-type, $vendor); + } + } + + // If input is a URL + @else { + $border-image: $images; + } + } + + // If input is gradient or url + additional args + @else if $images-type == list { + @for $i from 1 through length($images) { + $type: type-of(nth($images, $i)); // Get type of variable - List or String + + // If variable is a list - Gradient + @if $type == list { + $gradient-type: nth(nth($images, $i), 1); // Get type of gradient (linear || radial) + $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue) + $border-image: render-gradients($gradient-args, $gradient-type, $vendor); + } + + // If variable is a string - Image or number + @else if ($type == string) or ($type == number) { + $border-image: append($border-image, nth($images, $i)); + } + } + } + @return $border-image; +} + +//Examples: +// @include border-image(url("image.png")); +// @include border-image(url("image.png") 20 stretch); +// @include border-image(linear-gradient(45deg, orange, yellow)); +// @include border-image(linear-gradient(45deg, orange, yellow) stretch); +// @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round); +// @include border-image(radial-gradient(top, cover, orange, yellow, orange)); \ No newline at end of file diff --git a/templates/sass/bourbon/css3/_border-radius.scss b/templates/sass/bourbon/css3/_border-radius.scss index f950d4dd98..f24389ebbe 100644 --- a/templates/sass/bourbon/css3/_border-radius.scss +++ b/templates/sass/bourbon/css3/_border-radius.scss @@ -9,6 +9,7 @@ @mixin border-top-left-radius($radii) { -webkit-border-top-left-radius: $radii; -moz-border-top-left-radius: $radii; + -moz-border-radius-topleft: $radii; -ms-border-top-left-radius: $radii; -o-border-top-left-radius: $radii; border-top-left-radius: $radii; @@ -17,6 +18,7 @@ @mixin border-top-right-radius($radii) { -webkit-border-top-right-radius: $radii; -moz-border-top-right-radius: $radii; + -moz-border-radius-topright: $radii; -ms-border-top-right-radius: $radii; -o-border-top-right-radius: $radii; border-top-right-radius: $radii; @@ -25,6 +27,7 @@ @mixin border-bottom-left-radius($radii) { -webkit-border-bottom-left-radius: $radii; -moz-border-bottom-left-radius: $radii; + -moz-border-radius-bottomleft: $radii; -ms-border-bottom-left-radius: $radii; -o-border-bottom-left-radius: $radii; border-bottom-left-radius: $radii; @@ -33,6 +36,7 @@ @mixin border-bottom-right-radius($radii) { -webkit-border-bottom-right-radius: $radii; -moz-border-bottom-right-radius: $radii; + -moz-border-radius-bottomright: $radii; -ms-border-bottom-right-radius: $radii; -o-border-bottom-right-radius: $radii; border-bottom-right-radius: $radii; diff --git a/templates/sass/bourbon/css3/_box-shadow.scss b/templates/sass/bourbon/css3/_box-shadow.scss index ad5c24e7aa..327b66d251 100644 --- a/templates/sass/bourbon/css3/_box-shadow.scss +++ b/templates/sass/bourbon/css3/_box-shadow.scss @@ -10,7 +10,5 @@ -webkit-box-shadow: $full; -moz-box-shadow: $full; - -ms-box-shadow: $full; - -o-box-shadow: $full; box-shadow: $full; } diff --git a/templates/sass/bourbon/css3/_box-sizing.scss b/templates/sass/bourbon/css3/_box-sizing.scss index a9c6cdb43f..3f3f7cca9a 100644 --- a/templates/sass/bourbon/css3/_box-sizing.scss +++ b/templates/sass/bourbon/css3/_box-sizing.scss @@ -2,7 +2,5 @@ // content-box | border-box | inherit -webkit-box-sizing: $box; -moz-box-sizing: $box; - -ms-box-sizing: $box; - -o-box-sizing: $box; box-sizing: $box; } diff --git a/templates/sass/bourbon/css3/_linear-gradient.scss b/templates/sass/bourbon/css3/_linear-gradient.scss index 0b68501719..e366a299a9 100644 --- a/templates/sass/bourbon/css3/_linear-gradient.scss +++ b/templates/sass/bourbon/css3/_linear-gradient.scss @@ -20,7 +20,7 @@ $fallback-color: nth($G1, 1); // If $fallback is a color use that color as the fallback color - @if type-of($fallback) == color { + @if (type-of($fallback) == color) or ($fallback == "transparent") { $fallback-color: $fallback; } diff --git a/templates/sass/bourbon/css3/_radial-gradient.scss b/templates/sass/bourbon/css3/_radial-gradient.scss index fbd0a8523c..e83cab5234 100644 --- a/templates/sass/bourbon/css3/_radial-gradient.scss +++ b/templates/sass/bourbon/css3/_radial-gradient.scss @@ -4,11 +4,20 @@ $G3: false, $G4: false, $G5: false, $G6: false, $G7: false, $G8: false, - $G9: false, $G10: false) { + $G9: false, $G10: false, + $fallback: false) { $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10); - background-color: nth($G1, 1); + // Set $G1 as the default fallback color + $fallback-color: nth($G1, 1); + + // If $fallback is a color use that color as the fallback color + @if (type-of($fallback) == color) or ($fallback == "transparent") { + $fallback-color: $fallback; + } + + background-color: $fallback-color; background-image: deprecated-webkit-gradient(radial, $full); // Safari <= 5.0 background-image: -webkit-radial-gradient($pos, $shape-size, $full); background-image: -moz-radial-gradient($pos, $shape-size, $full); diff --git a/templates/sass/bourbon/css3/_user-select.scss b/templates/sass/bourbon/css3/_user-select.scss new file mode 100644 index 0000000000..d5f5749431 --- /dev/null +++ b/templates/sass/bourbon/css3/_user-select.scss @@ -0,0 +1,6 @@ +@mixin user-select($arg: none) { + -webkit-user-select: $arg; + -moz-user-select: $arg; + -ms-user-select: $arg; + user-select: $arg; +} diff --git a/templates/sass/bourbon/functions/_flex-grid.scss b/templates/sass/bourbon/functions/_flex-grid.scss new file mode 100644 index 0000000000..707f994e15 --- /dev/null +++ b/templates/sass/bourbon/functions/_flex-grid.scss @@ -0,0 +1,35 @@ +// Flexible grid +@function flex-grid($columns, $container-columns: $fg-max-columns) { + $width: $columns * $fg-column + ($columns - 1) * $fg-gutter; + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($width / $container-width); +} + +// Flexible gutter +@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($gutter / $container-width); +} + +// The $fg-column, $fg-gutter and $fg-max-columns variables must be defined in your base stylesheet to properly use the flex-grid function. +// This function takes the fluid grid equation (target / context = result) and uses columns to help define each. +// +// $fg-column: 60px; // Column Width +// $fg-gutter: 25px; // Gutter Width +// $fg-max-columns: 12; // Total Columns For Main Container +// +// div { +// width: flex-grid(4); // returns (315px / 1020px) = 30.882353%; +// margin-left: flex-gutter(); // returns (25px / 1020px) = 2.45098%; +// +// p { +// width: flex-grid(2, 4); // returns (145px / 315px) = 46.031746%; +// float: left; +// margin: flex-gutter(4); // returns (25px / 315px) = 7.936508%; +// } +// +// blockquote { +// float: left; +// width: flex-grid(2, 4); // returns (145px / 315px) = 46.031746%; +// } +// } diff --git a/templates/sass/bourbon/functions/_render-gradients.scss b/templates/sass/bourbon/functions/_render-gradients.scss new file mode 100644 index 0000000000..fe7c799ebe --- /dev/null +++ b/templates/sass/bourbon/functions/_render-gradients.scss @@ -0,0 +1,14 @@ +// User for linear and radial gradients within background-image or border-image properties + +@function render-gradients($gradients, $gradient-type, $vendor: false) { + $vendor-gradients: false; + @if $vendor { + $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient($gradients); + } + + @else if $vendor == false { + $vendor-gradients: "#{$gradient-type}-gradient(#{$gradients})"; + $vendor-gradients: unquote($vendor-gradients); + } + @return $vendor-gradients; +} diff --git a/templates/sass/courseware/_sequence-nav.scss b/templates/sass/courseware/_sequence-nav.scss index a1c086bc55..056311521e 100644 --- a/templates/sass/courseware/_sequence-nav.scss +++ b/templates/sass/courseware/_sequence-nav.scss @@ -54,6 +54,7 @@ nav.sequence-nav { padding: 15px 4px 14px; width: 28px; height: 17px; + @include transition(all, .4s, $ease-in-out-quad); // @media screen and (max-width: 800px) { // padding: 12px 8px; @@ -118,16 +119,24 @@ nav.sequence-nav { } p { - position: absolute; - display: none; + // display: none; + // visibility: hidden; background: #333; - padding: 6px; - white-space: pre-wrap; - z-index: 99; - margin: 4px 0 0 -5px; - text-shadow: 0 -1px 0 #000; color: #fff; line-height: lh(); + margin: 0px 0 0 -5px; + opacity: 0; + padding: 6px; + position: absolute; + text-shadow: 0 -1px 0 #000; + @include transition(all, .6s, $ease-in-out-quart); + white-space: pre-wrap; + z-index: 99; + + &.shown { + opacity: 1; + margin-top: 4px; + } &:empty { background: none; @@ -146,7 +155,6 @@ nav.sequence-nav { top: -5px; left: 18px; @include transform(rotate(45deg)); - @include transition(); width: 10px; } } @@ -215,15 +223,24 @@ nav.sequence-nav { section.course-content { + position: relative; + + div#seq_content { + margin-bottom: 60px; + } + nav.sequence-bottom { - margin-bottom: -(lh()); + position: absolute; + bottom: 0; + right: 50%; + margin-right: -53px; ul { @extend .clearfix; + background-color: darken(#F6EFD4, 5%); border: 1px solid darken(#f6efd4, 20%); border-bottom: 0; @include border-radius(3px 3px 0 0); - margin: lh() auto 0; overflow: hidden; width: 106px; background-color: darken($cream, 5%); @@ -238,22 +255,25 @@ section.course-content { a { background-position: center center; background-repeat: no-repeat; + border-bottom: none; + display: block; padding: lh(.75) 4px; text-indent: -9999px; width: 45px; display: block; + @include transition(all, .4s, $ease-in-out-quad); &:hover { - text-decoration: none; - color: darken($cream, 60%); - text-decoration: none; - opacity: .5; background-color: darken($cream, 10%); + color: darken(#F6EFD4, 60%); + color: darken($cream, 60%); + opacity: .5; + text-decoration: none; } &.disabled { - opacity: .4; background-color: lighten($cream, 10%); + opacity: .4; } } } diff --git a/templates/sass/courseware/_sidebar.scss b/templates/sass/courseware/_sidebar.scss index 98659f12e0..d93e672378 100644 --- a/templates/sass/courseware/_sidebar.scss +++ b/templates/sass/courseware/_sidebar.scss @@ -34,16 +34,37 @@ section.course-index { ul.ui-accordion-content { @include border-radius(0); @include box-shadow( inset -1px 0 0 #e6e6e6); - background: #d6d6d6; + background: #dadada; border: none; border-bottom: 1px solid #c3c3c3; font-size: 12px; margin: 0; - overflow: hidden; + // overflow: visible; li { + position: relative; + &.active { font-weight: bold; + + p.subtitle { + font-weight: normal; + } + + // &:after { + // content: " "; + // width: 16px; + // height: 16px; + // position: absolute; + // right: -35px; + // top: 7px; + // display: block; + // background-color: #dadada; + // border-top: 1px solid #c3c3c3; + // border-right: 1px solid #c3c3c3; + // z-index: 99; + // @include transform(rotate(45deg)); + // } } a { diff --git a/templates/sass/courseware/_video.scss b/templates/sass/courseware/_video.scss index 4402e968ad..7fbb4c577d 100644 --- a/templates/sass/courseware/_video.scss +++ b/templates/sass/courseware/_video.scss @@ -95,6 +95,7 @@ section.course-content { a { @include box-shadow(1px 0 0 #555); + border-bottom: none; border-right: 1px solid #000; display: block; cursor: pointer; @@ -141,20 +142,13 @@ section.course-content { line-height: 46px; //height of play pause buttons margin-right: 0; -webkit-font-smoothing: antialiased; + opacity: .7; + @include transition(); h3 { @include inline-block(); - - a { - color: #fff; - padding: 0 lh(.5); - @include inline-block(); - - &:hover { - text-decoration: none; - // background-color: #444; - } - } + padding: 0 lh(.5); + font-weight: normal; } // fix for now @@ -164,13 +158,23 @@ section.course-content { li { cursor: pointer; + color: #fff; @include inline-block(); &.active { font-weight: bold; } + + &:hover { + color: #aaa; + } } } + + &:hover { + opacity: 1; + background-color: #444; + } } a.hide-subtitles { @@ -184,6 +188,7 @@ section.course-content { font-weight: 800; background: url('/static/images/cc.png') 16px center no-repeat; -webkit-font-smoothing: antialiased; + @include transition(); &:hover { color: #fff; diff --git a/templates/sass/discussion/_answers.scss b/templates/sass/discussion/_answers.scss index e311c17406..cc6133a12f 100644 --- a/templates/sass/discussion/_answers.scss +++ b/templates/sass/discussion/_answers.scss @@ -125,6 +125,7 @@ div.paginator { a { color: #555; text-decoration: none; + border-bottom: none; } } } diff --git a/templates/sass/discussion/_modals.scss b/templates/sass/discussion/_modals.scss index fd05052a12..a26fee54d0 100644 --- a/templates/sass/discussion/_modals.scss +++ b/templates/sass/discussion/_modals.scss @@ -23,7 +23,10 @@ font-weight: normal; @include border-radius(4px 4px 0 0); } + a { color: #fb7321; text-decoration: underline; - font-weight: bold; } } + font-weight: bold; + } +} diff --git a/templates/sass/discussion/_question-view.scss b/templates/sass/discussion/_question-view.scss index fb1d2d618f..a5e44d355b 100644 --- a/templates/sass/discussion/_question-view.scss +++ b/templates/sass/discussion/_question-view.scss @@ -64,7 +64,6 @@ div.question-header { overflow: hidden; padding: 5px 0 10px; - div.tag-list { display: inline-block; float:left; @@ -79,7 +78,6 @@ div.question-header { width: flex-grid(4,8); a { - &.question-delete { color: $mit-red; text-decoration: none; @@ -122,6 +120,11 @@ div.question-header { width: 20%; border-left: 1px dashed #ddd; + a { + border-bottom: none; + font-style: normal; + } + div.post-update-info { @include box-sizing(border-box); padding: 10px; @@ -140,10 +143,6 @@ div.question-header { } } - a { - color:$mit-red ; - } - div.change-date { font-size: 12px; margin-bottom: 2px; @@ -327,6 +326,7 @@ div.question-header { div.controls { border-top: 1px solid #efefef; text-align: right; + a { display: inline-block; font-size: 12px; diff --git a/templates/sass/discussion/_tags.scss b/templates/sass/discussion/_tags.scss index d8ea2e6c09..72c4e9ffc4 100644 --- a/templates/sass/discussion/_tags.scss +++ b/templates/sass/discussion/_tags.scss @@ -51,6 +51,8 @@ ul.tags { a { color: #555; text-decoration: none; + border-bottom: none; + font-style: normal; } } } diff --git a/templates/sass/layout/_calculator.scss b/templates/sass/layout/_calculator.scss new file mode 100644 index 0000000000..8b5d60143a --- /dev/null +++ b/templates/sass/layout/_calculator.scss @@ -0,0 +1,138 @@ +li.calc-main { + bottom: 0; + left: 0; + position: fixed; + width: 100%; + + a.calc { + @include hide-text; + background: url("/static/images/calc-icon.png") rgba(#111, .9) no-repeat center; + border-bottom: 0; + color: #fff; + float: right; + margin-right: 10px; + @include border-radius(3px 3px 0 0); + @include inline-block; + padding: 8px 12px; + width: 16px; + height: 20px; + + &:hover { + opacity: .8; + } + + &.closed { + background-image: url("/static/images/close-calc-icon.png"); + } + } + + div#calculator_wrapper { + background: rgba(#111, .9); + clear: both; + + form { + padding: lh(); + @extend .clearfix; + + + input#calculator_button { + background: #111; + border: 1px solid #000; + @include border-radius(0); + @include box-shadow(none); + @include box-sizing(border-box); + color: #fff; + font-size: 30px; + font-weight: bold; + padding: 0; + text-shadow: none; + width: flex-grid(.5) + flex-gutter(); + float: left; + margin: 0 (flex-gutter() / 2); + + &:hover { + color: #333; + } + } + + input#calculator_output { + background: #222; + border: 0; + @include box-shadow(none); + @include box-sizing(border-box); + color: #fff; + float: left; + font-size: 16px; + font-weight: bold; + margin: 1px 0 0; + padding: 10px; + width: flex-grid(4); + } + + div.input-wrapper { + position: relative; + @extend .clearfix; + width: flex-grid(7.5); + margin: 0; + float: left; + + input#calculator_input { + border: none; + @include box-shadow(none); + @include box-sizing(border-box); + font-size: 16px; + padding: 10px; + width: 100%; + + &:focus { + outline: none; + border: none; + } + } + + div.help-wrapper { + position: absolute; + right: 8px; + top: 15px; + + a { + @include hide-text; + width: 17px; + height: 17px; + background: url("/static/images/info-icon.png") center center no-repeat; + } + + dl { + background: #fff; + @include border-radius(3px); + @include box-shadow(0 0 3px #999); + color: #333; + opacity: 0; + padding: 10px; + position: absolute; + right: -40px; + top: -110px; + width: 500px; + @include transition(); + + &.shown { + opacity: 1; + top: -115px; + } + + dt { + clear: both; + float: left; + font-weight: bold; + padding-right: lh(.5); + } + + dd { + float: left; + } + } + } + } + } + } +} diff --git a/templates/sass/layout/_footer.scss b/templates/sass/layout/_footer.scss index eb4786dd83..1669946a60 100644 --- a/templates/sass/layout/_footer.scss +++ b/templates/sass/layout/_footer.scss @@ -72,6 +72,7 @@ footer { height: 29px; width: 28px; text-indent: -9999px; + border-bottom: 0; &:hover { opacity: .8; diff --git a/templates/sass/layout/_header.scss b/templates/sass/layout/_header.scss index 9851339ac4..1d88eac639 100644 --- a/templates/sass/layout/_header.scss +++ b/templates/sass/layout/_header.scss @@ -52,7 +52,7 @@ div.header-wrapper { a { color: #fff; - text-decoration: none; + border: none; &:hover { color: rgba(#fff, .7); @@ -104,7 +104,8 @@ div.header-wrapper { display: block; font-weight: bold; padding: 10px lh() 8px; - text-decoration: none; + border: none; + font-style: normal; @media screen and (max-width: 1020px) { padding: 10px lh(.7) 8px; diff --git a/templates/sass/layout/_leanmodal.scss b/templates/sass/layout/_leanmodal.scss index b9399a39e4..73cde4a2cb 100644 --- a/templates/sass/layout/_leanmodal.scss +++ b/templates/sass/layout/_leanmodal.scss @@ -219,52 +219,3 @@ div#feedback_div{ } } -div#calculator_div { - max-width: 500px; - - form { - padding-bottom: lh(); - margin-bottom: lh(); - border-bottom: 1px solid #ddd; - - input#calculator_input { - width: 400px; - } - - input#calculator_button { - background: 0; - color: $mit-red; - border: 0; - @include box-shadow(none); - padding: 0; - text-shadow: none; - - &:hover { - color: #333; - } - } - - input#calculator_output { - border: 0; - background: none; - padding: lh(.35); - font-size: 24px; - width: 378px; - font-weight: bold; - margin-top: 4px; - } - } - - dl { - dt { - float: left; - clear: both; - padding-right: lh(.5); - font-weight: bold; - } - - dd { - float: left; - } - } -} diff --git a/templates/simplewiki_create.html b/templates/simplewiki_create.html index 9c29c214b2..42b6bdc2cb 100644 --- a/templates/simplewiki_create.html +++ b/templates/simplewiki_create.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Create Article - MITx 6.002x Wiki +<%block name="title">Wiki – Create Article – MITx 6.002x <%block name="wiki_page_title">

Create article

diff --git a/templates/simplewiki_error.html b/templates/simplewiki_error.html index cdb46c1a0f..6244b99dcf 100644 --- a/templates/simplewiki_error.html +++ b/templates/simplewiki_error.html @@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse %> -<%block name="title">Oops... - MITx 6.002x Wiki +<%block name="title">Wiki Error – MITx 6.002x <%block name="wiki_page_title"> diff --git a/templates/simplewiki_history.html b/templates/simplewiki_history.html index 9385ff8d87..65f9e71a33 100644 --- a/templates/simplewiki_history.html +++ b/templates/simplewiki_history.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}Wiki – MITx 6.002x <%! from django.core.urlresolvers import reverse diff --git a/templates/simplewiki_revision_feed.html b/templates/simplewiki_revision_feed.html index b0196a4dab..b9efd77b45 100644 --- a/templates/simplewiki_revision_feed.html +++ b/templates/simplewiki_revision_feed.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Revision feed - MITx 6.002x Wiki +<%block name="title">Wiki - Revision feed - MITx 6.002x <%! from django.core.urlresolvers import reverse diff --git a/templates/simplewiki_searchresults.html b/templates/simplewiki_searchresults.html index fa4f699d9f..f9866b3fae 100644 --- a/templates/simplewiki_searchresults.html +++ b/templates/simplewiki_searchresults.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Search Results - MITx 6.002x Wiki +<%block name="title">Wiki - Search Results - MITx 6.002x <%! from django.core.urlresolvers import reverse diff --git a/templates/simplewiki_view.html b/templates/simplewiki_view.html index 1f45515a6d..53f0030eaf 100644 --- a/templates/simplewiki_view.html +++ b/templates/simplewiki_view.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}Wiki – MITx 6.002x <%block name="wiki_page_title">

${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}

diff --git a/templates/staticbook.html b/templates/staticbook.html index 328507c76e..29553c9423 100644 --- a/templates/staticbook.html +++ b/templates/staticbook.html @@ -1,4 +1,5 @@ <%inherit file="main.html" /> +<%block name="title">Textbook – MITx 6.002x <%block name="js_extra">