Skip to content

Commit

Permalink
Integrated front end CSS/html/images
Browse files Browse the repository at this point in the history
  • Loading branch information
System Administrator authored and System Administrator committed Apr 16, 2016
1 parent a6df913 commit 25e3e79
Show file tree
Hide file tree
Showing 176 changed files with 11,897 additions and 2,309 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified ENV/.DS_Store
Binary file not shown.
Binary file renamed ENV/hackathon/quiz/static/quiz/.DS_Store → ENV/.idea/.DS_Store
100755 → 100644
Binary file not shown.
2 changes: 1 addition & 1 deletion ENV/.idea/ENV.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ENV/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

393 changes: 177 additions & 216 deletions ENV/.idea/workspace.xml

Large diffs are not rendered by default.

Binary file modified ENV/hackathon/.DS_Store
Binary file not shown.
Binary file modified ENV/hackathon/db.sqlite3
Binary file not shown.
Binary file modified ENV/hackathon/quiz/.DS_Store
Binary file not shown.
6 changes: 0 additions & 6 deletions ENV/hackathon/quiz/forms.py

This file was deleted.

12 changes: 4 additions & 8 deletions ENV/hackathon/quiz/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,27 @@

from django.forms import ModelForm

# Create your models here.

# Create your models here.
class Question(models.Model):
question_text = models.CharField(max_length=200)
pub_date = models.DateTimeField('date published')

def __str__(self):
return self.question_text


class Choice(models.Model):
question = models.ForeignKey(Question, on_delete=models.CASCADE)
choice_text = models.CharField(max_length=200)
correct_choice = models.BooleanField(default=0)

def __str__(self):
return self.choice_text

class Tip(models.Model):

class Tip(models.Model):
tip = models.CharField(max_length=200)
location = models.CharField(max_length=200)

def __str__(self):
return self.tip

class TipForm(ModelForm):
class Meta:
model = Tip
fields = ['tip', 'location']
Binary file modified ENV/hackathon/quiz/models.pyc
Binary file not shown.
Binary file modified ENV/hackathon/quiz/static/.DS_Store
100755 → 100644
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,36 @@ textarea {
box-shadow: 0px 0px 5px #ddd;
background-color: #fff;
margin-bottom: 50px;

}

/*iframe {
width: 1px;
min-width: 100%;
*width: 100%;
}*/

.accordion-container {
/*padding: 0px 20px;*/
}

.gradient {
height: 40px;
position: fixed;
bottom: 19px;
background-color: #fff;
z-index: 0;
display: block;
width: 100%;

/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#ffffff+0,ffffff+100&1+0,0+100;White+to+Transparent */
background: -moz-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 80%); /* FF3.6-15 */
background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 80%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 80%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#00ffffff',GradientType=0 ); /* IE6-9 */

}


.yellow-green {
color: #E0F13E;
Expand Down Expand Up @@ -221,17 +245,51 @@ ol {
header {
background-image: url('../img/healthstarter.jpg');
background-size: 120% auto;
background-position: 100% 70%;

/*min-height: 200px;*/
position: relative;

}

.accordion.open {
border-bottom: 3px solid #eee;
}

.warning ul {
color: #fff;
}

.link-container {
margin: 1px;
}

.button-link {
border-radius: 5px;
border: 2px solid #FD2D52;
color: #FD2D52;
padding: 10px 10px;
margin: 10px auto;
text-align: center;

}

.warning {
background-color: #FD2D52;
color: #fff;
}

.warning > * {
color: #fff
}

.site-desc {
background-color: #fff;
color: #4A4A4A;
width: 100%;
margin: 0px;
padding: 2px 0px;
border-bottom: 2px solid #f3f3f3;
}

.site-desc p {
Expand All @@ -246,6 +304,14 @@ header {
height: 20px;
}

p.progresstext {
color: #888;
margin: 0px;
position: relative;
top: -20px;
height: 0px
}

.progress {
width: 1%;
background-color: #FD2D52;
Expand Down Expand Up @@ -307,6 +373,14 @@ em {
footer {
text-align: center;
font-size: 0.8em;
margin-bottom: 50px;
}

div.form-container {
background-color: #eee;
padding-top: 30px;
margin-top: 20px;
padding-bottom: 20px;
}


Expand Down
File renamed without changes.
Binary file not shown.
Binary file not shown.
188 changes: 188 additions & 0 deletions ENV/hackathon/quiz/static/fonts/Akkurat Bold/readme.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="refresh" content="5;url=http://fontsgeek.com?ref=readme">
<title>Fontsgeek</title>
<style>
/* -------------------------------------
GLOBAL
------------------------------------- */
* {
margin:0;
padding:0;
font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
font-size: 100%;
line-height: 1.6;
}

img {
max-width: 100%;
}

body {
-webkit-font-smoothing:antialiased;
-webkit-text-size-adjust:none;
width: 100%!important;
height: 100%;
background:#DDD;
}


/* -------------------------------------
ELEMENTS
------------------------------------- */
a {
color: #348eda;
}

.btn-primary, .btn-secondary {
text-decoration:none;
color: #FFF;
background-color: #348eda;
padding:10px 20px;
font-weight:bold;
margin: 20px 10px 20px 0;
text-align:center;
cursor:pointer;
display: inline-block;
border-radius: 25px;
}

.btn-secondary{
background: #aaa;
}

.last {
margin-bottom: 0;
}

.first{
margin-top: 0;
}


/* -------------------------------------
BODY
------------------------------------- */
table.body-wrap {
width: 100%;
padding: 20px;
}

table.body-wrap .container{
border: 1px solid #f0f0f0;
}


/* -------------------------------------
FOOTER
------------------------------------- */
table.footer-wrap {
width: 100%;
clear:both!important;
}

.footer-wrap .container p {
font-size:12px;
color:#666;

}

table.footer-wrap a{
color: #999;
}


/* -------------------------------------
TYPOGRAPHY
------------------------------------- */
h1,h2,h3{
font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; line-height: 1.1; margin-bottom:15px; color:#000;
margin: 40px 0 10px;
line-height: 1.2;
font-weight:200;
}

h1 {
font-size: 36px;
}
h2 {
font-size: 28px;
}
h3 {
font-size: 22px;
}

p, ul {
margin-bottom: 10px;
font-weight: normal;
font-size:14px;
}

ul li {
margin-left:5px;
list-style-position: inside;
}

/* ---------------------------------------------------
RESPONSIVENESS
Nuke it from orbit. It's the only way to be sure.
------------------------------------------------------ */

/* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
.container {
display:block!important;
max-width:600px!important;
margin:0 auto!important; /* makes it centered */
clear:both!important;
}

/* This should also be a block element, so that it will fill 100% of the .container */
.content {
padding:20px;
max-width:600px;
margin:0 auto;
display:block;
}

/* Let's make sure tables in the content area are 100% wide */
.content table {
width: 100%;
}

</style>
</head>

<body bgcolor="#f6f6f6">

<!-- body -->
<table class="body-wrap">
<tr>
<td></td>
<td class="container" bgcolor="#FFFFFF">

<!-- content -->
<div class="content">
<table>
<tr>
<td>
<h1>Downloaded from Fontsgeek.com</h1>
<p>This font was downloaded from <a href="http://fontsgeek.com?ref=readme">fontsgeek.com</a> . You can visit <a href="http://fontsgeek.com?ref=readme">fontsgeek.com</a> for thousands of free fonts.</p>
<p><a href="http://fontsgeek.com?ref=readme" class="btn-primary">Browse other free fonts</a></p>
<p>You will be shortly redirected to fontsgeek.</p>
</td>
</tr>
</table>
</div>
<!-- /content -->

</td>
<td></td>
</tr>
</table>
<!-- /body -->

</body>
</html>
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 25e3e79

Please sign in to comment.