Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
desd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kj2-drupisz
desd
Commits
d9fad0e9
Commit
d9fad0e9
authored
1 year ago
by
Brody Wilton
Committed by
Brody Wilton
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Change layout
parent
75db36cc
No related branches found
No related tags found
1 merge request
!16
update requirements txt to include library for pdf creation, comment out...
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
myproject/myapp/templates/_base.html
+79
-55
79 additions, 55 deletions
myproject/myapp/templates/_base.html
myproject/myapp/templates/login.html
+1
-1
1 addition, 1 deletion
myproject/myapp/templates/login.html
with
80 additions
and
56 deletions
myproject/myapp/templates/_base.html
+
79
−
55
View file @
d9fad0e9
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
</head>
</head>
<body>
<body>
<nav
class=
"
bg-white
border-gray-200 dark:bg-gray-900"
>
<nav
class=
" border-gray-200 dark:bg-gray-900"
>
<div
<div
class=
"max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4"
class=
"max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4"
>
>
...
@@ -90,16 +90,14 @@
...
@@ -90,16 +90,14 @@
</nav>
</nav>
<div
class=
"container mx-auto mt-6"
>
<div
class=
"container mx-auto mt-6"
>
{% block content %} {% endblock content %}
{% block content %} {% endblock content %}
</div>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"
></script>
</body>
<footer
class=
"bg-white dark:bg-gray-900 w-full"
>
</div>
<!-- <footer class="bg-white dark:bg-gray-900 fixed bottom-0 w-full"> -->
<footer
class=
"bg- dark:bg-gray-900 bottom-0 w-full mt-6"
>
<div
class=
"mx-auto w-full max-w-screen-xl py-6 lg:py-8"
>
<div
class=
"mx-auto w-full max-w-screen-xl py-6 lg:py-8"
>
<div
class=
"md:flex md:justify-between"
>
<div
class=
"md:flex md:justify-between"
>
<div
class=
"mb-
6
md:mb-0"
>
<div
class=
"mb-
2
md:mb-0"
>
<img
src=
"https://upload.wikimedia.org/wikipedia/commons/1/11/UWE_Bristol_logo.svg"
class=
"me-4"
alt=
"UWE Logo"
/>
<img
src=
"https://upload.wikimedia.org/wikipedia/commons/1/11/UWE_Bristol_logo.svg"
class=
"
h-10
me-4"
alt=
"UWE Logo"
/>
</a>
</a>
</div>
</div>
<div
class=
"grid grid-cols-2 gap-5 sm:gap-6 sm:grid-cols-3"
>
<div
class=
"grid grid-cols-2 gap-5 sm:gap-6 sm:grid-cols-3"
>
...
@@ -129,22 +127,48 @@
...
@@ -129,22 +127,48 @@
<h2
class=
"mb-6 text-sm font-semibold text-gray-900 uppercase dark:text-white"
>
Legal
</h2>
<h2
class=
"mb-6 text-sm font-semibold text-gray-900 uppercase dark:text-white"
>
Legal
</h2>
<ul
class=
"text-gray-500 dark:text-gray-400 font-medium"
>
<ul
class=
"text-gray-500 dark:text-gray-400 font-medium"
>
<li
class=
"mb-4"
>
<li
class=
"mb-4"
>
<a
href=
"
{% url 'privacy_policy' %}
"
class=
"hover:underline"
>
Privacy Policy
</a>
<a
href=
"
#
"
class=
"hover:underline"
>
Privacy Policy
</a>
</li>
</li>
<li>
<li>
<a
href=
"
{% url 'terms_conditions' %}
"
class=
"hover:underline"
>
Terms
&
Conditions
</a>
<a
href=
"
#
"
class=
"hover:underline"
>
Terms
&
Conditions
</a>
</li>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<hr
class=
"my-6 border-gray-200 sm:mx-auto dark:border-gray-700 lg:my-8"
/>
<hr
class=
"my-6 border-gray-200 sm:mx-auto dark:border-gray-700 lg:my-8"
/>
<div
class=
"sm:flex sm:items-center sm:justify-between"
>
<div
class=
"sm:flex sm:items-center sm:justify-between"
>
<span
class=
"text-sm text-gray-500 sm:text-center dark:text-gray-400"
>
© 2024
<a
href=
"https://flowbite.com/"
class=
"hover:underline"
>
DESD Group 25
</a>
. All Rights Reserved.
<span
class=
"text-sm text-gray-500 sm:text-center dark:text-gray-400"
>
© 2024
<a
href=
"https://flowbite.com/"
class=
"hover:underline"
>
DESD Group 25
</a>
. All Rights Reserved.
</span>
</span>
<div
class=
"flex mt-4 sm:justify-center sm:mt-0"
>
{% comment %}
<a
href=
"#"
class=
"text-gray-500 hover:text-gray-900 dark:hover:text-white"
>
<svg
class=
"w-4 h-4"
aria-hidden=
"true"
xmlns=
"http://www.w3.org/2000/svg"
fill=
"currentColor"
viewBox=
"0 0 8 19"
>
<path
fill-rule=
"evenodd"
d=
"M6.135 3H8V0H6.135a4.147 4.147 0 0 0-4.142 4.142V6H0v3h2v9.938h3V9h2.021l.592-3H5V3.591A.6.6 0 0 1 5.592 3h.543Z"
clip-rule=
"evenodd"
/>
</svg>
{% endcomment %}
<span
class=
"sr-only"
>
Facebook page
</span>
</a>
{% comment %}
<a
href=
"#"
class=
"text-gray-500 hover:text-gray-900 dark:hover:text-white ms-5"
>
<svg
class=
"w-4 h-4"
aria-hidden=
"true"
xmlns=
"http://www.w3.org/2000/svg"
fill=
"currentColor"
viewBox=
"0 0 21 16"
>
<path
d=
"M16.942 1.556a16.3 16.3 0 0 0-4.126-1.3 12.04 12.04 0 0 0-.529 1.1 15.175 15.175 0 0 0-4.573 0 11.585 11.585 0 0 0-.535-1.1 16.274 16.274 0 0 0-4.129 1.3A17.392 17.392 0 0 0 .182 13.218a15.785 15.785 0 0 0 4.963 2.521c.41-.564.773-1.16 1.084-1.785a10.63 10.63 0 0 1-1.706-.83c.143-.106.283-.217.418-.33a11.664 11.664 0 0 0 10.118 0c.137.113.277.224.418.33-.544.328-1.116.606-1.71.832a12.52 12.52 0 0 0 1.084 1.785 16.46 16.46 0 0 0 5.064-2.595 17.286 17.286 0 0 0-2.973-11.59ZM6.678 10.813a1.941 1.941 0 0 1-1.8-2.045 1.93 1.93 0 0 1 1.8-2.047 1.919 1.919 0 0 1 1.8 2.047 1.93 1.93 0 0 1-1.8 2.045Zm6.644 0a1.94 1.94 0 0 1-1.8-2.045 1.93 1.93 0 0 1 1.8-2.047 1.918 1.918 0 0 1 1.8 2.047 1.93 1.93 0 0 1-1.8 2.045Z"
/>
</svg>
{% endcomment %}
<span
class=
"sr-only"
>
Discord
</span>
</a>
{% comment %}
<a
href=
"#"
class=
"text-gray-500 hover:text-gray-900 dark:hover:text-white ms-5"
>
<svg
class=
"w-4 h-4"
aria-hidden=
"true"
xmlns=
"http://www.w3.org/2000/svg"
fill=
"currentColor"
viewBox=
"0 0 20 17"
>
<path
fill-rule=
"evenodd"
d=
"M20 1.892a8.178 8.178 0 0 1-2.355.635 4.074 4.074 0 0 0 1.8-2.235 8.344 8.344 0 0 1-2.605.98A4.13 4.13 0 0 0 13.85 0a4.068 4.068 0 0 0-4.1 4.038 4 4 0 0 0 .105.919A11.705 11.705 0 0 1 1.4.734a4.006 4.006 0 0 0 1.268 5.392 4.165 4.165 0 0 1-1.859-.5v.05A4.057 4.057 0 0 0 4.1 9.635a4.19 4.19 0 0 1-1.856.07 4.108 4.108 0 0 0 3.831 2.807A8.36 8.36 0 0 1 0 14.184 11.732 11.732 0 0 0 6.291 16 11.502 11.502 0 0 0 17.964 4.5c0-.177 0-.35-.012-.523A8.143 8.143 0 0 0 20 1.892Z"
clip-rule=
"evenodd"
/>
</svg>
{% endcomment %}
<span
class=
"sr-only"
>
Twitter page
</span>
</a>
<a
href=
"#"
class=
"text-gray-500 hover:text-gray-900 dark:hover:text-white ms-5"
>
{% comment %}
<svg
class=
"w-4 h-4"
aria-hidden=
"true"
xmlns=
"http://www.w3.org/2000/svg"
fill=
"currentColor"
viewBox=
"0 0 20 20"
>
<path
fill-rule=
"evenodd"
d=
"M10 .333A9.911 9.911 0 0 0 6.866 19.65c.5.092.678-.215.678-.477 0-.237-.01-1.017-.014-1.845-2.757.6-3.338-1.169-3.338-1.169a2.627 2.627 0 0 0-1.1-1.451c-.9-.615.07-.6.07-.6a2.084 2.084 0 0 1 1.518 1.021 2.11 2.11 0 0 0 2.884.823c.044-.503.268-.973.63-1.325-2.2-.25-4.516-1.1-4.516-4.9A3.832 3.832 0 0 1 4.7 7.068a3.56 3.56 0 0 1 .095-2.623s.832-.266 2.726 1.016a9.409 9.409 0 0 1 4.962 0c1.89-1.282 2.717-1.016 2.717-1.016.366.83.402 1.768.1 2.623a3.827 3.827 0 0 1 1.02 2.659c0 3.807-2.319 4.644-4.525 4.889a2.366 2.366 0 0 1 .673 1.834c0 1.326-.012 2.394-.012 2.72 0 .263.18.572.681.475A9.911 9.911 0 0 0 10 .333Z"
clip-rule=
"evenodd"
/>
</svg>
{% endcomment %}
<span
class=
"sr-only"
>
GitHub account
</span>
</div>
</div>
</div>
</div>
</footer>
</footer>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"
></script>
</body>
</html>
</html>
This diff is collapsed.
Click to expand it.
myproject/myapp/templates/login.html
+
1
−
1
View file @
d9fad0e9
{% extends "_base.html"%}{% block content %}
{% extends "_base.html"%}{% block content %}
<section
class=
"my-10"
>
<section
class=
"my-10"
>
<div
class=
"flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0"
>
<div
class=
"flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0"
>
<div
class=
"w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md xl:p-0 dark:bg-gray-800 dark:border-gray-700"
>
<div
class=
"w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md
lg:w-50
xl:p-0 dark:bg-gray-800 dark:border-gray-700"
>
<div
class=
"p-6 space-y-4 md:space-y-6 sm:p-8"
>
<div
class=
"p-6 space-y-4 md:space-y-6 sm:p-8"
>
<h1
class=
"text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white"
>
<h1
class=
"text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white"
>
Sign in to your account
Sign in to your account
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment