From 6822ae7666556e95557ffaa8d3bf1cc93553fa40 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Thu, 21 Feb 2013 21:30:03 -0500 Subject: [PATCH] Working on homepage and moving stuff around. --- .../blogs/themes/pro-adams/base.html | 5 +- git-pre-commit | 8 +- media/css/blog-themes/default/style.css | 2 +- media/css/blog-themes/default/style.scss | 4 +- media/css/blog-themes/pro-adams/style.css | 2 +- media/css/blog-themes/pro-adams/style.scss | 2 +- media/css/bootstrap-responsive.min.css | 9 ++ media/css/bootstrap.css | 9 -- media/css/bootstrap.min.css | 9 ++ media/css/chosen.css | 38 ++++---- media/css/pro.css | 15 +++- media/css/snipt.css | 55 +++++++----- media/css/style.css | 2 +- media/css/style.scss | 83 ++++++++++-------- media/{images => img}/ad.png | Bin media/{images => img}/an-event-apart.gif | Bin media/{images => img}/api-icon.png | Bin .../aside-nav-open-bottom-bg.gif | Bin .../{images => img}/aside-nav-open-top-bg.gif | Bin media/{images => img}/author-icon.png | Bin media/{images => img}/bg.gif | Bin media/{images => img}/blog-favicon.ico | Bin media/{images => img}/blog-favicon.png | Bin media/{images => img}/blog-header-bg.png | Bin media/{images => img}/blog-icon.png | Bin media/{images => img}/calendar-icon.png | Bin .../{images => img}/card-american-express.png | Bin media/{images => img}/card-discover.png | Bin media/{images => img}/card-mastercard.png | Bin media/{images => img}/card-visa.png | Bin media/{images => img}/chosen-sprite.png | Bin media/{images => img}/collapse.png | Bin media/{images => img}/comments-icon.png | Bin media/{images => img}/copy-icon.png | Bin media/{images => img}/date-arrow.gif | Bin .../default-gravatar-homepage.gif | 0 media/{images => img}/edit-icon.png | Bin media/{images => img}/embed-icon.png | Bin media/{images => img}/expand.png | Bin media/{images => img}/favicon.ico | Bin media/{images => img}/favicon.png | Bin media/{images => img}/favorite-icon.png | Bin media/{images => img}/favorited-icon.png | Bin media/{images => img}/github-icon.gif | Bin .../glyphicons-halflings-white.png | Bin .../{images => img}/glyphicons-halflings.png | Bin media/{images => img}/grey-bit.gif | Bin media/{images => img}/groups-icon.png | Bin media/{images => img}/header-bg.gif | Bin media/{images => img}/header-fixed-save.gif | Bin media/{images => img}/header-inner-bg.png | Bin media/{images => img}/homepage-header-bg.jpg | Bin media/{images => img}/infinity.png | Bin media/{images => img}/linode.png | Bin media/{images => img}/logo.png | Bin media/{images => img}/permalink.png | Bin media/{images => img}/private-icon-edit.png | Bin media/{images => img}/private-icon.png | Bin media/{images => img}/pro-hero-bg.png | Bin media/{images => img}/roadmap-icon.png | Bin media/{images => img}/rochester-made.png | Bin media/{images => img}/rss-icon.png | Bin media/{images => img}/search-icon.png | Bin media/{images => img}/sifter-black-white.png | Bin media/{images => img}/sifter-color.png | Bin media/{images => img}/snipt-drop-shadow.png | Bin media/{images => img}/snipt-tags-icon.png | Bin media/{images => img}/stripe.png | Bin media/{images => img}/tags-icon.png | Bin media/{images => img}/twitter-icon.png | Bin media/{images => img}/upgrade-icon.png | Bin media/{images => img}/view-full.png | Bin media/{images => img}/work/afeedapart.jpg | Bin media/{images => img}/work/amara.jpg | Bin media/{images => img}/work/autoswatch.jpg | Bin media/{images => img}/work/cias.jpg | Bin media/{images => img}/work/emilyapp.jpg | Bin media/{images => img}/work/finisht.jpg | Bin media/{images => img}/work/gittip.jpg | Bin media/{images => img}/work/lionburger.jpg | Bin media/{images => img}/work/nickandashley.jpg | Bin media/{images => img}/work/nywcc.jpg | Bin .../{images => img}/work/refreshrochester.jpg | Bin media/{images => img}/work/rochestermade.jpg | Bin media/{images => img}/work/sidepros.jpg | Bin media/{images => img}/work/snipt.jpg | Bin media/{images => img}/work/whirlwind.jpg | Bin media/{images => img}/work/zebrareach.jpg | Bin media/js/libs/bootstrap.js | 6 -- media/js/libs/bootstrap.min.js | 6 ++ media/js/snipt-all.min.js | 2 +- snipts/templates/snipts/detail.html | 2 +- snipts/templates/snipts/list-public.html | 2 +- snipts/templates/snipts/list-user.html | 2 +- .../templates/snipts/snipt-js-template.html | 2 +- snipts/templates/snipts/snipt-list.html | 2 +- templates/base.html | 15 ++-- templates/homepage.html | 26 +++--- templates/pro-signup.html | 8 +- 99 files changed, 179 insertions(+), 137 deletions(-) create mode 100644 media/css/bootstrap-responsive.min.css delete mode 100644 media/css/bootstrap.css create mode 100644 media/css/bootstrap.min.css rename media/{images => img}/ad.png (100%) rename media/{images => img}/an-event-apart.gif (100%) rename media/{images => img}/api-icon.png (100%) rename media/{images => img}/aside-nav-open-bottom-bg.gif (100%) rename media/{images => img}/aside-nav-open-top-bg.gif (100%) rename media/{images => img}/author-icon.png (100%) rename media/{images => img}/bg.gif (100%) rename media/{images => img}/blog-favicon.ico (100%) rename media/{images => img}/blog-favicon.png (100%) rename media/{images => img}/blog-header-bg.png (100%) rename media/{images => img}/blog-icon.png (100%) rename media/{images => img}/calendar-icon.png (100%) rename media/{images => img}/card-american-express.png (100%) rename media/{images => img}/card-discover.png (100%) rename media/{images => img}/card-mastercard.png (100%) rename media/{images => img}/card-visa.png (100%) rename media/{images => img}/chosen-sprite.png (100%) rename media/{images => img}/collapse.png (100%) rename media/{images => img}/comments-icon.png (100%) rename media/{images => img}/copy-icon.png (100%) rename media/{images => img}/date-arrow.gif (100%) rename media/{images => img}/default-gravatar-homepage.gif (100%) rename media/{images => img}/edit-icon.png (100%) rename media/{images => img}/embed-icon.png (100%) rename media/{images => img}/expand.png (100%) rename media/{images => img}/favicon.ico (100%) rename media/{images => img}/favicon.png (100%) rename media/{images => img}/favorite-icon.png (100%) rename media/{images => img}/favorited-icon.png (100%) rename media/{images => img}/github-icon.gif (100%) rename media/{images => img}/glyphicons-halflings-white.png (100%) rename media/{images => img}/glyphicons-halflings.png (100%) rename media/{images => img}/grey-bit.gif (100%) rename media/{images => img}/groups-icon.png (100%) rename media/{images => img}/header-bg.gif (100%) rename media/{images => img}/header-fixed-save.gif (100%) rename media/{images => img}/header-inner-bg.png (100%) rename media/{images => img}/homepage-header-bg.jpg (100%) rename media/{images => img}/infinity.png (100%) rename media/{images => img}/linode.png (100%) rename media/{images => img}/logo.png (100%) rename media/{images => img}/permalink.png (100%) rename media/{images => img}/private-icon-edit.png (100%) rename media/{images => img}/private-icon.png (100%) rename media/{images => img}/pro-hero-bg.png (100%) rename media/{images => img}/roadmap-icon.png (100%) rename media/{images => img}/rochester-made.png (100%) rename media/{images => img}/rss-icon.png (100%) rename media/{images => img}/search-icon.png (100%) rename media/{images => img}/sifter-black-white.png (100%) rename media/{images => img}/sifter-color.png (100%) rename media/{images => img}/snipt-drop-shadow.png (100%) rename media/{images => img}/snipt-tags-icon.png (100%) rename media/{images => img}/stripe.png (100%) rename media/{images => img}/tags-icon.png (100%) rename media/{images => img}/twitter-icon.png (100%) rename media/{images => img}/upgrade-icon.png (100%) rename media/{images => img}/view-full.png (100%) rename media/{images => img}/work/afeedapart.jpg (100%) rename media/{images => img}/work/amara.jpg (100%) rename media/{images => img}/work/autoswatch.jpg (100%) rename media/{images => img}/work/cias.jpg (100%) rename media/{images => img}/work/emilyapp.jpg (100%) rename media/{images => img}/work/finisht.jpg (100%) rename media/{images => img}/work/gittip.jpg (100%) rename media/{images => img}/work/lionburger.jpg (100%) rename media/{images => img}/work/nickandashley.jpg (100%) rename media/{images => img}/work/nywcc.jpg (100%) rename media/{images => img}/work/refreshrochester.jpg (100%) rename media/{images => img}/work/rochestermade.jpg (100%) rename media/{images => img}/work/sidepros.jpg (100%) rename media/{images => img}/work/snipt.jpg (100%) rename media/{images => img}/work/whirlwind.jpg (100%) rename media/{images => img}/work/zebrareach.jpg (100%) delete mode 100644 media/js/libs/bootstrap.js create mode 100644 media/js/libs/bootstrap.min.js diff --git a/blogs/templates/blogs/themes/pro-adams/base.html b/blogs/templates/blogs/themes/pro-adams/base.html index d896b90..4aef37d 100644 --- a/blogs/templates/blogs/themes/pro-adams/base.html +++ b/blogs/templates/blogs/themes/pro-adams/base.html @@ -28,7 +28,8 @@ {% endif %} {% if debug %} - + + @@ -36,7 +37,7 @@ {% endif %} - + {% if custom_css %}