diff options
author | Weitian LI <liweitianux@gmail.com> | 2014-04-28 13:39:23 +0800 |
---|---|---|
committer | Weitian LI <liweitianux@gmail.com> | 2014-04-28 13:39:23 +0800 |
commit | 7ba3812f918983a47cda678c31d12e0cd089677a (patch) | |
tree | 5731a9549a18f348261df5c8913049b83ab4119c /page | |
parent | 650b6c5f48bccd2f79e2489ecd9df9157bac421a (diff) | |
download | django-skaschool-7ba3812f918983a47cda678c31d12e0cd089677a.tar.bz2 |
* moved 'introduction.js' -> 'sidebar.js'
* moved 'introduction.css' -> 'sidebar.css'
* updated page introduction.html
* updated index.html and navbar.html
Diffstat (limited to 'page')
-rw-r--r-- | page/static/css/introduction.css | 32 | ||||
-rw-r--r-- | page/static/js/introduction.js | 34 | ||||
-rw-r--r-- | page/templates/page/introduction.html | 4 |
3 files changed, 2 insertions, 68 deletions
diff --git a/page/static/css/introduction.css b/page/static/css/introduction.css deleted file mode 100644 index 58a6220..0000000 --- a/page/static/css/introduction.css +++ /dev/null @@ -1,32 +0,0 @@ -/* - * css for introduction template - */ - -.navbar-bright { - background-color: #111155; - color: #fff; -} - -.affix-top, .affix{ - position: static; -} - -@media (min-width: 979px) { - #sidebar.affix-top { - position: static; - margin-top: 30px; - width: 228px; - } - - #sidebar.affix { - position: fixed; - top: 70px; - width: 228px; - } -} - -#sidebar li.active { - border: 0 #eee solid; - border-left-width: 5px; -} - diff --git a/page/static/js/introduction.js b/page/static/js/introduction.js deleted file mode 100644 index b0ff02c..0000000 --- a/page/static/js/introduction.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * js for introduction page - */ - -$(document).ready(function() { - $('#sidebar').affix({ - offset: { - top: 235 - } - }); - - var $body = $(document.body); - var navHeight = $('.navbar').outerHeight(true) + 10; - - $body.scrollspy({ - target: '#sidebar-col', - offset: navHeight - }); - - /* smooth scrolling sections */ - $('a[href*=#]:not([href=#])').click(function() { - if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) { - var target = $(this.hash); - target = target.length ? target : $('[name=' + this.hash.slice(1) +']'); - if (target.length) { - $('html,body').animate({ - scrollTop: target.offset().top - 50 - }, 100); - return false; - } - } - }); -}); - diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html index fb22398..9a40b29 100644 --- a/page/templates/page/introduction.html +++ b/page/templates/page/introduction.html @@ -10,7 +10,7 @@ {% endblock %} {% block css_extra %} - <link href="{% static 'css/introduction.css' %}" rel="stylesheet"> + <link href="{% static 'css/sidebar.css' %}" rel="stylesheet"> {% endblock %} {% block content %} @@ -102,7 +102,7 @@ {% endblock %} {% block js_extra %} - <script src="{% static 'js/introduction.js' %}" type="text/javascript"></script> + <script src="{% static 'js/sidebar.js' %}" type="text/javascript"></script> {% endblock %} |