Skip to content
Snippets Groups Projects
Verified Commit 9331c35c authored by Robert Metcalf's avatar Robert Metcalf
Browse files

move static files into static, correct styles to only work on the navbar

parent fd0d8e78
No related branches found
No related tags found
1 merge request!4Add Flask server, templates and initial database support
Hide whitespace changes
Inline Side-by-side
Tramshed_Logo.jpg → static/Tramshed_Logo.jpg
+ 0
− 0
View file @ 9331c35c
File moved
style.css → static/style.css
+ 6
− 12
View file @ 9331c35c
h1 h1
{ color: blue;} { color: blue;}
button
{color: greenyellow;
border-spacing: 20px;
size: 4000000px;
} nav li {
li {
display: inline; display: inline;
border-right: 1px solid #bbb; border-right: 1px solid #bbb;
float:left; float:left;
...@@ -15,14 +9,14 @@ li { ...@@ -15,14 +9,14 @@ li {
border-bottom-right-radius: 1000%; border-bottom-right-radius: 1000%;
} }
li:last-child { nav li:last-child {
color: red; color: red;
background-color: red; background-color: red;
border-right: none; border-right: none;
border-top-left-radius: 1000%; border-top-left-radius: 1000%;
border-bottom-left-radius: 1000%; border-bottom-left-radius: 1000%;
} }
ul { nav ul {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -31,7 +25,7 @@ ul { ...@@ -31,7 +25,7 @@ ul {
} }
li a { nav li a {
display: block; display: block;
color: white; color: white;
text-align: center; text-align: center;
...@@ -40,7 +34,7 @@ li a { ...@@ -40,7 +34,7 @@ li a {
} }
li a:hover { nav li a:hover {
border-bottom-right-radius: 1000%; border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%; border-top-right-radius: 1000%;
border-top-left-radius: -1000%; border-top-left-radius: -1000%;
...@@ -48,7 +42,7 @@ li a:hover { ...@@ -48,7 +42,7 @@ li a:hover {
background-color: #111; background-color: #111;
} }
li a:hover:last-child { nav li a:hover:last-child {
border-bottom-right-radius: 1000%; border-bottom-right-radius: 1000%;
border-top-right-radius: 1000%; border-top-right-radius: 1000%;
border-top-left-radius: 1000%; border-top-left-radius: 1000%;
......
templates/home.html
+ 2
− 2
View file @ 9331c35c
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
{% block mainBlock %} {% block mainBlock %}
<ul> <ul>
{% for workspace in workspaces %} {% for workspace in workspaces %}
<li><a href="{{ workspace.website }}">{{ workspace.name }}</a></li> <li><a href="{{ workspace.website }}">{{ workspace.name }}</a>
<img src="{{ workspace.main_photo }}"> <img src="{{ workspace.main_photo }}"></li>
<ul> <ul>
<li>{{ workspace.address }}</li> <li>{{ workspace.address }}</li>
<li>{{ workspace.description }}</li> <li>{{ workspace.description }}</li>
......
templates/main.html
+ 2
− 3
View file @ 9331c35c
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<link rel="stylesheet" href="styles.css">
<head> <head>
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="static/style.css">
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link rel="stylesheet" href= <link rel="stylesheet" href=
...@@ -17,7 +16,7 @@ ...@@ -17,7 +16,7 @@
<div class="parallax"> <div class="parallax">
<body class="body"> <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 --> <!-- navigation -->
<nav> <nav>
<ul> <ul>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment