css (17ac9055) · Commits · github_fork / Clip

src/fnordmetric/webui/fnordmetric-app.html

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		</fn-button>-->
		</fn-appbar-section>

		<fn-appbar-section data-position="right">
		<fn-appbar-section data-position="right" class="search">
		<fn-search>
		<fn-search-icon><i class="fa fa-search"></i></fn-search-icon>
		</fn-search>

src/fnordmetric/webui/fnordmetric-webui-cockpit.css

+16 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,10 @@ fnordmetric-app fn-appbar /deep/ fn-appbar-section {
		margin: 0;
		}

		fnordmetric-app fn-appbar /deep/ fn-appbar-section.search {
		display: none;
		}

		fn-appbar fn-button fn-icon {
		display: none;
		}
		@@ -63,6 +67,11 @@ fn-metric-explorer-list .navigation h1 {
		margin: 0;
		}

		fn-metric-explorer-preview .navigation .item,
		fn-metric-explorer-preview .navigation fn-dropdown /deep/ fn-dropdown-header {
		font-size: 13px;
		}

		fn-metric-explorer-list fn-table {
		border-top: none;
		}
		@@ -73,6 +82,13 @@ fn-metric-explorer-list fn-table /deep/ table {
		border-bottom: none;
		}

		fn-metric-control /deep/ .metric-control,
		fn-metric-control /deep/ fn-dropdown /deep/ #dropdown_ui {
		font-size: 13px;
		}

		fn-metric-control /deep/ .metric-control {

		fn-table /deep/ tr th {
		border-bottom: 1px solid #dee0e3;
		font-weight: 500;

src/libfnord/fnord-metricdb/metric-explorer/metric-control.html

+10 −30

Original line number	Diff line number	Diff line
		@@ -11,21 +11,13 @@
		<style type='text/css'>
		fn-metric-control {
		display:block;
		width: 100%;
		height: 70px;
		background: #fff;
		height: 36px;
		overflow: hidden;
		border-bottom: 1px solid #dee0e3;
		}
		</style>
		<template id="fn-metric-control-base-tpl">
		<style type='text/css'>
		.left {
		float: left;
		}

		.right {
		float:right;
		}

		.group {
		height: 100%;
		float: left;
		@@ -56,26 +48,14 @@
		border-right: 1px solid rgb(226, 232, 237);
		}

		.group.aggregation_time_window fn-dropdown {
		float:left;
		margin-right: 20px;
		}

		.group.aggregation_time_window fn-dropdown:last-child {
		margin-right: 0;
		}

		.group.aggregation_type {
		border-right: 1px solid rgb(226, 232, 237);
		}

		.group b {
		font-weight: normal;
		font-size: 80%;
		line-height: 12px;
		font-weight: 500;
		display: block;
		margin-bottom: 6px;
		opacity: 0.7;
		}

		@@ -265,7 +245,7 @@
		}

		</style>
		<div class="left">
		<div class="metric-control">
		<div class="metric">
		<div class="view" name="header">
		<i class="fa fa-pencil-square-o" name="edit_btn"></i>
		@@ -280,7 +260,7 @@
		</div>
		<div class='group aggregation_type'>
		<b>Rollup</b>
		<fn-dropdown id='rollup' data-style="input small">
		<fn-dropdown id='rollup' data-style="inline">
		<fn-dropdown-header>Sum</fn-dropdown-header>
		<fn-dropdown-item data-value='value'>Value</fn-dropdown-item>
		<fn-dropdown-item data-value='sum'>Sum</fn-dropdown-item>
		@@ -289,8 +269,8 @@
		</fn-dropdown>
		</div>
		<div class='group aggregation_time_window'>
		<b>Time Window / Step</b>
		<fn-dropdown id='time_window' data-style="input small">
		<b>T<sub>Window</sub></b>
		<fn-dropdown id='time_window' data-style="inline">
		<fn-dropdown-header>5 seconds</fn-dropdown-header>
		<fn-dropdown-item data-value=1>1 second</fn-dropdown-item>
		<fn-dropdown-item data-value=5>5 seconds</fn-dropdown-item>
		@@ -307,7 +287,8 @@
		<fn-dropdown-item data-value=43200>12 hours</fn-dropdown-item>
		<fn-dropdown-item data-value=86400>24 hours</fn-dropdown-item>
		</fn-dropdown>
		<fn-dropdown id='time_step' data-style="input small">
		<b>T<sub>Step</sub></b>
		<fn-dropdown id='time_step' data-style="inline">
		<fn-dropdown-header>10 seconds</fn-dropdown-header>
		<fn-dropdown-item data-value=1>1 second</fn-dropdown-item>
		<fn-dropdown-item data-value=5>5 seconds</fn-dropdown-item>
		@@ -332,8 +313,7 @@
		<div class="group group_by">
		<b>Group by</b>
		</div>
		</div>
		<div class='right'>

		<fn-button id="control_btn" data-size="tiny">
		<i class="fa fa-times"></i>
		</fn-button>

src/libfnord/fnord-metricdb/metric-explorer/metric-explorer-preview.html

+7 −9

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		.navigation .item {
		vertical-align: middle;
		margin-left: 0.8%;
		float: left;
		}

		.navigation .item:first-child {
		@@ -113,11 +114,6 @@
		display:block;
		}

		fn-metric-control {
		border-bottom: 1px solid #ddd;
		border-top: 1px solid #ddd;
		}

		fn-modal-content code {
		word-wrap: break-word;
		}
		@@ -130,13 +126,14 @@
		<fn-loader>
		<div class="navigation">
		<div class="item left">
		<span class="text">View</span>
		<span class="text">Display: </span>
		<fn-dropdown data-style="inline small" id="view" >
		<fn-dropdown-header>Chart</fn-dropdown-header>
		<fn-dropdown-item data-value='svg'>Chart</fn-dropdown-item>
		<fn-dropdown-item data-value='csv'>Raw</fn-dropdown-item>
		</fn-dropdown>
		</div>

		<div class="item left">
		<span class="text">Chart Settings</span>
		<fn-dropdown data-style="inline small" id="chart_settings">
		@@ -146,16 +143,17 @@
		<fn-dropdown-item data-value='inverted'>Inverted</fn-dropdown-item>
		</fn-dropdown>
		</div>
		<fn-button id="embed_btn" class="item left" data-size='tiny'>

		<fn-button id="embed_btn" class="item left" data-size='tiny' style="display:none;">
		<i class='fa fa-share'></i>Embed
		</fn-button>
		<fn-button id="auto_refresh" class="item left" data-toggle data-size='tiny'>
		<fn-button id="auto_refresh" class="item left" data-toggle data-size='tiny' style="display:none;">
		<i class='fa fa-refresh'></i>Auto Refresh
		</fn-button>

		<div class="item right">
		<fn-date-time-selector>
		<fn-dropdown id='timerange' data-style="input small">
		<fn-dropdown id='timerange' data-style="inline">
		<fn-dropdown-header>1 hour</fn-dropdown-header>
		<fn-dropdown-item data-value=300>5 minutes</fn-dropdown-item>
		<fn-dropdown-item data-value=900>15 minutes</fn-dropdown-item>

Admin message