diff --git a/.DS_Store b/.DS_Store index ee79811..8e6383e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/AntiCorruptionUniversity/settings.py b/AntiCorruptionUniversity/settings.py index 63a9fa6..c28be6f 100644 --- a/AntiCorruptionUniversity/settings.py +++ b/AntiCorruptionUniversity/settings.py @@ -89,7 +89,6 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') ALLOWED_HOSTS = ['*'] -DATABASES['default'] = dj_database_url.config() BASE_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_ROOT = 'staticfiles' diff --git a/angular-phonecat/app/bower_components/bootstrap/dist/css/bootstrap.css b/angular-phonecat/app/bower_components/bootstrap/dist/css/bootstrap.css index 7f36651..e3f26d5 100644 --- a/angular-phonecat/app/bower_components/bootstrap/dist/css/bootstrap.css +++ b/angular-phonecat/app/bower_components/bootstrap/dist/css/bootstrap.css @@ -5,6 +5,33 @@ */ /*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +.embed-responsive { + position: relative; + display: block; + height: 0; + padding: 0; + overflow: hidden; +} +.embed-responsive .embed-responsive-item, +.embed-responsive iframe, +.embed-responsive embed, +.embed-responsive object, +.embed-responsive video { + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 100%; + height: 100%; + border: 0; +} +.embed-responsive.embed-responsive-16by9 { + padding-bottom: 56.25%; +} +.embed-responsive.embed-responsive-4by3 { + padding-bottom: 75%; +} + html { font-family: sans-serif; -webkit-text-size-adjust: 100%; diff --git a/angular-phonecat/app/partials/video-and-quiz.html b/angular-phonecat/app/partials/video-and-quiz.html index dd66432..9a7f682 100644 --- a/angular-phonecat/app/partials/video-and-quiz.html +++ b/angular-phonecat/app/partials/video-and-quiz.html @@ -5,9 +5,10 @@

Click on the video to watch it. It is only 5 minutes long. After you're finished, we'll ask you 3 questions.

-
- - +
+
+ +
diff --git a/db.sqlite3 b/db.sqlite3 index d2362e3..db27998 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ