rushilwiz/tj2023
1
0
Fork 0
mirror of https://github.com/Rushilwiz/tj2023.git synced 2025-04-18 19:10:22 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge issues

Browse Source
This commit is contained in:
Praneeth Bhandaru 2020-10-20 15:12:16 -04:00
commit 1173bac59a
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
manage.py Executable file → Normal file
View File

21
pages/static/pages/css/styles.css
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
@import 'https://fonts.googleapis.com/css?family=Montserrat:300,400,500';
@import 'https://fonts.googleapis.com/css?family=Josefin+Slab:700';
@import 'https://fonts.googleapis.com/css?family=Arapey:400,600';
@ -864,3 +865,23 @@ hr {
}
/*# sourceMappingURL=css/index.css.map */
html {
overflow-x: hidden;
}
nav {
transform: translateY(-70px);
z-index: 10;
animation: nav-slide 0.75s ease-in-out forwards;
animation-delay: 1s;
}
@keyframes nav-slide {
0% {
transform: translateY(-70px);
}
100% {
transform: translateY(0px);
}
}