Skip to content
Snippets Groups Projects
Commit 6a282c91 authored by Ray Liu's avatar Ray Liu
Browse files

Merge branch 'master' of https://gitlab.cas.mcmaster.ca/schankuc/2XB3 

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
parents 7c393a24 71419b1b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tomcat/webapps/Trawl/about.html
+ 37
− 38
View file @ 6a282c91
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="keywords" content="insert, some, keywords"> <!--TODO-->
<meta name="description" content="insert a description"> <!--TODO-->
<title>About | TrawlExpert</title>
<link rel="stylesheet" type="text/css" href="style.css">
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
<!--Fonts-->
<!--Open Sans Rg-400/Semi-600/Bd-700-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
</head>
<body>
<header>
<div class="headerWrapper">
<a href="index.jsp" >TrawlExpert</a>
<span class="nav-bar">
<a href="about.html">About</a> |
<a href="doc/" target="_blank">TrawlExpert API</a> |
<a href="https://gitlab.cas.mcmaster.ca/schankuc/2XB3" target="_blank">Git</a>
</span>
</div>
</header>
<section>
Insert some info about the project, blah blah blah.<br>
Add photo credit if applicable
</section>
<div id="histogram">
</div>
</body>
<script src="histogram.js"></script>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="keywords" content="insert, some, keywords"> <!--TODO-->
<meta name="description" content="insert a description"> <!--TODO-->
<title>About | TrawlExpert</title>
<link rel="stylesheet" type="text/css" href="style.css">
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
<!--Fonts-->
<!--Open Sans Rg-400/Semi-600/Bd-700-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
</head>
<body>
<header>
<div class="headerWrapper">
<a href="index.jsp" >TrawlExpert</a>
<span class="nav-bar">
<a href="about.html">About</a> |
<a href="doc/" target="_blank">TrawlExpert API</a> |
<a href="https://gitlab.cas.mcmaster.ca/schankuc/2XB3" target="_blank">Git</a>
</span>
</div>
</header>
<section>
Photo by <a href="https://unsplash.com/@prelevicm" target="_blank">Milos Prelevic</a> on <a href="https://unsplash.com" target="_blank">Unsplash</a> [Modified]
</section>
<div id="histogram">
</div>
</body>
<script src="histogram.js"></script>
</html>
\ No newline at end of file
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