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

Fixed Merge Issues

Browse Source
This commit is contained in:
Praneeth Bhandaru 2020-10-21 15:54:45 -04:00
commit 4c9de79ca9
5 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/models.py
View File

@ -3,12 +3,15 @@ from django.db import models
# Create your models here.
class Story(models.Model):
header = models.CharField(max_length=30)
header = models.CharField(max_length=50)
img_name = models.CharField(max_length=50, default=None, null=True)
body = models.TextField(max_length=200)
created = models.DateTimeField(auto_now=True)
def __str__(self):
return self.header
class Bar(models.Model):
name = models.CharField(max_length=50)
money_raised = models.FloatField()
money_raised = models.FloatField()\

BIN
pages/static/pages/css/img/stern.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
pages/static/pages/css/img/wickliff.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

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

@ -21,7 +21,9 @@ html {
.photo {
width: 300px;
height: 300px;
margin: 15px;
object-fit: cover;
border-radius: 10px;
box-shadow: 12px 12px rgb(0, 0, 0, 0.1), -12px -12px rgb(0, 0, 0, 0.3);
}

46
pages/templates/pages/council.html
View File

@ -18,16 +18,6 @@
<div class="council">
<h2 class="text-center">Our Team</h2>
<div class="row">
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/chinmay.png' %}" class="photo">
<div class="details">
<h3><b>The Vice President</b></h3>
<p><a>Praneeth Chinmay Bhandaru</a></p>
<i>“You don't need to be a potato to be good in life, all you need to do is trust yourself.”</i>
</div>
</div>
</div>
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/vinay.png' %}" class="photo">
@ -39,6 +29,16 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/chinmay.png' %}" class="photo">
<div class="details">
<h3><b>The Vice President</b></h3>
<p><a>Praneeth Chinmay Bhandaru</a></p>
<i>“You don't need to be a potato to be good in life, all you need to do is trust yourself.”</i>
</div>
</div>
</div>
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/grace.png' %}" class="photo">
@ -66,7 +66,7 @@
<div class="person">
<img src="{% static 'pages/css/img/rushil.png' %}" class="photo">
<div class="details">
<h3><b>Senator</b></h3>
<h3><b>The Senator</b></h3>
<p><a>Rushil Umaretiya </a></p>
<i>“Just failed his chem test, again.”</i>
</div>
@ -76,7 +76,7 @@
<div class="person">
<img src="{% static 'pages/css/img/yulee.png' %}" class="photo">
<div class="details">
<h3><b>Senator</b></h3>
<h3><b>The Senator</b></h3>
<p><a>Yulee Kang</a></p>
<i>“Is a Cutie :)”</i>
@ -85,7 +85,7 @@
</div>
</div>
<div class="row">
<div class="col-md-4 offset-md-4">
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/katelyn.png' %}" class="photo">
<div class="details">
@ -95,6 +95,26 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/stern.jpg' %}" class="photo">
<div class="details">
<h3><b>The Sponsor</b></h3>
<p><a>Mx. Stern</a></p>
<i></i>
</div>
</div>
</div>
<div class="col-md-4">
<div class="person">
<img src="{% static 'pages/css/img/wickliff.jpg' %}" class="photo">
<div class="details">
<h3><b>The Sponsor</b></h3>
<p><a>Mr. Wickliff</a></p>
<i></i>
</div>
</div>
</div>
</div>
</div>