diff --git a/Home/static/home/assets/css/template.css b/Home/static/home/assets/css/template.css index a5f2522..1b2a2f5 100644 --- a/Home/static/home/assets/css/template.css +++ b/Home/static/home/assets/css/template.css @@ -27,49 +27,139 @@ iframe{ border:0; } -.sidebar{ + +#toggle_button +{ + color: #eee; + background: rgba(0,0,0,0.3); + padding: 1rem; + font-size: 2rem; + top: 1.5rem; + left: 1.5rem; + z-index: 1000; + border-radius: 0.5rem; + position: fixed; +} + +#sidebar{ position:fixed; width:250px; background-color:#111; height:100%; top:0; left:0; - padding:60px 0 0px 20px; z-index:999; - background-repeat:no-repeat; - background-position:center center; - -webkit-background-size:cover; - -moz-background-size:cover; - -o-background-size:cover; - background-size:cover; + overflow-y: auto; + overflow-x: hidden; + padding: 1rem; +} + +#sidebar-logo +{ + padding: 1rem; + width: 100%; + display: block; + text-align: center; + margin-top: 8vh; +} + +#sidebar-logo img { + width: 10rem; } -.sidebar a{ +#sidebar a{ color:rgba(255, 255, 255, .7); } -.sidebar a:hover{ +#sidebar a:hover{ color:#fff; } -.sidebar .copyright{ - position:relative; - width:100%; - bottom:0; - left:0; - padding:15px 30px; - font-size:11px; - margin-top: 50px; +#sidebar .nav +{ + padding: 2rem 1rem; } -.sidebar .social-icons a{ - font-size:12px; - margin-right:10px; +#sidebar-bottom{ + position: absolute; + width: 100%; + bottom:-20vh; + padding: 2rem; + font-size: 11px; +} + +#sidebar-bottom .login_button +{ + background-color: #ffc107; + color: #000; +} + +#sidebar-bottom .login_button:hover +{ + color: black; + font-weight: 600; +} + +#sidebar-bottom .social_icons a{ + font-size: 18px; + margin-right: 0.8rem; + margin-top: 2rem; + color: #666; +} + +#sidebar-bottom .social_icons a:hover{ + color: #fff; } .wrapper{ position:relative; margin-left:250px; + transition: margin 1s; +} + + +.sidebar-dropdown > a +{ + display: inline-block!important; +} + +.sidebar-dropdown > span +{ + margin-left: 5rem; + transition: 1s; +} + +.sidebar-dropdown > ul +{ + list-style: none; + margin: 0; + padding: 0 3rem; + transition: display 5s; +} + +.sidebar-dropdown > ul > li +{ + padding: 0.5rem; +} + +/* width */ +#sidebar::-webkit-scrollbar { + width: 5px; +} + +/* Track */ +#sidebar::-webkit-scrollbar-track { + background: #f1f1f1; +} + +/* Handle */ +#sidebar::-webkit-scrollbar-thumb { + background: #888; +} + +/* Handle on hover */ +#sidebar::-webkit-scrollbar-thumb:hover { + background: #555; } @media (max-width: 991px){ @@ -1074,7 +1164,6 @@ blockquote cite{ .navbar-custom .navbar-header{ float:none; - margin:0 0 60px; } .navbar-custom .navbar-nav{ @@ -1778,17 +1867,11 @@ blockquote cite{ [Footer] */ -.footer{ - background-color:#fff; - padding:60px 0; - position:relative; - background-repeat:no-repeat; - background-position:center center; - -webkit-background-size:cover; - -moz-background-size:cover; - -o-background-size:cover; - background-size:cover; - color:#BBB; +footer +{ + background: #eee; + padding: 3vh 0; + color: #DDD; } .contact-info{ @@ -1814,22 +1897,30 @@ button#submit:hover { textarea { resize: none; } + +#copyright +{ + color: #666; +} + #go_to_top { + background: #111; + color: white!important; + text-align: center; + font-size: 2rem; width: 40px; line-height: 40px; border-radius: 50%; display: none; cursor: pointer; position: fixed; - bottom: 5%; - right: 1%; - background: #111; - color: #555; - text-align: center; + bottom: 1.5%; + right: 2%; } + #go_to_top:hover { background-color: #f5f5f5; - color: #000; + color: black!important; } /*!------------------------------------------------------------------ diff --git a/Home/static/home/assets/images/2018-foss.jpg b/Home/static/home/assets/images/2018-foss.jpg index b92c073..0836d59 100644 Binary files a/Home/static/home/assets/images/2018-foss.jpg and b/Home/static/home/assets/images/2018-foss.jpg differ diff --git a/Home/static/home/assets/images/branding/logo_light.png b/Home/static/home/assets/images/branding/logo_light.png new file mode 100644 index 0000000..d3569af Binary files /dev/null and b/Home/static/home/assets/images/branding/logo_light.png differ diff --git a/Home/static/home/assets/js/scrollup.js b/Home/static/home/assets/js/scrollup.js deleted file mode 100644 index c3edce8..0000000 --- a/Home/static/home/assets/js/scrollup.js +++ /dev/null @@ -1,17 +0,0 @@ -$(document).ready(function() { - $(window).scroll(function(){ - var position = $(window).scrollTop(); - console.log("position is " + position); - if(position > 70 ) { - $('#go_to_top').show(); - } else { - $('#go_to_top').hide(); - } - }); - - $("#go_to_top").click(function(event){ - event.preventDefault(); - $("html, body").animate({scrollTop: 0}, "slow"); - return false; - }); -}); diff --git a/Home/static/home/assets/js/submenu-fix.js b/Home/static/home/assets/js/submenu-fix.js index 1c89fe8..e69de29 100644 --- a/Home/static/home/assets/js/submenu-fix.js +++ b/Home/static/home/assets/js/submenu-fix.js @@ -1,2 +0,0 @@ -(function($){$(document).ready(function(){var mobileTest;if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){mobileTest=true;}else{mobileTest=false;}$(window).on('resize',function(){var width=Math.max($(window).width(),window.innerWidth);if(width>991){$('.navbar-custom .navbar-nav > li.dropdown').hover(function(){var menuLeftOffset=$('.dropdown-menu',$(this)).offset().left;var -maxWidth1=0,maxWidth2=0,menuLevelOne=$(this).children('.dropdown-menu'),menuLevelTwo=$('.dropdown-menu',menuLevelOne),menuLevelOneWidth,menuLevelTwoWidth;menuLevelOne.each(function(){if($(this).width()>maxWidth1){menuLevelOneWidth=$(this).width();}});menuLevelTwo.each(function(){if($(this).width()>maxWidth2){menuLevelTwoWidth=$(this).width();}});if(typeof menuLevelTwoWidth==='undefined'){menuLevelTwoWidth=0;}if(width-menuLeftOffset-menuLevelOneWidth0){if(width-menuLeftOffset-menuLevelOneWidth991)&&(mobileTest!==true)){$('.navbar-custom .navbar-nav > li.dropdown, .navbar-custom li.dropdown > ul > li.dropdown').removeClass('open');var delay=0;var setTimeoutConst;$('.navbar-custom .navbar-nav > li.dropdown, .navbar-custom li.dropdown > ul > li.dropdown').hover(function(){var $this=$(this);setTimeoutConst=setTimeout(function(){$this.addClass('open');$this.find('.dropdown-toggle').addClass('disabled');},delay);},function(){clearTimeout(setTimeoutConst);$(this).removeClass('open');$(this).find('.dropdown-toggle').removeClass('disabled');});}else{$('.navbar-custom .navbar-nav > li.dropdown, .navbar-custom li.dropdown > ul > li.dropdown').unbind('mouseenter mouseleave');$('.navbar-custom [data-toggle=dropdown]').not('.binded').addClass('binded').on('click',function(event){event.preventDefault();event.stopPropagation();$(this).parent().siblings().removeClass('open');$(this).parent().siblings().find('[data-toggle=dropdown]').parent().removeClass('open');$(this).parent().toggleClass('open');});}}).resize();});})(jQuery); \ No newline at end of file diff --git a/Home/static/home/assets/js/theme.js b/Home/static/home/assets/js/theme.js new file mode 100644 index 0000000..d997dd1 --- /dev/null +++ b/Home/static/home/assets/js/theme.js @@ -0,0 +1,54 @@ +$(document).ready(function() { + if($(window).width() < 900) + { + $('#sidebar').addClass('fadeOutLeft'); + $(".wrapper").css("margin-left", "0"); + } + else { + $('#toggle_button').removeClass('fa-bars'); + $('#toggle_button').addClass('fa-times'); + } + $('#toggle_button').click(function(){ + if($('#sidebar').hasClass("fadeOutLeft")) + { + $('#toggle_button').removeClass('fa-bars'); + $('#toggle_button').addClass('fa-times'); + $('#sidebar').removeClass('fadeOutLeft'); + $('#sidebar').addClass('fadeInLeft'); + $(".wrapper").css("margin-left", "250px"); + + } + else { + $('#toggle_button').addClass('fa-bars'); + $('#toggle_button').removeClass('fa-times'); + $('#sidebar').removeClass('fadeInLeft'); + $('#sidebar').addClass('fadeOutLeft'); + $(".wrapper").css("margin-left", "0"); + } + }); + $('#open-inside-foss').click(function(){ + if($('#open-inside-foss ul').hasClass("fadeOut")) + { + $('#open-inside-foss ul').removeClass('fadeOut').addClass('fadeIn').css('display','block'); + $('#open-inside-foss span').removeClass('fa-chevron-down').addClass('fa-chevron-up'); + } + else { + $('#open-inside-foss ul').removeClass('fadeIn').addClass('fadeOut').delay(500).css('display','none'); + $('#open-inside-foss span').addClass('fa-chevron-down').addClass('fa-chevron-down'); + } + }); + $(window).scroll(function(){ + var position = $(window).scrollTop(); + if(position > 70 ) { + $('#go_to_top').show(); + } else { + $('#go_to_top').hide(); + } + }); + + $("#go_to_top").click(function(event){ + event.preventDefault(); + $("html, body").animate({scrollTop: 0}, "slow"); + return false; + }); +}); diff --git a/Home/templates/base/base.html b/Home/templates/base/base.html index de393fb..4679266 100644 --- a/Home/templates/base/base.html +++ b/Home/templates/base/base.html @@ -31,6 +31,7 @@ + @@ -62,21 +63,21 @@ {% include 'home/../base/side-nav.html' %} -
+
{% block content %} {% endblock %}
-{% block body %} {% endblock %} - + {% block body %} {% endblock %} {% include 'home/../base/footer.html' %} -
+ + - + diff --git a/Home/templates/base/footer.html b/Home/templates/base/footer.html index 563b0f7..45e4aaf 100644 --- a/Home/templates/base/footer.html +++ b/Home/templates/base/footer.html @@ -1,22 +1,13 @@ -