Skip to content

Add standard icon spacing for all icons #65

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

Closed
sman591 wants to merge 1 commit into from
Closed

Add standard icon spacing for all icons #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion conditional/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% endblock %}
{% else %}
<div class="container main">
<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-remove-sign"></span> Site Lockdown: Evaluations in progress. Please check back later.</div>
<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-remove-sign icon-space-r"></span> Site Lockdown: Evaluations in progress. Please check back later.</div>
</div>
{% endif %}

Expand Down
64 changes: 32 additions & 32 deletions conditional/templates/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ <h5 class="email">{{username}}@csh.rit.edu</h5>
<div class="panel-heading">
<h3 class="panel-title">Freshman Evaluations
{% if freshman['status'] == "Passed" %}
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> Passed</span>
{% elif freshman['status'] == "Pending" %}
<span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
<span class="pull-right"><span class="glyphicon glyphicon-hourglass icon-space-r yellow"></span> Pending</span>
{% else %}
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> Failed</span>
{% endif %}
</h3>
</div>
Expand All @@ -53,38 +53,38 @@ <h3 class="panel-title">Freshman Evaluations
<td class="title">Signatures Missed</td>
<td><span class="pull-right">
{% if freshman['sig_missed'] == 0 %}
<span class="glyphicon glyphicon-ok-sign green"></span> None {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> {{freshman['sig_missed']}} {% endif %}
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> None {% else %}
<span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> {{freshman['sig_missed']}} {% endif %}
</span>
</td>
</tr>
<tr>
<td class="title">Directorship Meetings</td>
<td><span class="pull-right">
{% if freshman['committee_meetings'] >= 10 %}
<span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{freshman['committee_meetings']}} / 10
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> {% else %}
<span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> {% endif %} {{freshman['committee_meetings']}} / 10
</span>
</td>
</tr>
<tr>
<td class="title">House Meetings Missed</td>
<td><span class="pull-right">
{% if freshman['hm_missed'] == 0 %}
<span class="glyphicon glyphicon-ok-sign green"></span> None {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> {{ freshman['hm_missed'] }} {% endif %}
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> None {% else %}
<span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> {{ freshman['hm_missed'] }} {% endif %}
</span>
</td>
</tr>
<tr>
<td class="title">Freshman Project</td>
<td>
{% if freshman['fresh_proj'] == "Passed" %}
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> Passed</span>
{% elif freshman['fresh_proj'] == "Pending" %}
<span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
<span class="pull-right"><span class="glyphicon glyphicon-hourglass icon-space-r yellow"></span> Pending</span>
{% else %}
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> Failed</span>
{% endif %}
</td>
</tr>
Expand Down Expand Up @@ -113,11 +113,11 @@ <h3 class="panel-title">Freshman Evaluations
<div class="panel-heading">
<h3 class="panel-title">Membership Evaluations
{% if spring['status'] == "Passed" %}
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
<span class="pull-right"><span class="glyphicon glyphicon-ok-sign icon-space-r green"></span>Passed</span>
{% elif spring['status'] == "Failed" %}
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
<span class="pull-right"><span class="glyphicon glyphicon-remove-sign icon-space-r red"></span>Failed</span>
{% else %}
<span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
<span class="pull-right"><span class="glyphicon glyphicon-hourglass icon-space-r yellow"></span>Pending</span>
{% endif %}
</h3>
</div>
Expand All @@ -128,16 +128,16 @@ <h3 class="panel-title">Membership Evaluations
<td class="title">Directorship Meetings</td>
<td><span class="pull-right">
{% if spring['committee_meetings'] >= 25 %}
<span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> {% endif %} {{ spring['committee_meetings'] }} / 25</span>
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> {% else %}
<span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> {% endif %} {{ spring['committee_meetings'] }} / 25</span>
</td>
</tr>
<tr>
<td class="title">House Meetings Missed</td>
<td><span class="pull-right">
{% if spring['hm_missed'] == 0 %}
<span class="glyphicon glyphicon-ok-sign green"></span> None {% else %}
<span><span class="glyphicon glyphicon-remove-sign red"></span> {{spring['hm_missed']}}</span>
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> None {% else %}
<span><span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> {{spring['hm_missed']}}</span>
{% endif %}
</span>
</td>
Expand All @@ -147,9 +147,9 @@ <h3 class="panel-title">Membership Evaluations
<td>
<span class="pull-right">
{% if spring['mp_status'] == "Passed" %}
<span class="glyphicon glyphicon-ok-sign green"></span> Passed {% elif spring['mp_status'] == "Pending" %}
<span class="glyphicon glyphicon-hourglass yellow"></span> Pending {% else %}
<span class="glyphicon glyphicon-remove-sign red"></span> None {% endif %}
<span class="glyphicon glyphicon-ok-sign icon-space-r green"></span> Passed {% elif spring['mp_status'] == "Pending" %}
<span class="glyphicon glyphicon-hourglass icon-space-r yellow"></span> Pending {% else %}
<span class="glyphicon glyphicon-remove-sign icon-space-r red"></span> None {% endif %}
</span>
</td>
</tr>
Expand Down Expand Up @@ -180,9 +180,9 @@ <h3 class="panel-title">Conditionals</h3>
<td>{{c['description']}}</td>
<td>
{% if c['status'] == "Passed" %}
<span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-ok-sign green"></span> {% elif c['status'] == "Pending" %}
<span class="glyphicon glyphicon-hourglass yellow"></span> <span class="mobile-hide">Pending</span> {% else %}
<span class="glyphicon glyphicon-minus-sign red"></span> <span class="mobile-hide">Failed</span> {% endif %}
<span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-ok-sign icon-space-r green"></span> {% elif c['status'] == "Pending" %}
<span class="glyphicon glyphicon-hourglass icon-space-r yellow"></span> <span class="mobile-hide">Pending</span> {% else %}
<span class="glyphicon glyphicon-minus-sign icon-space-r red"></span> <span class="mobile-hide">Failed</span> {% endif %}
</td>
</tr>
{% endfor %}
Expand All @@ -195,7 +195,7 @@ <h3 class="panel-title">Conditionals</h3>
{% endif %}

{% if major_projects_count == 0 %}
<div class="alert alert-warning" role="alert"> <span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"> </span> You have no major projects.</div>
<div class="alert alert-warning" role="alert"> <span class="glyphicon glyphicon-exclamation-sign icon-space-r white"> </span> You have no major projects.</div>
{% else %}
<div class="panel panel-default">
<div class="panel-heading">
Expand All @@ -205,13 +205,13 @@ <h3 class="panel-title">Major Projects</h3>
{% for p in major_projects %}
<tr>
{% if p['status'] == "Passed" %}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-ok-sign green"></span> {{p['name']}}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-ok-sign icon-space-r green"></span> {{p['name']}}
</span>
{% elif p['status'] == "Pending" %}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-hourglass yellow"></span> {{p['name']}}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-hourglass icon-space-r yellow"></span> {{p['name']}}
</span>
{% else %}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-minus-sign red"></span> {{p['name']}}
<span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-minus-sign icon-space-r red"></span> {{p['name']}}
</span>
{% endif %}
<div class="panel-body" style="word-wrap:break-word">{{p['description']}}</div>
Expand All @@ -229,7 +229,7 @@ <h3 class="panel-title">Major Projects</h3>
<h3 class="panel-title">Housing Status</h3>
</div>
<div class="panel-body table-fill">

<table class="table table-striped table-responsive no-bottom-margin">
<tbody>
<tr>
Expand All @@ -252,7 +252,7 @@ <h3 class="panel-title">Housing Status</h3>

{% if hm_attendance_len == 0 %}
<div class="alert alert-success">
<span class="glyphicon glyphicon-ok-sign white" style="padding-right:5px"> </span> You haven't missed any house meetings.
<span class="glyphicon glyphicon-ok-sign icon-space-r white"> </span> You haven't missed any house meetings.
</div>
{% else %}
<div class="panel panel-default">
Expand All @@ -279,7 +279,7 @@ <h3 class="panel-title">Missed House Meetings</h3>
{% endif %}

{% if cm_attendance_len == 0 %}
<div class="alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"></span> You have not attended any directorship meetings.</div>
<div class="alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign icon-space-r white"></span> You have not attended any directorship meetings.</div>
{% else %}
<div class="panel panel-default">
<div class="panel-heading">
Expand Down
10 changes: 5 additions & 5 deletions conditional/templates/intro_evals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
{% elif m['signatures_missed'] > 0 %}
<div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
{% else %}
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Packet in Progress</div>
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass icon-space-r white"></span> Packet in Progress</div>
{% endif %}
</div>
<div class="text-center">
Expand All @@ -49,11 +49,11 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
</div>
<div class="text-center">
{% if m['freshman_project'] == "Pending" %}
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Project Results Pending</div>
<div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass icon-space-r white"></span> Project Results Pending</div>
{% elif m['freshman_project'] == "Passed" %}
<div class="eval-info-label success">Freshman Project: <span class="glyphicon glyphicon-ok-sign white"></span></div>
<div class="eval-info-label success">Freshman Project: <span class="glyphicon glyphicon-ok-sign icon-space-l white"></span></div>
{% else %}
<div class="eval-info-label danger">Freshman Project: <span class="glyphicon glyphicon-remove-sign white"></span></div>
<div class="eval-info-label danger">Freshman Project: <span class="glyphicon glyphicon-remove-sign icon-space-l white"></span></div>
{% endif %}

</div>
Expand Down Expand Up @@ -128,7 +128,7 @@ <h4>Other Comments</h4>
</div>
{% endfor %}
{% else %}
<div class="alert alert-info" role="alert"><span class="glyphicon glyphicon-info-sign white" style="padding-right:5px"></span> There are currently no active intro members.</div>
<div class="alert alert-info" role="alert"><span class="glyphicon glyphicon-info-sign icon-space-r white"></span> There are currently no active intro members.</div>
{% endif %}
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion conditional/templates/intro_evals_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h3>Introductory Evaluations Form</h3>
<input class= "btn btn-raised btn-primary" style="width:100%;" type="submit" value="Submit Introductory Evaluation">
</form>
{% else %}
<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-remove-sign"></span> The submission period for this form has ended.</div>
<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-remove-sign icon-space-r"></span> The submission period for this form has ended.</div>
{% endif %}
</div>
{% endblock %}
Loading