Skip to content
Snippets Groups Projects
Commit a8846ab3 authored by changyulve's avatar changyulve
Browse files

fix award

parent 0b315dee
No related branches found
No related tags found
No related merge requests found
Pipeline #454773 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
awards.html
+ 0
− 54
View file @ a8846ab3
......@@ -11,59 +11,6 @@
</head>
<body>
<<<<<<< HEAD
<main class="page">
<nav class="navbar navbar-expand-lg fixed-top bg-body clean-navbar">
<div class="container">
<a href="index.html" class="navbar-brand logo">
<img src="https://static.igem.wiki/teams/5459/logo.png" alt="Logo">
</a>
<!-- <img class="navbar-brand logo " href="index.html" src="https://static.igem.wiki/teams/5459/logo.png" > -->
<button class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navcol-1"><span
class="visually-hidden">Toggle navigation</span><span
class="navbar-toggler-icon"></span></button>
<div id="navcol-1" class="collapse navbar-collapse">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link active" href="index.html">Home</a>
</li>
<li class="nav-item dropdown"><a class="dropdown-toggle nav-link" aria-expanded="false"
data-bs-toggle="dropdown" href>Project</a>
<div class="dropdown-menu"><a class="dropdown-item"
href="contribution.html">Contribution</a><a class="dropdown-item"
href="description.html">Description</a><a class="dropdown-item"
href="engineering.html">Engineering</a><a class="dropdown-item"
href="parts.html">Parts</a><a class="dropdown-item"
href="results.html">Results</a><a class="dropdown-item"
href="experiments.html">Experiments</a><a class="dropdown-item"
href="notebook.html">Notebook</a><a class="dropdown-item"
href="safety.html">Safety</a></div>
</li>
<li class="nav-item">
<a class="nav-link" href="human-practices.html">Human Practice</a>
</li>
<li class="nav-item">
<a class="nav-link" href="model.html">Model</a>
</li>
<li class="nav-item">
<a class="nav-link" href="design.html">Design</a>
</li>
<li class="nav-item dropdown">
<a class="dropdown-toggle nav-link" aria-expanded="false" data-bs-toggle="dropdown"
href="#">Team</a>
<div class="dropdown-menu">
<a class="dropdown-item" href="team.html">Members</a>
<a class="dropdown-item" href="attributions.html">Attributions</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="awards.html">Awards</a>
</li>
</ul>
</div>
</div>
</nav>
=======
<main class="page"><nav class="navbar navbar-expand-lg fixed-top bg-body clean-navbar">
<div class="container">
<a href="index.html" class="navbar-brand logo">
......@@ -95,7 +42,6 @@
</div>
</div>
</nav>
>>>>>>> d243c8a02a2a7150b7f5b93c073bbb23b1d5e635
<section class="clean-block clean-post dark">
<div class="container">
<div class="block-content">
......
safety.html
+ 1
− 1
View file @ a8846ab3
......@@ -190,7 +190,7 @@
<span id="s1" class="section-heading-upper h3"><br />Overview</span>
<iframe src="https://static.igem.wiki/teams/5459/wiki/safety/safety.pdf" width="100%"
<iframe src="https://static.igem.wiki/teams/5459/wiki/safety/safety.pdf#view=FitH" width="100%"
height="600px">
<p>Your browser doesn't support iframes. Please download the PDF to view it: <a
href="https://static.igem.wiki/teams/5459/wiki/safety/safety.pdf">Download PDF</a>.
......
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