small changes, font-awesome update (b7ef904d) · Commits · github_fork / Clip

fnordmetric-core/web/fnordmetric.css

+1 −1

Original line number	Diff line number	Diff line
		@@ -565,7 +565,7 @@ h1.head{ margin-top:70px; }
		#sidebar ul li{ height:28px; line-height:28px; cursor:pointer; font-size:13px; padding-left:25px; }
		#sidebar ul li a{ color:#ccc; text-decoration:none; }
		/#sidebar ul li:after{ content:'›'; display:block; float:right; margin-right:15px; color:#ccc; font-size:16px; line-height:27px; }/
		#sidebar ul li i{ margin-right: 5px; color: #AAA; font-size: 11px; position: relative; left: -2px; top: -1px; display:none; }
		#sidebar ul li i{ margin-right: 1px; color: #AAA; font-size: 11px; position: relative; left: -2px; top: -1px; }
		#sidebar ul li:hover, #tabs ul li:hover:after{ color:#fff; }
		#sidebar ul li:hover .picto{ opacity:1; }
		#sidebar ul li.active i, #sidebar ul li.active a{ color:#eee; }

fnordmetric-core/web/js/fnordmetric.js

+19 −6

Original line number	Diff line number	Diff line
		@@ -146,10 +146,13 @@ var FnordMetric = (function(){
		};

		function resizeView(){
		if (!conf.no_resize_viewport) {
		var viewport_width = window.innerWidth - 220;
		if(viewport_width < 780){ viewport_width=780; }
		$('#viewport').width(viewport_width);
		$('.navbar').width(viewport_width);
		}

		FnordMetric.ui.resizable('.viewport_inner');
		if(currentView){
		currentView.resize(
		@@ -166,7 +169,12 @@ var FnordMetric = (function(){
		function init(_conf){
		conf = _conf;
		this.currentNamespace = _conf.token;

		if (conf.address) {
		this.ws_addr = "ws://" + conf.address + '/stream';
		} else {
		this.ws_addr = "ws://" + document.location.host + '/stream';
		}

		if(conf.title){ $('title').html(conf.title); }

		@@ -217,7 +225,10 @@ var FnordMetric = (function(){

		function socketOpen(){
		console.log("[FnordMetric] connected...");

		if (!conf.no_discovery)
		publish({"type": "discover_request"});

		$('.flash_msg_over').fadeOut(function(){ $(this).remove(); });
		}

		@@ -282,7 +293,9 @@ var FnordMetric = (function(){
		renderGauge: renderGauge,
		renderSessionView: renderSessionView,
		renderOverviewView: renderOverviewView,
		renderGaugeExplorer: renderGaugeExplorer,
		resizeView: resizeView,
		loadView: loadView,
		init: init,
		publish: publish,
		setup: setup,

fnordmetric-core/web/js/fnordmetric.timeseries_widget.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,6 @@ FnordMetric.widgets.timeseriesWidget = function(){
		}

		function set_timerange(s, e){
		console.log(s, e);
		opts.start_timestamp = s;
		opts.end_timestamp = e;
		redrawDatepicker();

fnordmetric-core/web/vendor/font-awesome/css/font-awesome-ie7.min.css

0 → 100755

+22 −0

File added.

Preview size limit exceeded, changes collapsed.

fnordmetric-core/web/vendor/font-awesome/css/font-awesome.css

100644 → 100755

+522 −221

Original line number	Diff line number	Diff line
		/* Font Awesome
		the iconic font designed for use with Twitter Bootstrap
		-------------------------------------------------------
		The full suite of pictographic icons, examples, and documentation
		can be found at: http://fortawesome.github.com/Font-Awesome/

		License
		-------------------------------------------------------
		The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
		http://creativecommons.org/licenses/by/3.0/ A mention of
		'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
		source code is considered acceptable attribution (most common on the web).
		If human readable source code is not available to the end user, a mention in
		an 'About' or 'Credits' screen is considered acceptable (most common in desktop
		or mobile software).

		Contact
		-------------------------------------------------------
		Email: dave@davegandy.com
		Twitter: http://twitter.com/fortaweso_me
		Work: http://lemonwi.se co-founder
		/*!
		* Font Awesome 3.0.2
		* the iconic font designed for use with Twitter Bootstrap
		* -------------------------------------------------------
		* The full suite of pictographic icons, examples, and documentation
		* can be found at: http://fortawesome.github.com/Font-Awesome/
		*
		* License
		* -------------------------------------------------------
		* - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
		* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
		* http://opensource.org/licenses/mit-license.html
		* - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
		* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
		* "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"

		* Contact
		* -------------------------------------------------------
		* Email: dave@davegandy.com
		* Twitter: http://twitter.com/fortaweso_me
		* Work: Lead Product Designer @ http://kyruus.com
		*/

		@font-face {
		font-family: 'FontAwesome';
		src: url('../font/fontawesome-webfont.eot');
		src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
		src: url('../font/fontawesome-webfont.eot?v=3.0.1');
		src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
		url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'),
		url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
		font-weight: normal;
		font-style: normal;
		}
		/* Font Awesome styles
		------------------------------------------------------- */
		[class^="icon-"],
		[class*=" icon-"] {
		font-family: FontAwesome;
		font-weight: normal;
		font-style: normal;
		text-decoration: inherit;
		-webkit-font-smoothing: antialiased;

		/* sprites.less reset */
		[class^="icon-"], [class*=" icon-"] {
		display: inline;
		width: auto;
		height: auto;
		line-height: inherit;
		line-height: normal;
		vertical-align: baseline;
		background-image: none;
		background-position: 0% 0%;
		background-repeat: repeat;
		margin-top: 0;
		}
		li[class^="icon-"], li[class*=" icon-"] {
		display: block;
		/* more sprites.less reset */
		.icon-white,
		.nav-pills > .active > a > [class^="icon-"],
		.nav-pills > .active > a > [class*=" icon-"],
		.nav-list > .active > a > [class^="icon-"],
		.nav-list > .active > a > [class*=" icon-"],
		.navbar-inverse .nav > .active > a > [class^="icon-"],
		.navbar-inverse .nav > .active > a > [class*=" icon-"],
		.dropdown-menu > li > a:hover > [class^="icon-"],
		.dropdown-menu > li > a:hover > [class*=" icon-"],
		.dropdown-menu > .active > a > [class^="icon-"],
		.dropdown-menu > .active > a > [class*=" icon-"],
		.dropdown-submenu:hover > a > [class^="icon-"],
		.dropdown-submenu:hover > a > [class*=" icon-"] {
		background-image: none;
		}
		/* Font Awesome styles
		------------------------------------------------------- */
		[class^="icon-"]:before, [class*=" icon-"]:before {
		font-family: FontAwesome;
		font-weight: normal;
		font-style: normal;
		display: inline-block;
		[class^="icon-"]:before,
		[class*=" icon-"]:before {
		text-decoration: inherit;
		display: inline-block;
		speak: none;
		}
		a [class^="icon-"], a [class*=" icon-"] {
		/* makes sure icons active on rollover in links */
		a [class^="icon-"],
		a [class*=" icon-"] {
		display: inline-block;
		text-decoration: inherit;
		}
		/* makes the font 33% larger relative to the icon container */
		.icon-large:before {
		vertical-align: top;
		vertical-align: -10%;
		font-size: 1.3333333333333333em;
		}
		.btn [class^="icon-"], .btn [class*=" icon-"] {
		.btn [class^="icon-"],
		.nav [class^="icon-"],
		.btn [class*=" icon-"],
		.nav [class*=" icon-"] {
		display: inline;
		/* keeps button heights with and without icons the same */

		}
		.btn [class^="icon-"].icon-large,
		.nav [class^="icon-"].icon-large,
		.btn [class*=" icon-"].icon-large,
		.nav [class*=" icon-"].icon-large {
		line-height: .9em;
		}
		li [class^="icon-"], li [class*=" icon-"] {
		.btn [class^="icon-"].icon-spin,
		.nav [class^="icon-"].icon-spin,
		.btn [class*=" icon-"].icon-spin,
		.nav [class*=" icon-"].icon-spin {
		display: inline-block;
		}
		.nav-tabs [class^="icon-"],
		.nav-pills [class^="icon-"],
		.nav-tabs [class*=" icon-"],
		.nav-pills [class*=" icon-"] {
		/* keeps button heights with and without icons the same */

		}
		.nav-tabs [class^="icon-"],
		.nav-pills [class^="icon-"],
		.nav-tabs [class*=" icon-"],
		.nav-pills [class*=" icon-"],
		.nav-tabs [class^="icon-"].icon-large,
		.nav-pills [class^="icon-"].icon-large,
		.nav-tabs [class*=" icon-"].icon-large,
		.nav-pills [class*=" icon-"].icon-large {
		line-height: .9em;
		}
		li [class^="icon-"],
		.nav li [class^="icon-"],
		li [class*=" icon-"],
		.nav li [class*=" icon-"] {
		display: inline-block;
		width: 1.25em;
		text-align: center;
		}
		li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
		/* 1.5 increased font size for icon-large * 1.25 width */
		width: 1.875em;
		li [class^="icon-"].icon-large,
		.nav li [class^="icon-"].icon-large,
		li [class*=" icon-"].icon-large,
		.nav li [class*=" icon-"].icon-large {
		/* increased font size for icon-large */

		width: 1.5625em;
		}
		li[class^="icon-"], li[class*=" icon-"] {
		margin-left: 0;
		ul.icons {
		list-style-type: none;
		text-indent: -0.75em;
		}
		li[class^="icon-"]:before, li[class*=" icon-"]:before {
		text-indent: -2em;
		text-align: center;
		ul.icons li [class^="icon-"],
		ul.icons li [class*=" icon-"] {
		width: .75em;
		}
		.icon-muted {
		color: #eeeeee;
		}
		.icon-border {
		border: solid 1px #eeeeee;
		padding: .2em .25em .15em;
		-webkit-border-radius: 3px;
		-moz-border-radius: 3px;
		border-radius: 3px;
		}
		.icon-2x {
		font-size: 2em;
		}
		.icon-2x.icon-border {
		border-width: 2px;
		-webkit-border-radius: 4px;
		-moz-border-radius: 4px;
		border-radius: 4px;
		}
		.icon-3x {
		font-size: 3em;
		}
		.icon-3x.icon-border {
		border-width: 3px;
		-webkit-border-radius: 5px;
		-moz-border-radius: 5px;
		border-radius: 5px;
		}
		.icon-4x {
		font-size: 4em;
		}
		.icon-4x.icon-border {
		border-width: 4px;
		-webkit-border-radius: 6px;
		-moz-border-radius: 6px;
		border-radius: 6px;
		}
		.pull-right {
		float: right;
		}
		.pull-left {
		float: left;
		}
		[class^="icon-"].pull-left,
		[class*=" icon-"].pull-left {
		margin-right: .3em;
		}
		[class^="icon-"].pull-right,
		[class*=" icon-"].pull-right {
		margin-left: .3em;
		}
		.btn [class^="icon-"].pull-left.icon-2x,
		.btn [class*=" icon-"].pull-left.icon-2x,
		.btn [class^="icon-"].pull-right.icon-2x,
		.btn [class*=" icon-"].pull-right.icon-2x {
		margin-top: .18em;
		}
		.btn [class^="icon-"].icon-spin.icon-large,
		.btn [class*=" icon-"].icon-spin.icon-large {
		line-height: .8em;
		}
		.btn.btn-small [class^="icon-"].pull-left.icon-2x,
		.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
		.btn.btn-small [class^="icon-"].pull-right.icon-2x,
		.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
		margin-top: .25em;
		}
		.btn.btn-large [class^="icon-"],
		.btn.btn-large [class*=" icon-"] {
		margin-top: 0;
		}
		.btn.btn-large [class^="icon-"].pull-left.icon-2x,
		.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
		.btn.btn-large [class^="icon-"].pull-right.icon-2x,
		.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
		margin-top: .05em;
		}
		.btn.btn-large [class^="icon-"].pull-left.icon-2x,
		.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
		margin-right: .2em;
		}
		.btn.btn-large [class^="icon-"].pull-right.icon-2x,
		.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
		margin-left: .2em;
		}
		.icon-spin {
		display: inline-block;
		-moz-animation: spin 2s infinite linear;
		-o-animation: spin 2s infinite linear;
		-webkit-animation: spin 2s infinite linear;
		animation: spin 2s infinite linear;
		}
		@-moz-keyframes spin {
		0% { -moz-transform: rotate(0deg); }
		100% { -moz-transform: rotate(359deg); }
		}
		@-webkit-keyframes spin {
		0% { -webkit-transform: rotate(0deg); }
		100% { -webkit-transform: rotate(359deg); }
		}
		@-o-keyframes spin {
		0% { -o-transform: rotate(0deg); }
		100% { -o-transform: rotate(359deg); }
		}
		@-ms-keyframes spin {
		0% { -ms-transform: rotate(0deg); }
		100% { -ms-transform: rotate(359deg); }
		}
		@keyframes spin {
		0% { transform: rotate(0deg); }
		100% { transform: rotate(359deg); }
		}
		@-moz-document url-prefix() {
		.icon-spin {
		height: .9em;
		}
		.btn .icon-spin {
		height: auto;
		}
		.icon-spin.icon-large {
		height: 1.25em;
		}
		.btn .icon-spin.icon-large {
		height: .75em;
		}
		li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
		text-indent: -1.3333333333333333em;
		}
		/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
		readers do not read off random characters that represent icons */
		@@ -119,7 +303,7 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
		.icon-play-circle:before { content: "\f01d"; }
		.icon-repeat:before { content: "\f01e"; }

		/* \f020 is not a valid unicode character. all shifted one down */
		/* \f020 doesn't work in Safari. all shifted one down */
		.icon-refresh:before { content: "\f021"; }
		.icon-list-alt:before { content: "\f022"; }
		.icon-lock:before { content: "\f023"; }
		@@ -237,3 +421,120 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
		.icon-github-sign:before { content: "\f092"; }
		.icon-upload-alt:before { content: "\f093"; }
		.icon-lemon:before { content: "\f094"; }
		.icon-phone:before { content: "\f095"; }
		.icon-check-empty:before { content: "\f096"; }
		.icon-bookmark-empty:before { content: "\f097"; }
		.icon-phone-sign:before { content: "\f098"; }
		.icon-twitter:before { content: "\f099"; }
		.icon-facebook:before { content: "\f09a"; }
		.icon-github:before { content: "\f09b"; }
		.icon-unlock:before { content: "\f09c"; }
		.icon-credit-card:before { content: "\f09d"; }
		.icon-rss:before { content: "\f09e"; }

		.icon-hdd:before { content: "\f0a0"; }
		.icon-bullhorn:before { content: "\f0a1"; }
		.icon-bell:before { content: "\f0a2"; }
		.icon-certificate:before { content: "\f0a3"; }
		.icon-hand-right:before { content: "\f0a4"; }
		.icon-hand-left:before { content: "\f0a5"; }
		.icon-hand-up:before { content: "\f0a6"; }
		.icon-hand-down:before { content: "\f0a7"; }
		.icon-circle-arrow-left:before { content: "\f0a8"; }
		.icon-circle-arrow-right:before { content: "\f0a9"; }
		.icon-circle-arrow-up:before { content: "\f0aa"; }
		.icon-circle-arrow-down:before { content: "\f0ab"; }
		.icon-globe:before { content: "\f0ac"; }
		.icon-wrench:before { content: "\f0ad"; }
		.icon-tasks:before { content: "\f0ae"; }

		.icon-filter:before { content: "\f0b0"; }
		.icon-briefcase:before { content: "\f0b1"; }
		.icon-fullscreen:before { content: "\f0b2"; }

		.icon-group:before { content: "\f0c0"; }
		.icon-link:before { content: "\f0c1"; }
		.icon-cloud:before { content: "\f0c2"; }
		.icon-beaker:before { content: "\f0c3"; }
		.icon-cut:before { content: "\f0c4"; }
		.icon-copy:before { content: "\f0c5"; }
		.icon-paper-clip:before { content: "\f0c6"; }
		.icon-save:before { content: "\f0c7"; }
		.icon-sign-blank:before { content: "\f0c8"; }
		.icon-reorder:before { content: "\f0c9"; }
		.icon-list-ul:before { content: "\f0ca"; }
		.icon-list-ol:before { content: "\f0cb"; }
		.icon-strikethrough:before { content: "\f0cc"; }
		.icon-underline:before { content: "\f0cd"; }
		.icon-table:before { content: "\f0ce"; }

		.icon-magic:before { content: "\f0d0"; }
		.icon-truck:before { content: "\f0d1"; }
		.icon-pinterest:before { content: "\f0d2"; }
		.icon-pinterest-sign:before { content: "\f0d3"; }
		.icon-google-plus-sign:before { content: "\f0d4"; }
		.icon-google-plus:before { content: "\f0d5"; }
		.icon-money:before { content: "\f0d6"; }
		.icon-caret-down:before { content: "\f0d7"; }
		.icon-caret-up:before { content: "\f0d8"; }
		.icon-caret-left:before { content: "\f0d9"; }
		.icon-caret-right:before { content: "\f0da"; }
		.icon-columns:before { content: "\f0db"; }
		.icon-sort:before { content: "\f0dc"; }
		.icon-sort-down:before { content: "\f0dd"; }
		.icon-sort-up:before { content: "\f0de"; }

		.icon-envelope-alt:before { content: "\f0e0"; }
		.icon-linkedin:before { content: "\f0e1"; }
		.icon-undo:before { content: "\f0e2"; }
		.icon-legal:before { content: "\f0e3"; }
		.icon-dashboard:before { content: "\f0e4"; }
		.icon-comment-alt:before { content: "\f0e5"; }
		.icon-comments-alt:before { content: "\f0e6"; }
		.icon-bolt:before { content: "\f0e7"; }
		.icon-sitemap:before { content: "\f0e8"; }
		.icon-umbrella:before { content: "\f0e9"; }
		.icon-paste:before { content: "\f0ea"; }
		.icon-lightbulb:before { content: "\f0eb"; }
		.icon-exchange:before { content: "\f0ec"; }
		.icon-cloud-download:before { content: "\f0ed"; }
		.icon-cloud-upload:before { content: "\f0ee"; }

		.icon-user-md:before { content: "\f0f0"; }
		.icon-stethoscope:before { content: "\f0f1"; }
		.icon-suitcase:before { content: "\f0f2"; }
		.icon-bell-alt:before { content: "\f0f3"; }
		.icon-coffee:before { content: "\f0f4"; }
		.icon-food:before { content: "\f0f5"; }
		.icon-file-alt:before { content: "\f0f6"; }
		.icon-building:before { content: "\f0f7"; }
		.icon-hospital:before { content: "\f0f8"; }
		.icon-ambulance:before { content: "\f0f9"; }
		.icon-medkit:before { content: "\f0fa"; }
		.icon-fighter-jet:before { content: "\f0fb"; }
		.icon-beer:before { content: "\f0fc"; }
		.icon-h-sign:before { content: "\f0fd"; }
		.icon-plus-sign-alt:before { content: "\f0fe"; }

		.icon-double-angle-left:before { content: "\f100"; }
		.icon-double-angle-right:before { content: "\f101"; }
		.icon-double-angle-up:before { content: "\f102"; }
		.icon-double-angle-down:before { content: "\f103"; }
		.icon-angle-left:before { content: "\f104"; }
		.icon-angle-right:before { content: "\f105"; }
		.icon-angle-up:before { content: "\f106"; }
		.icon-angle-down:before { content: "\f107"; }
		.icon-desktop:before { content: "\f108"; }
		.icon-laptop:before { content: "\f109"; }
		.icon-tablet:before { content: "\f10a"; }
		.icon-mobile-phone:before { content: "\f10b"; }
		.icon-circle-blank:before { content: "\f10c"; }
		.icon-quote-left:before { content: "\f10d"; }
		.icon-quote-right:before { content: "\f10e"; }

		.icon-spinner:before { content: "\f110"; }
		.icon-circle:before { content: "\f111"; }
		.icon-reply:before { content: "\f112"; }
		.icon-github-alt:before { content: "\f113"; }
		.icon-folder-close-alt:before { content: "\f114"; }
		.icon-folder-open-alt:before { content: "\f115"; }

Admin message