GopherProxy

	Merge up gem and twitter-bootstrap updates - warvox - VoIP based wardialing too…
	Log
	Files
	Refs
	README
	---
	commit 73e52672666c443f5cc12b5d4cf887683e35d6d6
	parent b0d5a0910aee1830194ed2f66f400568aab5b083
	Author: HD Moore <[email protected]>
	Date: Sat, 12 Jan 2013 01:17:58 -0600

	Merge up gem and twitter-bootstrap updates

	Diffstat:
	M Gemfile \| 7 +++++--
	M Gemfile.lock \| 21 ++++++++++++++++++---
	A app/assets/stylesheets/application… \| 7 +++++++
	M app/assets/stylesheets/bootstrap_a… \| 35 +++++++++++++++++++++++++--…

	4 files changed, 58 insertions(+), 12 deletions(-)
	---
	diff --git a/Gemfile b/Gemfile
	@@ -2,8 +2,8 @@ source 'http://rubygems.org'

	ruby '1.9.3'
	gem 'thin'
	-gem 'rails', '3.2.11'
	-gem 'pg', '0.11'
	+gem 'rails', '>=3.2.11'
	+gem 'pg', '>=0.11'

	gem 'jquery-rails'
	gem 'jquery-datatables-rails'
	@@ -30,6 +30,9 @@ gem 'twitter-bootstrap-rails'
	gem 'formtastic'
	gem 'formtastic-bootstrap'
	gem 'rails_bootstrap_navbar'
	+gem 'less-rails-bootstrap'
	+gem 'therubyracer'
	+

	# gem "therubyracer", :group => :assets, :platform => :ruby

	diff --git a/Gemfile.lock b/Gemfile.lock
	@@ -48,6 +48,7 @@ GEM
	coffee-script-source
	execjs
	coffee-script-source (1.4.0)
	+ commonjs (0.2.6)
	daemons (1.1.9)
	dynamic_form (1.1.4)
	erubis (2.7.0)
	@@ -69,14 +70,22 @@ GEM
	thor (>= 0.14, < 2.0)
	json (1.7.6)
	kissfft (0.0.1)
	+ less (2.2.2)
	+ commonjs (~> 0.2.6)
	+ less-rails (2.2.6)
	+ actionpack (>= 3.1)
	+ less (~> 2.2.0)
	+ less-rails-bootstrap (2.2.0)
	+ less-rails (~> 2.2.0)
	librex (0.0.68)
	+ libv8 (3.11.8.13)
	mail (2.4.4)
	i18n (>= 0.4.0)
	mime-types (~> 1.16)
	treetop (~> 1.4.8)
	mime-types (1.19)
	multi_json (1.5.0)
	- pg (0.11.0)
	+ pg (0.14.1)
	pg_array_parser (0.0.8)
	polyglot (0.3.3)
	rack (1.4.3)
	@@ -108,6 +117,7 @@ GEM
	rake (10.0.3)
	rdoc (3.12)
	json (~> 1.4)
	+ ref (1.0.2)
	sass (3.2.5)
	sass-rails (3.2.5)
	railties (~> 3.2.0)
	@@ -118,6 +128,9 @@ GEM
	multi_json (~> 1.0)
	rack (~> 1.0)
	tilt (~> 1.1, != 1.3.0)
	+ therubyracer (0.11.2)
	+ libv8 (~> 3.11.8.12)
	+ ref
	thin (1.5.0)
	daemons (>= 1.0.9)
	eventmachine (>= 0.12.6)
	@@ -151,13 +164,15 @@ DEPENDENCIES
	jquery-datatables-rails
	jquery-rails
	kissfft
	+ less-rails-bootstrap
	librex
	- pg (= 0.11)
	+ pg (>= 0.11)
	postgres_ext!
	- rails (= 3.2.11)
	+ rails (>= 3.2.11)
	rails-settings-cached
	rails_bootstrap_navbar
	sass-rails (~> 3.2.3)
	+ therubyracer
	thin
	twitter-bootstrap-rails
	uglifier (>= 1.0.3)
	diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/ap…
	@@ -0,0 +1,7 @@
	+/*
	+ * This is a manifest file that'll automatically include all the stylesheets a…
	+ * and any sub-directories. You're free to add application-wide styles to this…
	+ * the top of the compiled file, but it's generally better to create a new fil…
	+ *= require_self
	+ *= require_tree .
	+*/
	diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/asse…
	@@ -1,14 +1,35 @@
	@import "twitter/bootstrap/bootstrap";
	-
	-body {
	- padding-top: 5px;
	-}
	-
	@import "twitter/bootstrap/responsive";

	// Set the correct sprite paths
	-@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
	-@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white…
	+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
	+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white…
	+
	+// Set the Font Awesome (Font Awesome is default. You can disable by commentin…
	+// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.c…
	+// have the proper paths. So for now we use the absolute path.
	+@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
	+@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
	+@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
	+@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
	+@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
	+
	+// Font Awesome
	+@import "fontawesome";
	+
	+// Glyphicons
	+//@import "twitter/bootstrap/sprites.less";
	+
	+// Your custom LESS stylesheets goes here
	+//
	+// Since bootstrap was imported above you have access to its mixins which
	+// you may use and inherit here
	+//
	+// If you'd like to override bootstrap's own variables, you can do so here as …
	+// See http://twitter.github.com/bootstrap/customize.html#variables for their …
	+//
	+// Example:
	+// @linkColor: #ff0000;


	@sansFontFamily: "Trebuchet MS", Arial, Helvetica, sans-serif;