From ab576bd08311dfaedfda3d92b6f773acd3817524 Mon Sep 17 00:00:00 2001 From: William Zhang Date: Wed, 24 Jan 2018 18:16:46 -0500 Subject: [PATCH] fix for safari --- about.html | 2 +- css/about.css | 1 + css/main.css | 17 +++++++++++++---- css/responsive.css | 9 ++++++++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/about.html b/about.html index b397032..80fb43f 100644 --- a/about.html +++ b/about.html @@ -44,7 +44,7 @@ orgs: ["officers", "excomm", "senators", "sponsors"] {% capture filename %}img/people/{{ first }}{{ last }}.jpg{% endcapture %} {% endif %} {% capture exists %} - {% file_exists: {{ path }} %} + {% file_exists {{ path }} %} {% endcapture %} {% if exists == false %} {% capture filename %}img/profile.jpg{% endcapture %} diff --git a/css/about.css b/css/about.css index c276d4c..9ebd4b6 100644 --- a/css/about.css +++ b/css/about.css @@ -87,6 +87,7 @@ width: 17vw; max-width: 200px; flex-wrap: wrap; + flex-basis: 50%; } #excomm-desc, diff --git a/css/main.css b/css/main.css index ba7f2f2..753c473 100644 --- a/css/main.css +++ b/css/main.css @@ -135,12 +135,18 @@ span>a:active { #wrapper { position: relative; width: 100%; - min-height: calc(60vh - 42px - 2.75em); + + /*min-height: calc(60vh - 42px - 2.75em); + */ z-index: 1; background-color: #4C4A48; - display: flex; + /*display: flex; flex-direction: column; align-items: center; + */ + height: auto; + min-height: 100%; + overflow: hidden; } @@ -157,6 +163,8 @@ section { width: 100%; min-height: 100%; display: flex; + align-items: center; + justify-content: center; z-index: 2; } @@ -167,7 +175,7 @@ section { #senators, #sponsors, #resources { - max-width: 1200px; + /*max-width: 1200px;*/ display: flex; height: 100%; justify-content: center; @@ -218,7 +226,8 @@ section h2, #tweets, #feedback { text-align: center; - flex-grow: calc(50% - 8vw); + /*flex-grow: calc(50% - 8vw); +*/ margin: 0 2vw; } diff --git a/css/responsive.css b/css/responsive.css index b861a61..6ad6a74 100644 --- a/css/responsive.css +++ b/css/responsive.css @@ -100,6 +100,8 @@ } section { max-width: 750px; + flex-grow: 1; + flex-shrink: 0; } #banner > h1 { font-size: 40px; @@ -137,7 +139,12 @@ display: none; } #wrapper { - min-height: calc(100vh - 90px - 2.75em); + /*min-height: 100%calc(100vh - 90px - 2.75em); + */ + /*flex-grow: 1;*/ + /*flex-shrink: 0;*/ + height: auto; + min-height: 100%; } #wrapper, footer {