From 9331c35ce9432e8f5654cb0a9034dcbdbbe82adf Mon Sep 17 00:00:00 2001
From: Robert Metcalf <metcalfr@cardiff.ac.uk>
Date: Fri, 19 Nov 2021 11:27:58 +0000
Subject: [PATCH] move static files into static, correct styles to only work on
the navbar
---
Tramshed_Logo.jpg => static/Tramshed_Logo.jpg | Bin
style.css => static/style.css | 18 ++++++------------
templates/home.html | 4 ++--
templates/main.html | 5 ++---
4 files changed, 10 insertions(+), 17 deletions(-)
rename Tramshed_Logo.jpg => static/Tramshed_Logo.jpg (100%)
rename style.css => static/style.css (85%)
diff --git a/Tramshed_Logo.jpg b/static/Tramshed_Logo.jpg
similarity index 100%
rename from Tramshed_Logo.jpg
rename to static/Tramshed_Logo.jpg
diff --git a/style.css b/static/style.css
similarity index 85%
rename from style.css
rename to static/style.css
index b837fd9..640879b 100644
--- a/style.css
+++ b/static/style.css
@@ -1,13 +1,7 @@
h1
{ color: blue;}
-button
-{color: greenyellow;
-border-spacing: 20px;
-size: 4000000px;
-}
-
-li {
+nav li {
display: inline;
border-right: 1px solid #bbb;
float:left;
@@ -15,14 +9,14 @@ li {
border-bottom-right-radius: 1000%;
}
-li:last-child {
+nav li:last-child {
color: red;
background-color: red;
border-right: none;
border-top-left-radius: 1000%;
border-bottom-left-radius: 1000%;
}
-ul {
+nav ul {
list-style-type: none;
margin: 0;
padding: 0;
@@ -31,7 +25,7 @@ ul {
}
-li a {
+nav li a {
display: block;
color: white;
text-align: center;
@@ -40,7 +34,7 @@ li a {
}
-li a:hover {
+nav li a:hover {
border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%;
border-top-left-radius: -1000%;
@@ -48,7 +42,7 @@ li a:hover {
background-color: #111;
}
-li a:hover:last-child {
+nav li a:hover:last-child {
border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%;
border-top-left-radius: 1000%;
diff --git a/templates/home.html b/templates/home.html
index 9556192..9a1af7e 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -3,8 +3,8 @@
{% block mainBlock %}
<ul>
{% for workspace in workspaces %}
- <li><a href="{{ workspace.website }}">{{ workspace.name }}</a></li>
- <img src="{{ workspace.main_photo }}">
+ <li><a href="{{ workspace.website }}">{{ workspace.name }}</a>
+ <img src="{{ workspace.main_photo }}"></li>
<ul>
<li>{{ workspace.address }}</li>
<li>{{ workspace.description }}</li>
diff --git a/templates/main.html b/templates/main.html
index 56b139e..3490374 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -1,9 +1,8 @@
<!DOCTYPE html>
<html lang="en">
-<link rel="stylesheet" href="styles.css">
<head>
- <link rel="stylesheet" href="style.css">
+ <link rel="stylesheet" href="static/style.css">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href=
@@ -17,7 +16,7 @@
<div class="parallax">
<body class="body">
- <img src="Tramshed_Logo.jpg" alt="Logo" height="50" width="100">
+ <img src="static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100">
<!-- navigation -->
<nav>
<ul>
--
GitLab