namespaced d3, fnordmetric-ui.css (6cadcb8b) · Commits · github_fork / Clip

fnordmetric-core/web/vendor/rickshaw.css→fnordmetric-core/web/fnordmetric-ui.css

+50 −0

Original line number	Diff line number	Diff line
		@@ -284,3 +284,53 @@
		background: rgba(255, 255, 255, 0.2);
		border-radius: 3px;
		}
		.rickshaw_graph .y_ticks path { stroke:none; }
		.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.1); }

		.rickshaw_graph .x_tick {
		border-left: none;
		}

		.rickshaw_graph .x_tick.glow .title, .rickshaw_graph .y_ticks.glow text{
		font-size:14px;
		}

		.rickshaw_legend {
		font-family: "Gotham Narrow", Helvetica, sans-serif;
		font-size: 12px;
		color: #333;
		background: none;
		display: inline-block;
		padding: 12px 5px;
		border-radius: 2px;
		position: relative;
		}

		.rickshaw_legend .ui-sortable {
		margin-left:-10px;
		}

		.rickshaw_legend li.line{
		float:left;
		clear:none;
		padding-right:0;
		}

		.rickshaw_legend a.action{
		margin-right:5px;
		display:none;
		}


		.rickshaw_legend li.line .label{
		font.size:14px;
		margin-left:5px;
		color:#333;
		position:relative;
		top:-1px;
		}


		.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.15); stroke-dasharray:0; }
		.rickshaw_graph .y_ticks text { fill:#333333; }

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		.rickshaw_graph .y_ticks path { stroke:none; }
		.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.1); }

		.rickshaw_graph .x_tick {
		border-left: none;
		}

		.rickshaw_graph .x_tick.glow .title, .rickshaw_graph .y_ticks.glow text{
		font-size:14px;
		}

		.rickshaw_legend {
		font-family: "Gotham Narrow", Helvetica, sans-serif;
		font-size: 12px;
		color: #333;
		background: none;
		display: inline-block;
		padding: 12px 5px;
		border-radius: 2px;
		position: relative;
		}

		.rickshaw_legend .ui-sortable {
		margin-left:-10px;
		}

		.rickshaw_legend li.line{
		float:left;
		clear:none;
		padding-right:0;
		}

		.rickshaw_legend a.action{
		margin-right:5px;
		display:none;
		}


		.rickshaw_legend li.line .label{
		font.size:14px;
		margin-left:5px;
		color:#333;
		position:relative;
		top:-1px;
		}


		.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.15); stroke-dasharray:0; }
		.rickshaw_graph .y_ticks text { fill:#333333; }

+3 −4

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@
		%script{:src => "/vendor/jquery-1.6.2.min.js", :type => "text/javascript"}
		%script{:src => "/vendor/jquery-ui.min.js", :type => "text/javascript"}
		%script{:src => "/vendor/jquery.maskedinput.js", :type => "text/javascript"}
		%script{:src => "/vendor/d3.v2.js", :type => "text/javascript"}
		%script{:src => "/vendor/rickshaw.fnordmetric.js", :type => "text/javascript"}
		%script{:src => "/js/d3.fnordmetric.js", :type => "text/javascript"}
		%script{:src => "/js/rickshaw.fnordmetric.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.util.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.ui.js", :type => "text/javascript"}
		@@ -22,9 +22,8 @@
		%script{:src => "/js/fnordmetric.gauge_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.dashboard_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.session_view.js", :type => "text/javascript"}
		%link{:href => "/vendor/rickshaw.css", :rel => "stylesheet", :type => "text/css"}
		%link{:href => "/vendor/font-awesome/css/font-awesome.css", :rel => "stylesheet", :type => "text/css"}
		%link{:href => "/fnordmetric.rickshaw.css", :rel => "stylesheet", :type => "text/css"}
		%link{:href => "/fnordmetric-ui.css", :rel => "stylesheet", :type => "text/css"}
		%link{:href => "/fnordmetric.css", :rel => "stylesheet", :type => "text/css"}

		%body

+1464 −1464

File changed and moved.

Preview size limit exceeded, changes collapsed.

+2 −11

Original line number	Diff line number	Diff line
		var FnordMetric = (function(){

		var require = [
		'/vendor/d3.v2.js',
		'/vendor/rickshaw.fnordmetric.js',
		'/js/d3.fnordmetric.js',
		'/js/rickshaw.fnordmetric.js',
		'/js/fnordmetric.js',
		'/js/fnordmetric.util.js',
		'/js/fnordmetric.timeseries_widget.js',
		'/js/fnordmetric.js_api.js'
		];

		var require_css = [
		'/vendor/rickshaw.css',
		'/fnordmetric.rickshaw.css'
		];

		var setup = function(opts){
		if (typeof $ == 'undefined') {
		console.log("error: FnordMetric requires jQuery 1.6.2+");
		@@ -26,10 +21,6 @@ var FnordMetric = (function(){
		for (n=0; n < require.length; n++)
		document.write('<script type="text/javascript" src="' + (
		"http://" + opts.address + require[n]) + '"></script>');

		for (n=0; n < require_css.length; n++)
		document.write('<link type="text/css" rel="stylesheet" href="' + (
		"http://" + opts.address + require_css[n]) + '" />');
		}