Commit 1e3d22ef authored by Zosman's avatar Zosman
Browse files

Merge branch 'master' into issue69

parents 05b6cb0f fa55a37e
......@@ -13,4 +13,4 @@ venv
/go/go/migrations
.coverage
htmlcov/
.idea
{% load go_extras %} {% load qr_tags %}
<style>
a.share:link {
color: #000000;
}
a.share:visited {
color: #000000;
}
a.share:hover {
color: #000000;
}
a.share {
text-decoration: none;
}
a.button:link {
color: #FFF;
}
a.button:visited {
color: #FFF;
}
a.button:hover {
color: #FFF;
}
legend {
font-size: inherit;
}
pre {
font-family: inherit;
}
</style>
<link rel="stylesheet" type="text/css" href="../../style-link-box.css">
<div class="container">
<div class="col-md-8">
......@@ -75,8 +39,7 @@
<a class="button btn btn-danger btn-sm fa" data-target="#deletionModal" data-toggle="modal">
<i class="fa fa-trash-o fa-lg"></i> Delete
</a>
<!-- <a class="button btn btn-danger btn-sm fa" href="{{domain}}delete/{{url.short}}">
<i class="fa fa-trash-o fa-lg"></i> Delete</a> -->
<a tabindex="0" class="button btn btn-info btn-sm fa" role="button" data-toggle="popover" title="Not Implemented Quite Yet :(" data-content="We are working on adding this feature in a future
release of Go. If you'd like to check that progress or potentially
......@@ -139,6 +102,8 @@
</pre>
{% endwith %}
{% endwith %}
<br></br>
</div>
</div>
</div>
......
......@@ -10,9 +10,6 @@ a.button:hover {color:#FFF;}
legend {
font-size: inherit;
}
pre {
font-family: inherit;
}
#button-container {
padding-bottom: 4px;
......@@ -35,6 +32,10 @@ pre {
font-size: 14px;
}
#link:visited {
color: #006633;
}
#link-container {
width: 400px;
}
......
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