Commit 6eef3dbb authored by David Haynes's avatar David Haynes 🙆
Browse files

Merge branch '76-fix-fonts' into '2.2-dev'

Resolve "CSRF and CSRF-Like Protection"

See merge request !91
parents e76be935 913f55b8
Pipeline #1292 passed with stage
in 1 minute and 39 seconds
...@@ -7,17 +7,20 @@ ...@@ -7,17 +7,20 @@
<!-- define the content block for the page --> <!-- define the content block for the page -->
{% block content %} {% block content %}
<!-- Tell Django to load static files -->
{% load staticfiles %}
<!-- define the page header div --> <!-- define the page header div -->
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-balance-scale fa-stack-1x fa-inverse"></i> <i class="fa fa-balance-scale fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Moderation Panel</i> Moderation Panel
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
...@@ -309,8 +312,7 @@ ...@@ -309,8 +312,7 @@
</form> </form>
</div> </div>
</div> </div>
<script src="../../static/js/useradmin.js">
</script> <script src="{% static "js/useradmin.js" %}"></script>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -10,13 +10,13 @@ SRCT Go &bull; Account Blocked ...@@ -10,13 +10,13 @@ SRCT Go &bull; Account Blocked
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-ban fa-stack-1x fa-inverse"></i> <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Account Is Blocked</i> Account Is Blocked
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
...@@ -32,10 +32,11 @@ SRCT Go &bull; Account Blocked ...@@ -32,10 +32,11 @@ SRCT Go &bull; Account Blocked
<p> <p>
If you believe this is an error, please contact the <a href="mailto:srct@gmu.edu">Go Admins</a> If you believe this is an error, please contact the <a href="mailto:srct@gmu.edu">Go Admins</a>
<br /> <br />
<br/> <br />
Thank you, and have a nice day! Thank you, and have a nice day!
</p> </p>
<br/><br/> <br />
<br />
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
...@@ -13,13 +13,13 @@ SRCT Go &bull; About ...@@ -13,13 +13,13 @@ SRCT Go &bull; About
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-question fa-stack-1x fa-inverse"></i> <i class="fa fa-question fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">About</i> About
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
...@@ -27,7 +27,7 @@ SRCT Go &bull; About ...@@ -27,7 +27,7 @@ SRCT Go &bull; About
<!-- define the terms of use div --> <!-- define the terms of use div -->
<div class="row" id="terms"> <div class="row" id="terms">
<div class="col-md-12"> <div class="col-md-12">
<h4><i class="fa">Terms of Use</i></h4> <h4>Terms of Use</h4>
<legend></legend> <legend></legend>
<p> <p>
By using Go you acknowledge that you are a current George Mason Student or faculty member. By using Go you acknowledge that you are a current George Mason Student or faculty member.
...@@ -53,7 +53,7 @@ SRCT Go &bull; About ...@@ -53,7 +53,7 @@ SRCT Go &bull; About
<!-- define the who made go? div --> <!-- define the who made go? div -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h4><i class="fa">Who made Go?</i></h4> <h4>Who made Go?</h4>
<legend></legend> <legend></legend>
<p> <p>
Members of the Members of the
...@@ -77,7 +77,7 @@ SRCT Go &bull; About ...@@ -77,7 +77,7 @@ SRCT Go &bull; About
<!-- define the thanks! div --> <!-- define the thanks! div -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h4><i class="fa">Thanks</i></h4> <h4>Thanks</h4>
<legend></legend> <legend></legend>
<p> <p>
This project was made possible through the collective contributions of multiple Mason SRCT members. This project was made possible through the collective contributions of multiple Mason SRCT members.
......
...@@ -19,13 +19,13 @@ SRCT Go &bull; Edit Link ...@@ -19,13 +19,13 @@ SRCT Go &bull; Edit Link
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-wrench fa-stack-1x fa-inverse"></i> <i class="fa fa-wrench fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Edit Link</i> Edit Link
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -13,13 +13,13 @@ SRCT Go &bull; My Links ...@@ -13,13 +13,13 @@ SRCT Go &bull; My Links
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-link fa-stack-1x fa-inverse"></i> <i class="fa fa-link fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">My Links</i> My Links
</strong></h1> </h1>
</div> </div>
</div> </div>
<div class="newlink" style="text-align: right;"> <div class="newlink" style="text-align: right;">
......
...@@ -19,13 +19,13 @@ SRCT Go &bull; New Link ...@@ -19,13 +19,13 @@ SRCT Go &bull; New Link
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-link fa-stack-1x fa-inverse"></i> <i class="fa fa-link fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Shorten URL</i> Shorten URL
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -16,13 +16,13 @@ SRCT Go &bull; Apply ...@@ -16,13 +16,13 @@ SRCT Go &bull; Apply
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-user-plus fa-stack-1x fa-inverse"></i> <i class="fa fa-user-plus fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Apply to Go</i> Apply to Go
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
<!-- Load in global CSS --> <!-- Load in global CSS -->
<link href="https://fonts.googleapis.com/css?family=Carrois+Gothic" <link href="https://fonts.googleapis.com/css?family=Carrois+Gothic"
rel="stylesheet" type="text/css"> rel="stylesheet" type="text/css">
<link <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
rel="stylesheet">
<link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" /> <link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" />
<link rel="stylesheet" href="{% static "css/styles.css" %}" /> <link rel="stylesheet" href="{% static "css/styles.css" %}" />
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</button> </button>
<!-- Go brand logo --> <!-- Go brand logo -->
<a class="navbar-brand" href="{% url 'index' %}"> <a class="navbar-brand" href="{% url 'index' %}">
<i class="fa fa-link"> Go</i> <i class="fa fa-link"></i> Go
</a> </a>
</div> </div>
......
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
<br></br> <br></br>
<!-- Delete Button --> <!-- Delete Button -->
<a class="button btn btn-danger btn-sm fa" data-target="#deletionModal-{{url.short}}" data-toggle="modal"> <a class="button btn btn-danger btn-sm" data-target="#deletionModal-{{url.short}}" data-toggle="modal">
<i class="fa fa-trash-o fa-lg"></i> Delete <i class="fa fa-trash-o fa-lg"></i> Delete
</a> </a>
<!-- Edit Button --> <!-- Edit Button -->
<a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm fa"> <a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm">
<i class="fa fa-cog fa-lg"></i> Edit <i class="fa fa-cog fa-lg"></i> Edit
</a> </a>
......
...@@ -13,13 +13,13 @@ SRCT Go &bull; Account Not Approved ...@@ -13,13 +13,13 @@ SRCT Go &bull; Account Not Approved
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-ban fa-stack-1x fa-inverse"></i> <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Account Not Approved</i> Account Not Approved
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -27,7 +27,7 @@ SRCT Go &bull; Welcome ...@@ -27,7 +27,7 @@ SRCT Go &bull; Welcome
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><i class="fa"><i class="fa fa-link"></i> Go</i></h1> <h1><i class="fa fa-link"></i> Go</h1>
<p class="lead">University-branded URL shortening</p> <p class="lead">University-branded URL shortening</p>
</div> </div>
</div> </div>
...@@ -37,7 +37,7 @@ SRCT Go &bull; Welcome ...@@ -37,7 +37,7 @@ SRCT Go &bull; Welcome
<div class="row"> <div class="row">
<!-- what is go? --> <!-- what is go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3><i class="fa">What is Go?</i></h3> <h3>What is Go?</h3>
<legend></legend> <legend></legend>
<p> <p>
Go provides University-branded URL shortening for student organizations, Go provides University-branded URL shortening for student organizations,
...@@ -53,7 +53,7 @@ SRCT Go &bull; Welcome ...@@ -53,7 +53,7 @@ SRCT Go &bull; Welcome
<!-- why should I use Go? --> <!-- why should I use Go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3><i class="fa">Why should I use Go?</i></h3> <h3>Why should I use Go?</h3>
<legend></legend> <legend></legend>
<p>Go features:</p> <p>Go features:</p>
<ul class="fa-ul"> <ul class="fa-ul">
...@@ -78,7 +78,7 @@ SRCT Go &bull; Welcome ...@@ -78,7 +78,7 @@ SRCT Go &bull; Welcome
<!-- how do I access Go? --> <!-- how do I access Go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3><i class="fa">How do I access Go?</i></h3> <h3>How do I access Go?</h3>
<legend></legend> <legend></legend>
<p> <p>
In order to prevent abuse of the URL shortener, access to Go In order to prevent abuse of the URL shortener, access to Go
......
...@@ -13,13 +13,13 @@ SRCT Go &bull; Registration Email Sent ...@@ -13,13 +13,13 @@ SRCT Go &bull; Registration Email Sent
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-envelope-o fa-stack-1x fa-inverse"></i> <i class="fa fa-envelope-o fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Registration Email Sent</i> Registration Email Sent
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -13,13 +13,13 @@ SRCT Go &bull; Link View ...@@ -13,13 +13,13 @@ SRCT Go &bull; Link View
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><strong> <h1>
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-link fa-stack-1x fa-inverse"></i> <i class="fa fa-link fa-stack-1x fa-inverse"></i>
</span> </span>
<i class="fa">Link View</i> Link View
</strong></h1> </h1>
</div> </div>
</div> </div>
</div> </div>
......
html { html {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
font-family: -apple-system, BlinkMacSystemFont,
"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
"Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
} }
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
......
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