Permalink
Browse files

Nix responsive design

First pass at nixing the responsive design stuff. It didn't really
work, doesn't work with video at all, and it makes more sense to
eventually do a set of mobile-centric templates later.
  • Loading branch information...
1 parent e841a3a commit f21eba67e7e1d2417b9009f2d6db3d64276bc3bf @willkg committed Dec 12, 2012
@@ -174,7 +174,7 @@ you so desire. To add a page:
<h1>Contact information</h1>
</div>
- <div class="row-fluid">
+ <div class="row">
<div class="span12">
<p>
If you have problems with this site, send email to
@@ -23,13 +23,13 @@
<h1>Site news</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span2">
{{ macros.archivebar(archives) }}
</div>
<div class="span10">
- <div class="row-fluid">
+ <div class="row">
<div class="span9">
<div class="news-item">
<h2>{{ item.title }}</h2>
@@ -36,13 +36,13 @@
<h1>Site news</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span2">
{{ macros.archivebar(archives, activeyear) }}
</div>
<div class="span10">
- <div class="row-fluid">
+ <div class="row">
<div class="span9">
{% for item in items %}
<div class="news-item">
@@ -39,14 +39,14 @@
</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<p>Have a set of videos you think should be added to this
site? <a href="#suggest">Suggest it here</a></p>
</div>
</div>
-<div class="row-fluid section">
+<div class="row section">
<div class="span12">
<h2>Open</h2>
{% if open_suggestions %}
@@ -75,7 +75,7 @@
</div>
-<div class="row-fluid section">
+<div class="row section">
<div class="span12">
<h2>Resolved</h2>
{% if resolved_suggestions %}
@@ -106,7 +106,7 @@
</div>
-<div class="row-fluid section">
+<div class="row section">
<div class="span12">
<a name="suggest"></a>
<h2>Suggest a video or list of videos to be added</h2>
@@ -19,11 +19,9 @@
<html>
<head>
<link rel="stylesheet" href="{{ settings.STATIC_URL }}bootstrap/css/bootstrap.min.css">
- <link rel="stylesheet" href="{{ settings.STATIC_URL }}bootstrap/css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="{{ settings.STATIC_URL }}css/richard.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ settings.SITE_TITLE }} search" href="{{ url('videos-opensearch') }}">
<title>{% block title %}{{ page_title() }}{% endblock %}</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
{% if meta %}
{% for meta_name, meta_content in meta %}
<meta name="{{ meta_name }}" content="{{ meta_content }}">
@@ -65,7 +63,7 @@
<div id="content" class="container">
{% if notifications -%}
- <div class="row-fluid">
+ <div class="row">
<div class="span12">
{% for n in notifications -%}
<div class="alert alert-info">
@@ -18,7 +18,7 @@
{% extends "base.html" %}
{% block content %}
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<div class="hero-unit">
<h1>{{ settings.SITE_TITLE }}</h1>
@@ -29,8 +29,9 @@
<p>
<a class="btn btn-primary btn-large" href="{{ url('pages-page', page='about') }}">Learn more</a>
</p>
+ </div>
- <div class="row-fluid section">
+ <div class="row section">
<div class="span6">
<h2>Latest categories</h2>
@@ -67,14 +68,13 @@
{% endif %}
</div>
- <div>
</div>
</div>
</div>
{% if news %}
- <div class="row-fluid section">
+ <div class="row section">
<div class="span12">
<h2>Site news
<small><a class="feed" href="{{ url('sitenews-feed') }}"> feed</a></small>
@@ -23,7 +23,7 @@
<h1>About this site</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<p>
This site uses <a href="http://github.com/willkg/richard">richard</a>.
@@ -26,7 +26,7 @@
<h1>{{ video_count }} video{{ 's' if video_count != 0 }} indexed</h2>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span4">
<div class="well">
<p class="stats-number">
@@ -81,7 +81,7 @@
</div>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span4">
<div class="well">
<p class="stats-number">
@@ -43,7 +43,7 @@
<li><a href="{{ url('videos-category-feed', category_id=category.pk, slug=category.slug) }}">rss feed</a></li>
</ul>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
{% if category.url %}
<p>
@@ -56,7 +56,7 @@
</div>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<hr noshade>
</div>
@@ -24,7 +24,7 @@
</div>
{% for cat in categories %}
- <div class="row-fluid">
+ <div class="row">
<div class="span9 section">
<h3>
<a href="{{ cat.get_absolute_url() }}">{{ cat.title }}</a>
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#}
{% macro video_summary(v) -%}
- <div class="row-fluid section">
+ <div class="row section">
<div class="span2">
<a href="{{ v.get_absolute_url() }}" class="thumbnail"><img width="{{ v.thumbnail_width }}" height="{{ v.thumbnail_height }}" src="{{ v.get_thumbnail_url() }}"></a>
</div>
@@ -29,7 +29,7 @@
<h1>Search</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<form class="well form-search" method="get" action="/search/">
<input type="hidden" name="models" value="videos.video">
@@ -40,15 +40,15 @@
</div>
{% if query %}
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<h2>Results</h2>
</div>
</div>
{% for result in page.object_list %}
{{ macros.video_summary(result.object) }}
{% else %}
- <div class="row-fluid">
+ <div class="row">
<div class="span12">
<div class="section">
No results
@@ -58,7 +58,7 @@
{% endfor %}
{% if page.has_previous() or page.has_next() %}
-<div class="row-fluid">
+<div class="row">
<div class="span12 centered">
<div class="pager">
<ul>
@@ -37,7 +37,7 @@
</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span9">
<h2>Videos</h2>
</div>
@@ -23,7 +23,7 @@
<h1>Speakers</h1>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<div class="btn-toolbar">
<div class="btn-group">
@@ -34,7 +34,7 @@
</div>
</div>
</div>
-<div class="row-fluid">
+<div class="row">
<div class="span12">
<ul>
{% for s in speakers %}
@@ -27,7 +27,7 @@
</div>
{% endif %}
-<div class="row-fluid">
+<div class="row">
<div id="videobox" class="span12">
{{ videodisplay.display(embed, available_formats) }}
<div class="section">
@@ -36,7 +36,7 @@
</div>
</div>
-<div class="row-fluid">
+<div class="row">
<div id="videobox" class="span8">
{% if v.quality_notes %}
<div class="section alert alert-info">

0 comments on commit f21eba6

Please sign in to comment.