fixed a asset/css loading issue with fnordmetric#embedded (8195ddb7) · Commits · github_fork / Clip

lib/fnordmetric/app.rb

+13 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,12 @@
		class FnordMetric::App < Sinatra::Base

		@@sessions = Hash.new
		@@public_files = {
		"fnordmetric.css" => "text/css",
		"fnordmetric.js" => "application/x-javascript",
		"vendor/jquery-1.6.1.min.js" => "application/x-javascript",
		"vendor/highcharts.js" => "application/x-javascript"
		}

		Encoding.default_external = Encoding::UTF_8

		@@ -12,7 +18,6 @@ class FnordMetric::App < Sinatra::Base

		set :haml, :format => :html5
		set :views, ::File.expand_path('../../../haml', __FILE__)
		set :public_folder, ::File.expand_path('../../../pub', __FILE__)

		def initialize(namespaces, opts)
		@namespaces = {}
		@@ -126,6 +131,12 @@ class FnordMetric::App < Sinatra::Base
		track_event((8**32).to_s(36), parse_params(params))
		end

		@@public_files.each do \|public_file, public_file_type\|
		get "/#{public_file}" do
		content_type(public_file_type)
		::File.open(::File.expand_path("../../../pub/#{public_file}", __FILE__)).read
		end
		end
		private

		def parse_params(hash)

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ body{ background:#3b3e45; color:#333; margin:0; padding:0; overflow-y:scroll; fo
		#tabs ul li:hover, #tabs ul li:hover:after{ color:#fff; }
		#tabs ul li:hover .picto{ opacity:1; }

		.picto{ display:block; height:14px; width:14px; float:left; background:url('/fnordmetric/sprite.png') no-repeat 14px 14px; opacity:0.7; }
		.picto{ display:block; height:14px; width:14px; float:left; opacity:0.7; }
		.picto.piechart{ background-position:-42px -173px; width:9px; margin-right:5px; }

		#viewport{ float:left; margin-left:150px; margin-top:30px; border-radius:3px; min-width:790px; }
		@@ -73,7 +73,7 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
		.headbar .button{
		margin:8px 0px; height:16px; float:right; display:block;
		margin-right:-1px;
		background:url('/fnordmetric/sprite.png') no-repeat 0 -49px #eee;
		background:#eee;
		border:1px solid #999;
		border-bottom-color:#888;
		-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, .1);

deleted100644 → 0

−2.88 KiB

Loading image diff...