Переглянути джерело

Update footer, minor changes to /about styling.

Add:
        static/sass/main.sass
                -Rework the footer, which is now fixed at the bottom of the
                screen as opposed to floored to the bottom of the page.
                Positioning at the bottom of the page doesn't make any sense
                with a technically infinite results page.
tags/v1.0^2
Severyn Kozak 10 роки тому
джерело
коміт
2cc5be8737
6 змінених файлів з 24 додано та 13 видалено
  1. BIN
     
  2. +1
    -1
      static/js/about.js
  3. +0
    -1
      static/js/index.js
  4. +4
    -0
      static/sass/_mixins.sass
  5. +10
    -8
      static/sass/about.sass
  6. +9
    -3
      static/sass/main.sass

+ 1
- 1
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;
}


+ 0
- 1
static/js/index.js Переглянути файл

@@ -138,7 +138,6 @@ var searchResultsPage = 1;

//Obtained by parsing python file with pygments
var codeExample = '<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre> 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</pre></div></td><td class="code"><div class="highlight"><pre><span class="sd">&quot;&quot;&quot;</span>\n<span class="sd">Module to contain all the project&#39;s Flask server plumbing.</span>\n<span class="sd">&quot;&quot;&quot;</span>\n\n<span class="kn">from</span> <span class="nn">flask</span> <span class="kn">import</span> <span class="n">Flask</span>\n<span class="kn">from</span> <span class="nn">flask</span> <span class="kn">import</span> <span class="n">render_template</span><span class="p">,</span> <span class="n">session</span>\n\n<span class="kn">from</span> <span class="nn">bitshift</span> <span class="kn">import</span> <span class="n">assets</span>\n<span class="c"># from bitshift.database import Database</span>\n<span class="c"># from bitshift.query import parse_query</span>\n\n<span class="hll"><span class="n">app</span> <span class="o">=</span> <span class="n">Flask</span><span class="p">(</span><span class="n">__name__</span><span class="p">)</span>\n</span><span class="hll"><span class="n">app</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">from_object</span><span class="p">(</span><span class="s">&quot;bitshift.config&quot;</span><span class="p">)</span>\n</span>\n<span class="hll"><span class="n">app_env</span> <span class="o">=</span> <span class="n">app</span><span class="o">.</span><span class="n">jinja_env</span>\n</span><span class="hll"><span class="n">app_env</span><span class="o">.</span><span class="n">line_statement_prefix</span> <span class="o">=</span> <span class="s">&quot;=&quot;</span>\n</span><span class="hll"><span class="n">app_env</span><span class="o">.</span><span class="n">globals</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">assets</span><span class="o">=</span><span class="n">assets</span><span class="p">)</span>\n</span>\n<span class="c"># database = Database()</span>\n\n<span class="hll"><span class="nd">@app.route</span><span class="p">(</span><span class="s">&quot;/&quot;</span><span class="p">)</span>\n</span><span class="k">def</span> <span class="nf">index</span><span class="p">():</span>\n <span class="k">return</span> <span class="n">render_template</span><span class="p">(</span><span class="s">&quot;index.html&quot;</span><span class="p">)</span>\n\n<span class="hll"><span class="nd">@app.route</span><span class="p">(</span><span class="s">&quot;/search/&lt;query&gt;&quot;</span><span class="p">)</span>\n</span><span class="k">def</span> <span class="nf">search</span><span class="p">(</span><span class="n">query</span><span class="p">):</span>\n <span class="c"># tree = parse_query(query)</span>\n <span class="c"># database.search(tree)</span>\n <span class="k">pass</span>\n\n<span class="hll"><span class="nd">@app.route</span><span class="p">(</span><span class="s">&quot;/about&quot;</span><span class="p">)</span>\n</span><span class="k">def</span> <span class="nf">about</span><span class="p">():</span>\n <span class="k">return</span> <span class="n">render_template</span><span class="p">(</span><span class="s">&quot;about.html&quot;</span><span class="p">)</span>\n\n<span class="hll"><span class="nd">@app.route</span><span class="p">(</span><span class="s">&quot;/developers&quot;</span><span class="p">)</span>\n</span><span class="k">def</span> <span class="nf">developers</span><span class="p">():</span>\n <span class="k">return</span> <span class="n">render_template</span><span class="p">(</span><span class="s">&quot;developers.html&quot;</span><span class="p">)</span>\n\n<span class="k">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span>\n<span class="hll"> <span class="n">app</span><span class="o">.</span><span class="n">run</span><span class="p">(</span><span class="n">debug</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>\n</span></pre></div>\n</td></tr></table>'
searchBar.onkeyup = typingTimer;

var testCodelet = {
'url': 'https://github.com/earwig/bitshift/blob/develop/app.py',


+ 4
- 0
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)



+ 10
- 8
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


+ 9
- 3
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



Завантаження…
Відмінити
Зберегти