diff --git a/hello.py b/hello.py index 86bb0ff..01e9476 100644 --- a/hello.py +++ b/hello.py @@ -18,7 +18,7 @@ def dated_url_for(endpoint, **values): @app.route('/') def hello_world(): - return 'Hello, World!' + return 'VVVW' # @app.route('/hello/') @@ -28,3 +28,6 @@ def perspectiveB(): @app.route('/perspectiveA/') def perspectiveA(): return render_template('perspectiveA.html') +@app.route('/perspectiveC/') +def perspectiveC(): + return render_template('perspectiveC.html') diff --git a/static/css/style.css b/static/css/style.css index a1068fd..0e62bb5 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,7 +1,10 @@ +<<<<<<< HEAD html { background-color: gray; } +======= +>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29 #video1 { margin-top: 300px; } @@ -25,6 +28,7 @@ img { margin-left: 400px; } +<<<<<<< HEAD /* audio and pop up images */ #transcriptWrapper { overflow: hidden; @@ -37,4 +41,26 @@ img { .speaking { font-weight: bold; +======= +#background_a { + background-image: url("../images/map.png"); + background-repeat: no-repeat; + background-color: silver; +} + + +#poem1 { + width: 40%; + margin-left: 400px; + margin-top: 50px; +} + +#poem1:hover { + background-color: white; +} + +#background_c { + background-image: url("../images/test2_opacity.jpeg"); + +>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29 } diff --git a/templates/perspectiveA.html b/templates/perspectiveA.html index 1569987..1af3446 100644 --- a/templates/perspectiveA.html +++ b/templates/perspectiveA.html @@ -7,7 +7,8 @@ Perspective A - + +

Perspective A

diff --git a/templates/perspectiveC.html b/templates/perspectiveC.html new file mode 100644 index 0000000..6a06132 --- /dev/null +++ b/templates/perspectiveC.html @@ -0,0 +1,18 @@ + + + + + + + + Perspective A + + +
+

Perspective C

+
+poem +
+
+ +