Skip to content

Commit

Permalink
Merge pull request #177 from ikalnitsky/fix-body-scrolling
Browse files Browse the repository at this point in the history
Do not scroll when ribbon is enabled
  • Loading branch information
Andrii committed Jan 2, 2016
2 parents d83cadd + 84f5485 commit 230384c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 5 additions & 1 deletion holocron/theme/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,20 @@
general
-------------------------------------------------------------------- */

html {
overflow-x: hidden;
}

body {
border-top: 5px solid #2f5a8b;
background-color: #fefefe;
color: #3f3f3f;
font: 18px/28px 'PT Serif', Georgia, serif;
position: relative;
overflow-x: hidden;

/* prevent font scaling in landscape for iPhone */
-webkit-text-size-adjust: 100%;
text-size-adjust: 100%;
}

h1, h2, h3, h4, h5, h6 {
Expand Down
5 changes: 1 addition & 4 deletions holocron/theme/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@
</div> <!-- /.footer-wrapper -->

{% if theme.ribbon %}
<a href="{{ theme.ribbon.link }}" class="ribbon">
{{ theme.ribbon.text }}
</a>
<!-- /.ribbon -->
<a href="{{ theme.ribbon.link }}" class="ribbon">{{ theme.ribbon.text }}</a>
{% endif %}

{% include 'counters.html' %}

0 comments on commit 230384c

Please sign in to comment.