From 8f097fe718d86c1ec84fe425159777c73b4ce7ec Mon Sep 17 00:00:00 2001
From: fi <f2-scarpino@live.uwe.ac.uk>
Date: Thu, 20 Apr 2023 11:40:16 +0100
Subject: [PATCH 1/3] navbar changes
---
__pycache__/footballHelper.cpython-311.pyc | Bin 0 -> 4232 bytes
static/styles/navbar.css | 14 +++-----------
templates/base.html | 19 ++++++++++++-------
3 files changed, 15 insertions(+), 18 deletions(-)
create mode 100644 __pycache__/footballHelper.cpython-311.pyc
diff --git a/__pycache__/footballHelper.cpython-311.pyc b/__pycache__/footballHelper.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..43b73a1fcafd86a25fd9e8ecc90b3b6e39db118b
GIT binary patch
literal 4232
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
AR{#J2
literal 0
HcmV?d00001
diff --git a/static/styles/navbar.css b/static/styles/navbar.css
index c00e2e0..0001347 100644
--- a/static/styles/navbar.css
+++ b/static/styles/navbar.css
@@ -1,24 +1,16 @@
.buttonDown{
margin-top: 30px;
}
- .nav-masthead .nav-link {
+ .nav-navbar .nav-link {
color: rgba(255, 255, 255, .5);
border-bottom: .25rem solid transparent;
}
- .nav-masthead .nav-link:hover,
- .nav-masthead .nav-link:focus {
+ .nav-navbar .nav-link:hover,
+ .nav-navbar .nav-link:focus {
border-bottom-color: rgba(255, 255, 255, .25);
}
- .nav-masthead .nav-link + .nav-link {
- margin-left: 1rem;
- }
-
- .nav-masthead .active {
- color: #fff;
- border-bottom-color: #fff;
- }
img {
width: 100%; /* takes the 100 % width of its container (.box div)*/
diff --git a/templates/base.html b/templates/base.html
index 4d760a0..2a087e9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,15 +9,20 @@
<style>
</style>
<link href="{{ url_for('static', filename='styles/homepage.css') }}" rel="stylesheet">
-
+ <link href="{{ url_for('static', filename='styles/navbar.css') }}" rel="stylesheet">
</head>
- <!-- Navbar implementation-->
<body class="text-bg-dark text-center">
- <nav class="p-3 navbar">
- <nav class="nav nav-masthead justify-content-center float-md-end">
- <a class="nav-link fw-bold py-1 px-0 current" aria-current="page" href="/">Home</a>
- <a class="nav-link fw-bold py-1 px-0" href="/players">Players</a>
- </nav>
+ <!-- Navbar Implementation -->
+ <nav class="navbar">
+ <div class="navbar-nav">
+ <a class="nav-item nav-link px-2" href="/">Home</a>
+ <a class="nav-item nav-link px-2" href="/players">Players</a>
+ <a class="nav-item nav-link px-2" href="/playerCompare">Player Comparison</a></div>
+ <div class="navbar-nav ms-auto">
+ <a class="nav-item nav-link px-2" href="#">Admin</a>
+ <a class="nav-item nav-link px-2" href="/login">Login</a></div>
+ </nav>
+
<!-- All other pages use the content block to put page content onto the template -->
<div class="container">
--
GitLab
From 955f69bde2274b4a37d70701005d14665b37b64b Mon Sep 17 00:00:00 2001
From: fi <f2-scarpino@live.uwe.ac.uk>
Date: Thu, 20 Apr 2023 11:43:23 +0100
Subject: [PATCH 2/3] navbar changes css
---
static/styles/navbar.css | 3 +++
1 file changed, 3 insertions(+)
diff --git a/static/styles/navbar.css b/static/styles/navbar.css
index 0001347..eb0c420 100644
--- a/static/styles/navbar.css
+++ b/static/styles/navbar.css
@@ -10,6 +10,9 @@
.nav-navbar .nav-link:focus {
border-bottom-color: rgba(255, 255, 255, .25);
}
+ .navbar-nav {
+ flex-direction:row !important;
+ }
img {
--
GitLab
From 81622c07395b030cedb288e981641a23756569b5 Mon Sep 17 00:00:00 2001
From: fi <f2-scarpino@live.uwe.ac.uk>
Date: Thu, 20 Apr 2023 11:44:26 +0100
Subject: [PATCH 3/3] navbar changes
---
static/styles/navbar.css | 3 +--
templates/base.html | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/static/styles/navbar.css b/static/styles/navbar.css
index eb0c420..1964c4f 100644
--- a/static/styles/navbar.css
+++ b/static/styles/navbar.css
@@ -11,8 +11,7 @@
border-bottom-color: rgba(255, 255, 255, .25);
}
.navbar-nav {
- flex-direction:row !important;
- }
+ flex-direction:row !important; }
img {
diff --git a/templates/base.html b/templates/base.html
index 2a087e9..2eae759 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -20,7 +20,8 @@
<a class="nav-item nav-link px-2" href="/playerCompare">Player Comparison</a></div>
<div class="navbar-nav ms-auto">
<a class="nav-item nav-link px-2" href="#">Admin</a>
- <a class="nav-item nav-link px-2" href="/login">Login</a></div>
+ <a class="nav-item nav-link px-2" href="/login">Login</a>
+ </div>
</nav>
--
GitLab