Skip to content
Snippets Groups Projects
Commit 2176c3ff authored by Aadityanshu Abhinav's avatar Aadityanshu Abhinav
Browse files

Merge branch 'main' into 'Aadityanshu' 

# Conflicts:
#   static/style.css
#   wiki/layout.html
parents 332d9bcb a18e7ad4
No related branches found
No related tags found
3 merge requests!34Update 2 files,!28Updated team.html, style.css and layout.html,!27"Update team.html"
Expand all Hide whitespace changes
Inline Side-by-side
static/bootstrap.bundle.min.js.map 0 → 100644
+ 1
− 0
View file @ 2176c3ff
Source diff could not be displayed: it is too large. Options to address this: view the blob.
static/style.css
+ 651
− 1209
View file @ 2176c3ff
This diff is collapsed.
wiki/layout.html
+ 0
− 27
View file @ 2176c3ff
......@@ -15,39 +15,12 @@
<link href="{{ url_for('static', filename = 'style.css') }}" rel="stylesheet"/>
<link href="https://fonts.cdnfonts.com/css/futura-pt" rel="stylesheet">
<!-- Some fonts for team page -->
<link rel="stylesheet" href="https://fonts.googleapis.com/earlyaccess/nicomoji.css">
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<script
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"
></script>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"
></script>
<title>{% block title %}{% endblock %} | IIT-Madras - iGEM 2023</title>
</head>
<body>
<!-- Navigation -->
{% include 'menu.html' %}
<!-- Header -->
<!--<header class="bg-hero py-5 mb-5">
<div class="container h-100">
<div class="row h-100 align-items-center">
<div class="col-lg-12">
<h1 class="display-4 text-white mt-5 mb-2">{{ self.title() }}</h1>
<p class="lead mb-5 text-white-50">{% block lead %}{% endblock %}</p>
</div>
</div>
</div>
</header> -->
<!-- Page Content -->
{% block page_content %}{% endblock %}
......
wiki/menu.html
+ 41
− 37
View file @ 2176c3ff
......@@ -4,69 +4,73 @@
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse justify-content-center" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/">Home</a>
<div class="collapse navbar-collapse justify-content-center text-white" id="navbarNav">
<ul class="navbar-nav text-white">
<li class="nav-item active text-white">
<a class="nav-link text-white" href="{{ url_for('pages', page = '/') }}">Home</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="projectsDropdown" role="button"
<li class="nav-item dropdown text-white">
<a class="nav-link dropdown-toggle text-white" href="#" id="projectsDropdown" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Projects
</a>
<div class="dropdown-menu" aria-labelledby="projectsDropdown">
<a class="dropdown-item" href="/description">Description</a>
<a class="dropdown-item" href="/contribution">Contributions</a>
<a class="dropdown-item" href="/notebook">Notebook</a>
<a class="dropdown-item" href="/engineering">Engineering Success</a>
<a class="dropdown-item" href="/safety">Safety</a>
<a class="dropdown-item" href="/results">Results</a>
<div class="dropdown-menu bg-dark text-white" aria-labelledby="projectsDropdown">
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/description') }}">Description</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/contribution') }}">Contributions</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/notebook') }}">Notebook</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/engineering') }}">Engineering Success</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/safety') }}">Safety</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/results') }}">Results</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="wetLabDropdown" role="button" data-bs-toggle="dropdown"
<li class="nav-item dropdown text-white">
<a class="nav-link dropdown-toggle text-white" href="#" id="wetLabDropdown" role="button" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Wet lab
</a>
<div class="dropdown-menu" aria-labelledby="wetLabDropdown">
<a class="dropdown-item" href="/experiments">Experiments</a>
<a class="dropdown-item" href="/measurement">Measurements</a>
<div class="dropdown-menu bg-dark text-white" aria-labelledby="wetLabDropdown">
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/experiments') }}">Experiments</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/measurement') }}">Measurements</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dryLabDropdown" role="button" data-bs-toggle="dropdown"
<li class="nav-item dropdown text-white">
<a class="nav-link dropdown-toggle text-white" href="#" id="dryLabDropdown" role="button" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Dry lab
</a>
<div class="dropdown-menu" aria-labelledby="dryLabDropdown">
<a class="dropdown-item" href="/experiments">Experiments</a>
<a class="dropdown-item" href="/measurement">Measurements</a>
<div class="dropdown-menu bg-dark text-white" aria-labelledby="dryLabDropdown">
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/model') }}">Modelling</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/software') }}">Software</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="humanPracticesDropdown" role="button"
<li class="nav-item dropdown text-white">
<a class="nav-link dropdown-toggle text-white" href="#" id="humanPracticesDropdown" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Human Practices
</a>
<div class="dropdown-menu" aria-labelledby="humanPracticesDropdown">
<a class="dropdown-item" href="/human-practices">Integrated Human
<div class="dropdown-menu bg-dark" aria-labelledby="humanPracticesDropdown">
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/human-practices') }}">Integrated Human
Practices</a>
<a class="dropdown-item" href="/inclusivity">Inclusivity</a>
<a class="dropdown-item" href="/education">Public Engagement &
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/inclusivity') }}">Inclusivity</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/education') }}">Public Engagement &
Education</a>
<a class="dropdown-item" href="/entrepreneurship">Entrepreneurship</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/entrepreneurship') }}">Entrepreneurship</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="/team">Team</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/safety">Safety</a>
<li class="nav-item dropdown text-white">
<a class="nav-link dropdown-toggle text-white" href="#" id="teamDropdown" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Team
</a>
<div class="dropdown-menu bg-dark" aria-labelledby="teamDropdown">
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/team') }}">Members</a>
<a class="dropdown-item text-white" href="{{ url_for('pages', page = '/attributions') }}">Attributions</a>
</div>
</li>
</ul>
</div>
<div class="logo">
<a href="/"><img src="https://static.igem.wiki/teams/4931/wiki/igem-logo.png"
<div class="nav-logo">
<a href="{{ url_for('pages', page = '/') }}"><img src="https://static.igem.wiki/teams/4931/wiki/igem-logo.png"
alt="iGem IITM" /></a>
</div>
</nav>
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