From ca51221a6ed896ca00a11a1e6f4d7e1b2a86bae8 Mon Sep 17 00:00:00 2001 From: William Zhang Date: Sat, 17 Feb 2018 19:02:30 -0500 Subject: [PATCH] cleanup --- _includes/footer.html | 2 +- css/about.css | 5 ----- css/footer.css | 8 -------- css/header.css | 5 +---- css/main.css | 11 ----------- css/responsive.css | 4 ---- js/sidebar-min.js | 2 ++ 7 files changed, 4 insertions(+), 33 deletions(-) create mode 100644 js/sidebar-min.js diff --git a/_includes/footer.html b/_includes/footer.html index 97f9422..e99d1f4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -16,4 +16,4 @@ - + diff --git a/css/about.css b/css/about.css index f818383..5fed823 100644 --- a/css/about.css +++ b/css/about.css @@ -1,8 +1,3 @@ -/*#excomm { - content: ''; - flex: auto; -}*/ - #contact { width: 100%; display: block; diff --git a/css/footer.css b/css/footer.css index cc4f22d..d51b1b3 100644 --- a/css/footer.css +++ b/css/footer.css @@ -11,14 +11,6 @@ footer { z-index: 2; } -/*footer>span { - width: 100vw; - height: 2em; - font-size: 1.1em; - display: table-cell; - vertical-align: middle; -}*/ - button.social { cursor: pointer; outline: none; diff --git a/css/header.css b/css/header.css index 1893f2d..976d3b7 100644 --- a/css/header.css +++ b/css/header.css @@ -1,7 +1,6 @@ header { position: relative; width: 100%; - /*height: calc(10vh + 50px);*/ } #banner { @@ -20,7 +19,7 @@ header { #logo { width: 15vh; height: 12vh; - background-image: url('../img/logo.jpg'); + background-image: url('../img/logo.png'); background-size: 100%; background-position: center; background-repeat: no-repeat; @@ -58,8 +57,6 @@ nav#menu { flex-wrap: nowrap; justify-content: center; border-bottom: 3px solid rgb(164, 38, 44); - - /*box-shadow: 0 28px 79px 0 rgba(66, 129, 121, .27);*/ } a.menu-item { diff --git a/css/main.css b/css/main.css index 796e430..a14e630 100644 --- a/css/main.css +++ b/css/main.css @@ -135,19 +135,10 @@ span>a:active { #wrapper { position: relative; width: 100%; - - /*min-height: calc(60vh - 42px - 2.75em); - min-height: calc(100vh - 55px - 280px - 86px); - */ z-index: 1; background-color: #4C4A48; - /*display: flex; - flex-direction: column; - align-items: center; - */ height: auto; min-height: 100%; - overflow: hidden; } @@ -236,8 +227,6 @@ section h2, #tweets, #feedback { text-align: center; - /*flex-grow: calc(50% - 8vw); -*/ margin: 0 2vw; } diff --git a/css/responsive.css b/css/responsive.css index 5475983..92e9d94 100644 --- a/css/responsive.css +++ b/css/responsive.css @@ -138,10 +138,6 @@ display: none; } #wrapper { - /*min-height: 100%calc(100vh - 90px - 2.75em); - */ - /*flex-grow: 1;*/ - /*flex-shrink: 0;*/ height: auto; min-height: calc(100vh - 130px); } diff --git a/js/sidebar-min.js b/js/sidebar-min.js new file mode 100644 index 0000000..a15e311 --- /dev/null +++ b/js/sidebar-min.js @@ -0,0 +1,2 @@ +function toggleSidebar(e){""!=sb.style.left&&"-30vw"!=sb.style.left||!e?(sb.style.disabled=!0,sb.style.left="-30vw"):(sb.style.disabled=!1,sb.style.left="0px")}var mb=document.querySelector("#menu-toggle"),sb=document.querySelector("nav#menu"),tb=document.querySelector("#logo"),dm=document.querySelector("#dome"),wr=document.querySelector("#wrapper") +mb.addEventListener("click",function(){toggleSidebar(!0)},!1),wr.addEventListener("click",function(){toggleSidebar(!1)},!1),tb.addEventListener("click",function(){toggleSidebar(!1)},!1),dm.addEventListener("click",function(){toggleSidebar(!1)},!1),mb.addEventListener("touchleave",function(){toggleSidebar(!0)},!1),wr.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),tb.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),dm.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),sb.style.disabled=!0