diff --git a/.gitignore b/.gitignore index 9248c78..62b6447 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,8 @@ local_settings.py db.sqlite3 db.sqlite3-journal +# bruh windows +*:Zone.Identifier # Flask stuff: instance/ diff --git a/manage.py b/manage.py old mode 100755 new mode 100644 diff --git a/pages/static/pages/css/img/TJLogo.png b/pages/static/pages/css/img/TJLogo.png deleted file mode 100644 index 8c91c18..0000000 Binary files a/pages/static/pages/css/img/TJLogo.png and /dev/null differ diff --git a/pages/static/pages/css/img/hero.png b/pages/static/pages/css/img/hero.png index f2c65d8..acd2dce 100644 Binary files a/pages/static/pages/css/img/hero.png and b/pages/static/pages/css/img/hero.png differ diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css index 414c46a..27617e3 100644 --- a/pages/static/pages/css/styles.css +++ b/pages/static/pages/css/styles.css @@ -2,23 +2,58 @@ @import 'https://fonts.googleapis.com/css?family=Josefin+Slab:700'; @import 'https://fonts.googleapis.com/css?family=Arapey:400,600'; @import url('https://fonts.googleapis.com/css2?family=Hind:wght@300&display=swap'); -.jumbotron { - background-image: url('img/hero.png'); - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; + + +html { + overflow-x: hidden; } + +nav { + z-index: 10; +} + +.animated-navbar { + transform: translateY(-70px); + animation: nav-slide 0.75s ease-in-out forwards; + animation-delay: 1s; +} + +@keyframes nav-slide { + 0% { + transform: translateY(-70px); + } + + 100% { + transform: translateY(0px); + } +} + + +.jumbotron { + position: relative; + transform: translateY(-70px); + top: 0; + left: 0; + height: 100vh; + width: 100vw; + background-image: url('img/hero.png') +} + +.hero-text { + margin-top: 25vh; +} + .valign { display: flex; flex-direction: row; align-items: center; } .home { - weight: bold; + font-weight: bold; text-align: center; background-color: rgb(255, 255, 255, 0.85); } + body { font-family: "Montserrat", "Helvetica", "Arial", sans-serif; margin: 0px; @@ -27,11 +62,6 @@ body { color: #444; } -.row { - display: flex; - flex-direction: row; -} - .segment { padding-left: 17px; padding-right: 17px; @@ -78,7 +108,7 @@ body { font-weight: 500; } -.segment-image { +.news-image { max-width: 100%; margin-bottom: 10px; } @@ -126,27 +156,6 @@ body { font-weight: 500; } -/*# sourceMappingURL=css/index.css.map */ -html { - overflow-x: hidden; -} - -nav { - z-index: 10; -} - -.animated-navbar { - transform: translateY(-70px); - animation: nav-slide 0.75s ease-in-out forwards; - animation-delay: 1s; -} - -@keyframes nav-slide { - 0% { - transform: translateY(-70px); - } - - 100% { - transform: translateY(0px); - } +.hero-text { + margin-top: 30vh; } \ No newline at end of file diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html index d0dc6de..79e95bd 100644 --- a/pages/templates/pages/base.html +++ b/pages/templates/pages/base.html @@ -21,7 +21,7 @@