cleanup(sass): removed tight-form styles

docs/sources/datasources/plugin_api.md

@@ -30,11 +30,5 @@ Even though the data source type name is with lowercase `g`, the directive uses
 that is how angular directives needs to be named in order to match an element with name `<metric-query-editor-graphite />`.
 You also specify the query controller here instead of in the query.editor.html partial like before.
 
-### query.editor.html
-
-This partial needs to be updated, remove the `np-repeat` this is done in the outer partial now,m the query.editor.html
-should only render a single query. Take a look at the Graphite or InfluxDB partials for `query.editor.html` for reference.
-You should also add a `tight-form-item` with `{{target.refId}}`, all queries needs to be assigned a letter (`refId`).
-These query reference letters are going to be utilized in a later feature.
 
 

public/app/features/dashboard/partials/globalAlerts.html

@@ -1,282 +0,0 @@
-<topnav title="Alerting" subnav="false">
-  <ul class="nav">
-    <li class="active" ><a href="global-alerts">Global Alerts</a></li>
-  </ul>
-</topnav>
-
-<div class="page-container">
-  <div class="page-wide">
-    <h1>Global alerts</h1>
-
-    <div class="filter-controls-filters">
-      <div class="tight-form last">
-        <ul class="tight-form-list">
-          <li class="tight-form-item">Filters:</li>
-          <li class="tight-form-item">Alert State</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
-          <li class="tight-form-item">Dashboards</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
-          <li class="tight-form-item">
-            <a class="pointer">
-              <i class="fa fa-pencil"></i>
-            </a>
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-    </div>
-    <ul class="filter-controls-actions">
-      <li>
-        <div class="dropdown">
-          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-            <input class="cr1" id="state-enabled" type="checkbox">
-            <label for="state-enabled" class="cr1"></label> <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" role="menu">
-            <li><a>All</a></li>
-          </ul>
-        </div>
-      </li>
-      <li>
-        <div class="dropdown">
-          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
-            Bulk Actions &nbsp; <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" role="menu">
-            <li><a>Update notifications</a></li>
-          </ul>
-        </div>
-      </li>
-      <li>
-        <button class="btn btn-inverse" data-toggle="dropdown">
-          <i class="fa fa-fw fa-th-large"></i> New Dashboard from selected
-        </button>
-      </li>
-      <li>
-        <span class="filter-controls-actions-selected">2 selected, showing 6 of 6 total</span>
-      </li>
-    </ul>
-    <ul class="filter-list">
-      <li>
-        <ul class="filter-list-card">
-          <li class="filter-list-card-select">
-            <input class="cr1" id="alert1" type="checkbox">
-            <label for="alert1" class="cr1"></label>
-          </li>
-          <li>
-            <div class="filter-list-card-controls">
-              <div class="filter-list-card-links">
-                <span class="filter-list-card-link"><i class="fa fa-fw fa-th-large"></i>: <a href="">OpSec Super Sekret</a></span>
-                <span class="filter-list-card-link">Panel: <a href="">Prod CPU Data Writes</a></span>
-              </div>
-              <div class="filter-list-card-config">
-                <a href="#"><i class="fa fa-cog"></i></a>
-              </div>
-              <div class="filter-list-card-expand" ng-click="alert1.expanded = !alert1.expanded">
-                <i class="fa fa-angle-right" ng-show="!alert1.expanded"></i>
-                <i class="fa fa-angle-down" ng-show="alert1.expanded"></i>
-              </div>
-            </div>
-            <span class="filter-list-card-title">Prod CPU Data Writes</span>
-            <span class="filter-list-card-status">
-              <span class="filter-list-card-state online">Online</span> for 19 hours
-            </span>
-          </li>
-        </ul>
-        <div class="filter-list-card-details" ng-show="alert1.expanded">
-          <h5 class="filter-list-card-details-heading">Alert query <a>configure alerting</a></h5>
-          <div class="tight-form last">
-            <ul class="tight-form-list">
-              <li class="tight-form-item" style="min-width: 15px; text-align: center">A</li>
-              <li class="tight-form-item">apps</li>
-              <li class="tight-form-item"><i class="fa fa-asterisk"><i></i></i></li>
-              <li class="tight-form-item">fakesite</li>
-              <li class="tight-form-item">counters</li>
-              <li class="tight-form-item">requests</li>
-              <li class="tight-form-item">count</li>
-              <li class="tight-form-item">scaleToSeconds(1)</li>
-              <li class="tight-form-item">aliasByNode(2)</li>
-            </ul>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </li>
-      <li>
-        <ul class="filter-list-card">
-          <li class="filter-list-card-select">
-            <input class="cr1" id="alert2" type="checkbox" checked>
-            <label for="alert2" class="cr1"></label>
-          </li>
-          <li>
-            <div class="filter-list-card-controls">
-              <div class="filter-list-card-links">
-                <span class="filter-list-card-link"><i class="fa fa-fw fa-th-large"></i>: <a href="">OpSec Insanely Super Duper Sekret</a></span>
-                <span class="filter-list-card-link">Panel: <a href="">client side full page load</a></span>
-              </div>
-              <div class="filter-list-card-config">
-                <a href="#"><i class="fa fa-cog"></i></a>
-              </div>
-              <div class="filter-list-card-expand" ng-click="alert2.expanded = !alert2.expanded">
-                <i class="fa fa-angle-right" ng-show="!alert2.expanded"></i>
-                <i class="fa fa-angle-down" ng-show="alert2.expanded"></i>
-              </div>
-            </div>
-            <span class="filter-list-card-title">Prod DB Reads</span>
-            <span class="filter-list-card-status">
-              <span class="filter-list-card-state warn">Warn</span> for 1 hour
-            </span>
-          </li>
-        </ul>
-        <div class="filter-list-card-details" ng-show="alert2.expanded">
-          <h5 class="filter-list-card-details-heading">Alert query <a>configure alerting</a></h5>
-          <div class="tight-form last">
-            <ul class="tight-form-list">
-              <li class="tight-form-item" style="min-width: 15px; text-align: center">A</li>
-              <li class="tight-form-item">apps</li>
-              <li class="tight-form-item"><i class="fa fa-asterisk"><i></i></i></li>
-              <li class="tight-form-item">fakesite</li>
-              <li class="tight-form-item">counters</li>
-              <li class="tight-form-item">requests</li>
-              <li class="tight-form-item">count</li>
-              <li class="tight-form-item">scaleToSeconds(1)</li>
-              <li class="tight-form-item">aliasByNode(2)</li>
-            </ul>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </li>
-      <li>
-        <ul class="filter-list-card">
-          <li class="filter-list-card-select">
-            <input class="cr1" id="alert3" type="checkbox" checked>
-            <label for="alert3" class="cr1"></label>
-          </li>
-          <li>
-            <div class="filter-list-card-controls">
-              <div class="filter-list-card-links">
-                <span class="filter-list-card-link"><i class="fa fa-fw fa-th-large"></i>: <a href="">OpSec Mildly Sekret</a></span>
-                <span class="filter-list-card-link">Panel: <a href="">Memory/CPU</a></span>
-              </div>
-              <div class="filter-list-card-config">
-                <a href="#"><i class="fa fa-cog"></i></a>
-              </div>
-              <div class="filter-list-card-expand" ng-click="alert3.expanded = !alert3.expanded">
-                <i class="fa fa-angle-right" ng-show="!alert3.expanded"></i>
-                <i class="fa fa-angle-down" ng-show="alert3.expanded"></i>
-              </div>
-            </div>
-            <span class="filter-list-card-title">Prod CPU Data Writes</span>
-            <span class="filter-list-card-status">
-              <span class="filter-list-card-state critical">Online</span> for 10 minutes
-            </span>
-          </li>
-        </ul>
-        <div class="filter-list-card-details" ng-show="alert3.expanded">
-          <h5 class="filter-list-card-details-heading">Alert query <a>configure alerting</a></h5>
-          <div class="tight-form last">
-            <ul class="tight-form-list">
-              <li class="tight-form-item" style="min-width: 15px; text-align: center">A</li>
-              <li class="tight-form-item">apps</li>
-              <li class="tight-form-item"><i class="fa fa-asterisk"><i></i></i></li>
-              <li class="tight-form-item">fakesite</li>
-              <li class="tight-form-item">counters</li>
-              <li class="tight-form-item">requests</li>
-              <li class="tight-form-item">count</li>
-              <li class="tight-form-item">scaleToSeconds(1)</li>
-              <li class="tight-form-item">aliasByNode(2)</li>
-            </ul>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </li>
-      <li>
-        <ul class="filter-list-card">
-          <li class="filter-list-card-select">
-            <input class="cr1" id="alert4" type="checkbox">
-            <label for="alert4" class="cr1"></label>
-          </li>
-          <li>
-            <div class="filter-list-card-controls">
-              <div class="filter-list-card-links">
-                <span class="filter-list-card-link"><i class="fa fa-fw fa-th-large"></i>: <a href="">OpSec Super Sekret</a></span>
-                <span class="filter-list-card-link">Panel: <a href="">Stacked lines</a></span>
-              </div>
-              <div class="filter-list-card-config">
-                <a href="#"><i class="fa fa-cog"></i></a>
-              </div>
-              <div class="filter-list-card-expand" ng-click="alert4.expanded = !alert4.expanded">
-                <i class="fa fa-angle-right" ng-show="!alert4.expanded"></i>
-                <i class="fa fa-angle-down" ng-show="alert4.expanded"></i>
-              </div>
-            </div>
-            <span class="filter-list-card-title">Critical Thing</span>
-            <span class="filter-list-card-status">
-              <span class="filter-list-card-state online">Online</span> for 5 weeks
-            </span>
-          </li>
-        </ul>
-        <div class="filter-list-card-details" ng-show="alert4.expanded">
-          <h5 class="filter-list-card-details-heading">Alert query <a>configure alerting</a></h5>
-          <div class="tight-form last">
-            <ul class="tight-form-list">
-              <li class="tight-form-item" style="min-width: 15px; text-align: center">A</li>
-              <li class="tight-form-item">apps</li>
-              <li class="tight-form-item"><i class="fa fa-asterisk"><i></i></i></li>
-              <li class="tight-form-item">fakesite</li>
-              <li class="tight-form-item">counters</li>
-              <li class="tight-form-item">requests</li>
-              <li class="tight-form-item">count</li>
-              <li class="tight-form-item">scaleToSeconds(1)</li>
-              <li class="tight-form-item">aliasByNode(2)</li>
-            </ul>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </li>
-      <li>
-        <ul class="filter-list-card">
-          <li class="filter-list-card-select">
-            <input class="cr1" id="alert5" type="checkbox">
-            <label for="alert5" class="cr1"></label>
-          </li>
-          <li>
-            <div class="filter-list-card-controls">
-              <div class="filter-list-card-links">
-                <span class="filter-list-card-link"><i class="fa fa-fw fa-th-large"></i>: <a href="">OpSec Public</a></span>
-                <span class="filter-list-card-link">Panel: <a href="">More Critical Thing</a></span>
-              </div>
-              <div class="filter-list-card-config">
-                <a href="#"><i class="fa fa-cog"></i></a>
-              </div>
-              <div class="filter-list-card-expand" ng-click="alert5.expanded = !alert5.expanded">
-                <i class="fa fa-angle-right" ng-show="!alert5.expanded"></i>
-                <i class="fa fa-angle-down" ng-show="alert5.expanded"></i>
-              </div>
-            </div>
-            <span class="filter-list-card-title">More Critical Thing</span>
-            <span class="filter-list-card-status">
-              <span class="filter-list-card-state online">Online</span> for 2 months
-            </span>
-          </li>
-        </ul>
-        <div class="filter-list-card-details" ng-show="alert5.expanded">
-          <h5 class="filter-list-card-details-heading">Alert query <a>configure alerting</a></h5>
-          <div class="tight-form last">
-            <ul class="tight-form-list">
-              <li class="tight-form-item" style="min-width: 15px; text-align: center">A</li>
-              <li class="tight-form-item">apps</li>
-              <li class="tight-form-item"><i class="fa fa-asterisk"><i></i></i></li>
-              <li class="tight-form-item">fakesite</li>
-              <li class="tight-form-item">counters</li>
-              <li class="tight-form-item">requests</li>
-              <li class="tight-form-item">count</li>
-              <li class="tight-form-item">scaleToSeconds(1)</li>
-              <li class="tight-form-item">aliasByNode(2)</li>
-            </ul>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </li>
-    </ul>
-  </div>
-</div>

public/app/features/panel/partials/query_editor_row.html

@@ -57,59 +57,3 @@
 	</div>
 </div>
 
-<div class="tight-form" ng-if="false">
-	<ul class="tight-form-list pull-right">
-		<li ng-show="ctrl.error" class="tight-form-item">
-			<a bs-tooltip="ctrl.error" style="color: rgb(229, 189, 28)" role="menuitem">
-				<i class="fa fa-warning"></i>
-			</a>
-		</li>
-		<li class="tight-form-item small" ng-show="ctrl.target.datasource">
-			<em>{{ctrl.target.datasource}}</em>
-		</li>
-		<li class="tight-form-item" ng-if="ctrl.toggleEditorMode">
-			<a class="pointer" tabindex="1" ng-click="ctrl.toggleEditorMode()">
-				<i class="fa fa-pencil"></i>
-			</a>
-		</li>
-		<li class="tight-form-item">
-			<div class="dropdown">
-				<a class="pointer dropdown-toggle" data-toggle="dropdown" tabindex="1">
-					<i class="fa fa-bars"></i>
-				</a>
-				<ul class="dropdown-menu pull-right" role="menu">
-					<li role="menuitem">
-						<a tabindex="1" ng-click="ctrl.duplicateQuery()">Duplicate</a>
-					</li>
-					<li role="menuitem">
-						<a tabindex="1" ng-click="ctrl.moveQuery(-1)">Move up</a>
-					</li>
-					<li role="menuitem">
-						<a tabindex="1" ng-click="ctrl.moveQuery(1)">Move down</a>
-					</li>
-				</ul>
-			</div>
-		</li>
-		<li class="tight-form-item last">
-			<a class="pointer" tabindex="1" ng-click="ctrl.removeQuery(target)">
-				<i class="fa fa-trash"></i>
-			</a>
-		</li>
-	</ul>
-
-	<ul class="tight-form-list">
-		<li class="tight-form-item" style="min-width: 15px; text-align: center">
-			{{ctrl.target.refId}}
-		</li>
-		<li>
-			<a class="tight-form-item" ng-click="ctrl.toggleHideQuery()" role="menuitem">
-				<i class="fa fa-eye"></i>
-			</a>
-		</li>
-	</ul>
-
-	<ul class="tight-form-list" ng-transclude>
-	</ul>
-
-	<div class="clearfix"></div>
-</div>

public/sass/_grafana.scss

@@ -50,7 +50,6 @@
 @import "components/tagsinput";
 @import "components/tables_lists";
 @import "components/search";
-@import "components/tightform";
 @import "components/gf-form";
 @import "components/sidemenu";
 @import "components/navbar";

public/sass/components/_query_editor.scss

@@ -67,3 +67,82 @@
   }
 }
 
+.grafana-metric-options {
+  margin-top: 25px;
+}
+
+.tight-form-func {
+  background: $tight-form-func-bg;
+
+  &.show-function-controls {
+    padding-top: 5px;
+    min-width: 100px;
+    text-align: center;
+  }
+}
+
+input[type="text"].tight-form-func-param {
+  background: transparent;
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+.tight-form-func-controls {
+  display: none;
+  text-align: center;
+
+  .fa-arrow-left {
+    float: left;
+    position: relative;
+    top: 2px;
+  }
+  .fa-arrow-right {
+    float: right;
+    position: relative;
+    top: 2px;
+  }
+  .fa-remove {
+    margin-left: 10px;
+  }
+}
+
+.grafana-metric-options {
+  margin-top: 25px;
+}
+
+.tight-form-func {
+  background: $tight-form-func-bg;
+
+  &.show-function-controls {
+    padding-top: 5px;
+    min-width: 100px;
+    text-align: center;
+  }
+}
+
+input[type="text"].tight-form-func-param {
+  background: transparent;
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+.tight-form-func-controls {
+  display: none;
+  text-align: center;
+
+  .fa-arrow-left {
+    float: left;
+    position: relative;
+    top: 2px;
+  }
+  .fa-arrow-right {
+    float: right;
+    position: relative;
+    top: 2px;
+  }
+  .fa-remove {
+    margin-left: 10px;
+  }
+}

public/sass/components/_tightform.scss

@@ -1,235 +0,0 @@
-.tight-form {
-  border-top: 1px solid $tight-form-border;
-  border-left: 1px solid $tight-form-border;
-  border-right: 1px solid $tight-form-border;
-  background: $tight-form-bg;
-
-  &.last {
-    border-bottom: 1px solid $tight-form-border;
-  }
-
-  &.borderless {
-    background: transparent;
-    border: none;
-  }
-
-  .checkbox-label {
-    display: inline;
-    padding-right: 4px;
-    margin-bottom: 0;
-    cursor: pointer;
-  }
-}
-
-.tight-form-container-no-item-borders {
-  border: 1px solid $tight-form-border;
-  border-bottom: none;
-
-  .tight-form, .tight-form-item, [type="text"].tight-form-input, [type="text"].tight-form-clear-input  {
-    border: none;
-  }
-}
-
-.spaced-form {
-  .tight-form {
-    margin: 7px 0;
-  }
-}
-
-.borderless {
-  .tight-form-item,
-  .tight-form-input {
-    border: none;
-  }
-}
-
-.tight-form-container {
-  border-bottom: 1px solid $tight-form-border;
-}
-
-.tight-form-btn {
-  padding: 7px 12px;
-}
-
-.tight-form-list {
-  list-style: none;
-  margin: 0;
-  >li {
-    float: left;
-  }
-}
-
-.tight-form-flex-wrapper {
-  display: flex;
-  flex-direction: row;
-  float: none !important;
-}
-
-.grafana-metric-options {
-  margin-top: 25px;
-}
-
-.tight-form-item {
-  padding: 8px 7px;
-  box-sizing: content-box;
-  display: inline-block;
-  font-weight: normal;
-  border-right: 1px solid $tight-form-border;
-  display: inline-block;
-  color: $text-color;
-
-  .has-open-function & {
-    padding-top: 25px;
-  }
-
-  .tight-form-disabled & {
-    color: $link-color-disabled;
-    a {
-      color: $link-color-disabled;
-    }
-  }
-
-  &:hover, &:focus {
-    text-decoration: none;
-  }
-
-  &a:hover {
-    background: $tight-form-func-bg;
-  }
-
-  &.last {
-    border-right: none;
-  }
-}
-
-
-.tight-form-item-icon {
-  i {
-    width: 15px;
-    text-align: center;
-    display: inline-block;
-  }
-}
-
-.tight-form-func {
-  background: $tight-form-func-bg;
-
-  &.show-function-controls {
-    padding-top: 5px;
-    min-width: 100px;
-    text-align: center;
-  }
-}
-
-input[type="text"].tight-form-func-param {
-  background: transparent;
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-input[type="text"].tight-form-clear-input {
-  padding: 8px 7px;
-  border: none;
-  margin: 0px;
-  background: transparent;
-  border-radius: 0;
-  border-right: 1px solid $tight-form-border;
-}
-
-[type="text"],
-[type="email"],
-[type="number"],
-[type="password"] {
-  &.tight-form-input {
-    background-color: $input-bg;
-    border: none;
-    border-right: 1px solid $tight-form-border;
-    margin: 0px;
-    border-radius: 0;
-    padding: 8px 6px;
-    height: 100%;
-    box-sizing: border-box;
-    &.last {
-      border-right: none;
-    }
-  }
-}
-
-input[type="checkbox"].tight-form-checkbox {
-  margin: 0;
-}
-
-.tight-form-textarea {
-  height: 200px;
-  margin: 0;
-  box-sizing: border-box;
-}
-
-select.tight-form-input {
-  border: none;
-  border-right: 1px solid $tight-form-border;
-  background-color: $input-bg;
-  margin: 0px;
-  border-radius: 0;
-  height: 36px;
-  padding: 9px 3px;
-  &.last {
-    border-right: none;
-  }
-}
-
-.tight-form-func-controls {
-  display: none;
-  text-align: center;
-
-  .fa-arrow-left {
-    float: left;
-    position: relative;
-    top: 2px;
-  }
-  .fa-arrow-right {
-    float: right;
-    position: relative;
-    top: 2px;
-  }
-  .fa-remove {
-    margin-left: 10px;
-  }
-}
-
-.tight-form-radio {
-  input[type="radio"] {
-    margin: 0;
-  }
-  label {
-    display: inline;
-  }
-}
-
-.tight-form-section {
-  margin-bottom: 20px;
-  margin-right: 40px;
-  vertical-align: top;
-  display: inline-block;
-  .tight-form {
-    margin-left: 20px;
-  }
-}
-
-.tight-form-align {
-  padding-left: 66px;
-}
-
-.tight-form-item-large { width: 115px; }
-.tight-form-item-xlarge { width: 150px; }
-.tight-form-item-xxlarge { width: 200px; }
-
-.tight-form-input.tight-form-item-xxlarge {
-  width: 215px;
-}
-
-.tight-form-inner-box {
-  margin: 20px 0 20px 148px;
-  display: inline-block;
-}