Commit bdfd4b54 authored by Daniel W Bond's avatar Daniel W Bond

redoing the merging

parent 8a6b7a91
......@@ -10,7 +10,7 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-2 col-md-offset-1 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_full_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_full_name_or_uname }} profile picture">
</div>
<div class="col-md-6 text-center">
......
......@@ -27,7 +27,7 @@
<div class="row">
{% for student in graduating_year.list %}
<div class="col-sm-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
{% if student.get_flag_count > 4 %}
<p><em>* a number of other floormates say this info is incorrect</em></p>
......
......@@ -47,7 +47,7 @@
<legend><a name="{{ letter.grouper }}" href="#{{ letter.grouper }}">{{ letter.grouper }}</a></legend>
<div class="row">
{% for major in letter.list %}
<div class="col-md-6 text-center">
<div class="col-md-6 minor-padding text-center">
<a href="{{ major.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">
{% if major.name|length > 39 %}
<small>{{ major.name }}</small></a>
......@@ -58,7 +58,6 @@
</div>
{% if forloop.counter|divisibleby:2 %}
</div>
<br />
<div class="row">
{% endif %}
{% endfor %}
......
......@@ -38,12 +38,11 @@
<div class="row">
{% for floor in floors %}
<div class="col-sm-3 text-center">
<div class="col-sm-3 minor-padding text-center">
<a href="{{ floor.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">{{ floor.number|ordinal }} Floor</a>
</div>
{% if forloop.counter|divisibleby:4 %}
</div>
<br />
<div class="row">
{% endif %}
{% endfor %}
......
......@@ -27,7 +27,7 @@
<div class="row">
{% for student in students %}
<div class="col-sm-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
<h5><em>{% include 'double_major.html' %}</em></h5>
<h5><a href="{{ student.room.get_absolute_url }}">{{ student.room }}</a></h5>
......
......@@ -28,7 +28,7 @@
<div class="row">
{% for student in students %}
<div class="col-sm-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
<h5><em>{% include 'double_major.html' %}</em></h5>
{% if student.get_flag_count > 4 %}
......
......@@ -34,19 +34,28 @@
</div>
</div>
<div class="row">
<div class="col-md-10 col-md-offset-1 text-center">
<h3>
&middot;
{% for neighbourhood in buildings_by_neighbourhood %}
<a href="#{{ neighbourhood }}">{{ neighbourhood }}</a> &middot;
{% endfor %}
</div>
</div>
{% for neighbourhood, buildings in buildings_by_neighbourhood.items %}
<legend><strong><a name="{{ neighbourhood }}" href="#{{ neighbourhood }}">{{ neighbourhood }}</a></strong></legend>
<div class="row">
{% for building in buildings %}
<div class="col-sm-3 text-center">
<div class="col-md-3 col-sm-6 text-center minor-padding">
<a href="{{ building.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">
{{ building.name }}
</a>
</div>
{% if forloop.counter|divisibleby:4 %}
</div>
<br />
<div class="row">
{% endif %}
{% endfor %}
......
......@@ -30,7 +30,7 @@ a[name] {
height: 30px;
}
@media(max-width: 992px) {
@media (max-width: 992px) {
#footer {
text-align: center;
}
......@@ -38,7 +38,7 @@ a[name] {
/* in which we replicate bootstrap's pull-right implementation */
@media(min-width: 992px) {
@media (min-width: 992px) {
.footer-right {
float: right !important;
}
......@@ -71,6 +71,10 @@ a[name] {
}
.container-padding {
padding-top: 30px;
t}
.minor-padding {
padding-bottom: 24px;
}
#get-started {
border-radius: 10px;
......@@ -108,7 +112,6 @@ outline-offset: none;
margin-top: -5px;
}
.breadcrumb {background: rgba(245, 245, 245, 1); border: 2px solid rgba(245, 245, 245, 1); border-radius: 4px; display: block;}
.breadcrumb li {font-size: 20px;}
......@@ -121,9 +124,14 @@ outline-offset: none;
float: right;
}
.img-circle {
margin-right: 10px;
margin-left: -2px;
margin-top: -5px;
margin-bottom: -5px;
.navbar-profile {
display: block;
float: left;
margin-top: -2px;
padding-right: 8px;
}
.profile-image {
max-width: 175px;
max-height: 175px;
}
......@@ -33,7 +33,7 @@ Back
<div class="row">
{% for student in roomies %}
<div class="col-sm-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture"></img>
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture"></img>
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
<h5><em>{% include 'double_major.html' %}</em></h5>
</div>
......@@ -56,7 +56,7 @@ Back
<div class="row">
{% for student in floories %}
<div class="col-md-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
<h5><em>{% include 'double_major.html' %}</em></h5>
<h5><a href="{{ student.room.get_absolute_url }}">{{ student.room }}</h5></a>
......@@ -88,7 +88,7 @@ Back
<div class="row">
{% for student in students %}
<div class="col-sm-3 col-xs-6 text-center">
<img class="img-circle img-responsive center center-block" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_first_name_or_uname }} profile picture">
<h4><a href="{{ student.get_absolute_url }}"><strong>{{ student.get_full_name_or_uname }}</strong></a></h4>
<h5>{{ student.graduating_year|bc }}</h5>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment