diff --git a/static/img/about/bg2.png b/static/img/about/bg2.png index d5a337a..758b021 100644 Binary files a/static/img/about/bg2.png and b/static/img/about/bg2.png differ diff --git a/static/js/about.js b/static/js/about.js index 46eba67..275bf50 100644 --- a/static/js/about.js +++ b/static/js/about.js @@ -4,7 +4,7 @@ function parallax(){ var currVertPos = $(window).scrollTop(); var delta = currVertPos - lastVertPos; $(".bg").each(function(){ - $(this).css("top", parseFloat($(this).css("top")) - delta * 1.35 + "px"); + $(this).css("top", parseFloat($(this).css("top")) - delta * 1.8 + "px"); }); lastVertPos = currVertPos; } diff --git a/static/js/index.js b/static/js/index.js index c49794c..083e1d8 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -138,7 +138,6 @@ var searchResultsPage = 1; //Obtained by parsing python file with pygments var codeExample = '
 1\n 2\n 3\n 4\n 5\n 6\n 7\n 8\n 9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40
"""\nModule to contain all the project's Flask server plumbing.\n"""\n\nfrom flask import Flask\nfrom flask import render_template, session\n\nfrom bitshift import assets\n# from bitshift.database import Database\n# from bitshift.query import parse_query\n\napp = Flask(__name__)\napp.config.from_object("bitshift.config")\n\napp_env = app.jinja_env\napp_env.line_statement_prefix = "="\napp_env.globals.update(assets=assets)\n\n# database = Database()\n\n@app.route("/")\ndef index():\n    return render_template("index.html")\n\n@app.route("/search/<query>")\ndef search(query):\n    # tree = parse_query(query)\n    # database.search(tree)\n    pass\n\n@app.route("/about")\ndef about():\n    return render_template("about.html")\n\n@app.route("/developers")\ndef developers():\n    return render_template("developers.html")\n\nif __name__ == "__main__":\n    app.run(debug=True)\n
\n
' -searchBar.onkeyup = typingTimer; var testCodelet = { 'url': 'https://github.com/earwig/bitshift/blob/develop/app.py', diff --git a/static/sass/_mixins.sass b/static/sass/_mixins.sass index 10dc4b9..dbe8f2e 100644 --- a/static/sass/_mixins.sass +++ b/static/sass/_mixins.sass @@ -15,6 +15,10 @@ @include vendor(opacity, $opacity) filter: alpha(opacity=$opacity) +@mixin delay($time) + transition-delay: $time + -webkit-transition-delay: $time + .t1 @include vendor(transition, all 0.1s ease-out) diff --git a/static/sass/about.sass b/static/sass/about.sass index 7555e94..32d006e 100644 --- a/static/sass/about.sass +++ b/static/sass/about.sass @@ -9,28 +9,30 @@ z-index: -1 &#img-1 - background: url("../img/about/bg1.png") no-repeat + background: url(../img/about/bg1.png) no-repeat background-size: cover height: 400px top: 0px &#img-2 - background: url("../img/about/bg2.png") no-repeat - height: $img-height - top: 480px + background: url(../img/about/bg2.png) no-repeat + height: $img-height + 250px + top: 520px &#img-3 - background: url("../img/about/bg3.png") no-repeat + background: url(../img/about/bg3.png) no-repeat background-size: cover - height: $img-height + 200 - top: 1200px + height: $img-height + 250 + top: 1800px div.section background-color: white border: 1px solid $baseColor2 height: 300px + margin-bottom: 200px margin-top: 300px - padding: 20px + padding-bottom: 50px + padding-top: 20px &#top margin-top: 0px diff --git a/static/sass/main.sass b/static/sass/main.sass index c3f3e9c..4474ee0 100644 --- a/static/sass/main.sass +++ b/static/sass/main.sass @@ -30,15 +30,21 @@ div#container div#footer @extend .t3 + @include delay(1s) background-color: $baseColor1 - bottom: 0 + bottom: -30px height: 60px - padding-top: 12px - position: absolute + padding-top: 15px + position: fixed text-align: center width: 100% + &:hover + @include delay(0s) + + bottom: 0 + * color: white