From 1f7994179a1bfd1bbc095ac0ef9d57bbebf4db82 Mon Sep 17 00:00:00 2001 From: sbwinter Date: Wed, 29 Oct 2014 23:06:22 -0600 Subject: [PATCH] Make Video Responsive Altered css to make video responsive; added embed classes from Bootstrap 3.3.0; tweaked the column layout of the video --- .DS_Store | Bin 12292 -> 12292 bytes AntiCorruptionUniversity/settings.py | 1 - .../bootstrap/dist/css/bootstrap.css | 27 ++++++++++++++++++ .../app/partials/video-and-quiz.html | 7 +++-- db.sqlite3 | Bin 204800 -> 208896 bytes 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index ee798114af549df28dbef6957608ce4b7b9c3606..8e6383e0daa954bc740cd6ad830f546f197256c3 100644 GIT binary patch delta 18 ZcmZokXi3-*E6m6^Sy9+z^CaOS82~%n1c 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 d2362e39836e95374db0ba4961bd3332884a2258..db279986c7a309a5388c8f068183d4a2a513122e 100644 GIT binary patch delta 2470 zcmZ|QYfMvD902fpPH&&wdk&yT1)-Oh(n4!5w+|i?S`{ zviU(wRieiab90-?vPZX=#*oZx)5H%hi!&}RQMV;q%z*NA`{rKk6ee_VyzRZY`JMB> z|8sI)1J{LtpM}%eX$LrtQ|SHlDmqiDfCE=rE}K*q{ly`z)Sxk>=}x8h($g|}TP-`2cy z@0Rv9_vT&ekJOgS-EPP3mo_@8%j~klD%-7!U9u~cWv)u4+*anQaJYu<-pNT@rm@*O z>Qo6KABP{|oA@*Q7CwY`;VN8!_2@Tr7hOez$Va4OgQFG2!tyD1QxaGJ|JCpe){01cok6XT(xxqb(jC$LVySxwff! zQ^V%kucG-ma$(`HtgK{z|m)#2}3XmVI* zA+~8)0jy+Z5*o?CG<3m!Gx=f?W|P}fa1|&`6yzk{bwoc6^M~)A00Gs|HNJXy=NsT% zeNEjOZDw^fI9}A-+Sch``0|n&_bfM&GlRf*{y5-ObRCeAAaHwnyI=8l&_MQ$KmjQK?VKaf18j*JUb24#t|i5zP@&uEi=(g+$P0DE z^J7p;9*)9l=qV+h8Q4goqtHgant@(bSeHxsBESjq$iYdNK|B#)Ah#nxQH6OESv>|7 z^2-=pNm|BW4c*r+jnQ1k;xv~w4jnXz?(|-gK2B@6`anAI#c4x7jzbyblb_;}onDa5edqzKMm}%qA}g*UcRd7%Q7~T2SYp6;TdI2!UvY>iDN|8V;2J(J+g|0m^Dt zntAiSnfKl|$=g!$nv`jFBsh-K+5gYyp6d*f#M0P#C-1fOWi74)IfuPq&GmJBE%09H zVb&5bkWZ!D!@kt~p=T$?r(T&EiX`58b;SMR{;AN*!9An<5>NY1jUL|>JT`c8NFR^% zKQlV{+RX9ck%{o+&>OE0?%jVfrU$f8mlo*Kx?Q^7qiH=s&98TBT6cDJWryPtG`F=P z*jr?p=9FKQ>&h3(S!GH&tn@0XVx^mOm0qT4CTo)B($#4q%Jc!JIFwk9-v5TqU2+Od zCZ~sF&sA%4_N~vy;#Q6mMUog8N$fhXd*I(%^e1~lQNJDuL?V$#cEY+p6x9RyKc6R} z>j|Nj6KaJ+<{t9{%c`x}cBCdQ4ao1vcj&LmDM^>E$S=@sG^5lgr-{a0m|NVQE+$DM-rRr)pAy?~vkFntiMQ9F3BOE|P(E{p9Obji zrdZx_nk-s@dkmAaBut!mrU*`4m?a|qG)q)gy#o&x*@2g5i3?8@LBxwi@KKpHnWr~6 z^&xKt3o{eX1m%^#BA;~x#%*_aoMsta4(VxL}Q1f3Q7gyHk^vV$!l4kuOmny`sb{N6lBwDl7a=;8P8LeE%-=f0h8e0K;q{~26TqrO=OOraH8D2dG5M;hr3vdvBUIRZ4uR$M}TJXmr+t`WyW!R2t z37(RjmioacN%c;gcxikZwP{k1@0Os2v>F@_-Yh|g`QIwByU&-{-N(u-(ZAyl6E|*F zpaH98#%V>h!qWP#3@(gUn4Dw<+K7suRA4V@Gl*lN+fqN$Pf~~RVui70?m;WwuRw=! z=63x49<&n=!a8W=aSW})AS+86t9HXv1AbKn0aw