ditch the Twitter Bootstrap app

The tags were cute, but I don't think we were getting much out of it, and I feel like the flexibility of owning our HTML may be useful for reasons yet to be disclosed.
zackmdavis · Mar 11, 2015 · cd28319 · cd28319
1 parent 6848565
commit cd28319
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,6 +1,5 @@
 bleach==1.4
 git+https://github.com/django/[email protected]#egg=Django
-django-bootstrap3==4.11.0
 django-debug-toolbar==1.3
 Markdown==2.4.1
 jasmine==2.0.1

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,5 @@
 bleach==1.4
 git+https://github.com/django/[email protected]#egg=Django
-django-bootstrap3==4.11.0
 Markdown==2.4.1
 dj-database-url==0.3.0
 dj-static==0.0.6

diff --git a/settings.py b/settings.py
@@ -37,7 +37,6 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'bootstrap3',
     'core',
 )
 

diff --git a/templates/base.html b/templates/base.html
@@ -1,10 +1,9 @@
 {% load i18n %}
-{% load bootstrap3 %}
 
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    {% bootstrap_css %}
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" media="screen" rel="stylesheet">
     <link href='http://fonts.googleapis.com/css?family=Italianno'
 	  rel='stylesheet' type='text/css'>
     <link href="/static/finetooth.css" rel="stylesheet">
@@ -42,7 +41,12 @@
       </div>
     </div>
 
-    {% bootstrap_messages %}
+    {% for message in messages %}
+      <div class="alert{% if message.tags %} alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %}{% endif %} alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
+        {{ message|safe }}
+      </div>
+    {% endfor %}
 
     <div class="container">
       <div class="col-md-9">

diff --git a/templates/includes/comment.html b/templates/includes/comment.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load bootstrap3 %}
 
 <div class="comment" id="comment-{{ comment.pk }}">
   <div class="byline">
@@ -12,11 +11,11 @@
   <p>
   <a href="javascript:void(0);" class="comment-tool reply-form-link"
      data-comment-pk="{{ comment.pk }}" data-post-pk="{{ post.pk }}">
-    {% bootstrap_icon 'pencil' %} Reply
+    <i class="glyphicon glyphicon-pencil"></i> Reply
   </a>
   &nbsp;&nbsp;
   <a href="#comment-{{ comment.pk }}" class="comment-tool">
-     {% bootstrap_icon 'pushpin' %} Permalink
+    <i class="glyphicon glyphicon-pushpin"></i> Permalink
   </a>
 </p>
 <div class="reply-form-holder" data-parent-pk="{{ comment.pk }}"></div>

diff --git a/templates/includes/post.html b/templates/includes/post.html
@@ -1,10 +1,9 @@
-{% load bootstrap3 %}
-
 <h3><a href="{% url 'show_post' post.year post.month post.slug %}">{{ post.title }}</a></h3>
 <div>by <a class="username" href="{% url 'show_profile' post.author %}">{{ post.author }}</a></div>
 <span class="score" data-pk="{{ post.slug }}" data-score="{{ post.score }}">
   <p>
-    {% bootstrap_icon 'time' %} <em>{{ post.published_at }} </em>
+    <i class="glyphicon glyphicon-time"></i>
+    <em>{{ post.published_at }} </em>
     <strong>score: {{ post.score }}</strong>
   </p>
 </span>
@@ -17,12 +16,14 @@ <h3><a href="{% url 'show_post' post.year post.month post.slug %}">{{ post.title
   <a class="btn btn-primary upvote"
      data-pk="{{ post.pk }}" data-kind="post"
      href="javascript:void(0)">
-    {% bootstrap_icon 'thumbs-up' %} upvote
+    <i class="glyphicon glyphicon-thumbs-up"></i>
+    upvote
   </a>
   <a class="btn btn-danger downvote"
      data-pk="{{ post.pk }}" data-kind="post"
      href="javascript:void(0)">
-    {% bootstrap_icon 'thumbs-down' %} downvote
+    <i class="glyphicon glyphicon-thumbs-down""></i>
+    downvote
   </a>
   <div class="label label-default vote-status" data-pk="{{ post.pk }}" data-kind="post">
      ...

diff --git a/templates/post.html b/templates/post.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% load bootstrap3 %}
-
 {% block valuation %}
 <link href="/valuation_{{ low_score }}-{{ low_color }}_{{ high_score }}-{{ high_color }}.css" rel="stylesheet">
 {% endblock %}
@@ -14,7 +12,7 @@
 <br><br>
 
 <div id="tags">
-  {% bootstrap_icon 'tag' %}
+  <i class="glyphicon glyphicon-tag"></i>
   {% for tag in post.tag_set.all %}
     <span class="tag">
       <a href="{% url 'tagged' tag.label %}">