Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nirav branch #1

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Nirav branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd8f649
made responsive
Mar 21, 2019
eee40dd
popup on correct position
Mar 21, 2019
69acb9d
removed popup for questions they are constantly displayed
Mar 21, 2019
4f9f06f
removed pycache and migrations files
Mar 21, 2019
ce83fdd
successfully removed all cache files
Mar 21, 2019
d8e4ad5
removed all cache files from all folders
Mar 21, 2019
7f429be
one file was remaining and removed
Mar 21, 2019
10b5242
trying to solve merge conflicts
Mar 22, 2019
8e34486
merge conflict solving
Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed bosm/__init__.py
View file
Open in desktop
Empty file.
Binary file removed db.sqlite3
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions static/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
av=[1,1,1,1,1] ; // availabilty of questions for each stadium 1:available 0:not available
=======
av=[1,1,1,1,1] ; // availabilty of questions for each Arena 1:available 0:not available
>>>>>>> master
left=[0.125,0.50,0.85]; // left constraint for popup visibility
right=[0.16,0.57,0.92]; // right constraint for popup visibility
// device detection
Expand Down
9 changes: 9 additions & 0 deletions static/main/style/newCss.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ canvas{ display: block; vertical-align: bottom; opacity: 1}
{
display: none;
}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> master

.rotate {
display: none;
Expand Down Expand Up @@ -105,3 +110,7 @@ canvas{ display: block; vertical-align: bottom; opacity: 1}
font-size: 100px;
}
}
<<<<<<< HEAD
=======
>>>>>>> upstream/master
>>>>>>> master
39 changes: 39 additions & 0 deletions templates/front.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,45 @@
<link rel="stylesheet" type="text/css" href="{% static 'main/style/newCss.css' %}">
<link href="https://fonts.googleapis.com/css?family=Allerta+Stencil" rel="stylesheet">

<<<<<<< HEAD
=======
<<<<<<< HEAD
<style>

.rotate {
display: none;
}

@media all and (orientation:portrait) {
.rotate {
height: 100vh;
display: block;
}
canvas {
display: none;
}
#particles-js {
display: none;
}
#title {
display: none;
}
img, a {
display: none;
}
}

@media screen and (max-width: 1050px) and (max-height: 800px) {
#title {
font-size: 100px;
}
}

</style>

=======
>>>>>>> upstream/master
>>>>>>> master
</head>
<body>

Expand Down