diff --git a/docs/sources/datasources/plugin_api.md b/docs/sources/datasources/plugin_api.md
index cdcaca29460..2e2121ed21a 100644
--- a/docs/sources/datasources/plugin_api.md
+++ b/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 ``.
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.
diff --git a/public/app/features/dashboard/partials/globalAlerts.html b/public/app/features/dashboard/partials/globalAlerts.html
deleted file mode 100644
index 2c065c714fb..00000000000
--- a/public/app/features/dashboard/partials/globalAlerts.html
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-
-
-
-
-
Global alerts
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
-
-
diff --git a/public/app/features/panel/partials/query_editor_row.html b/public/app/features/panel/partials/query_editor_row.html
index e8dbe1434e7..55933bbbae8 100644
--- a/public/app/features/panel/partials/query_editor_row.html
+++ b/public/app/features/panel/partials/query_editor_row.html
@@ -57,59 +57,3 @@
-
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 28ab2922864..53a96cf9291 100644
--- a/public/sass/_grafana.scss
+++ b/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";
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index 4c807ed0e6b..f2d29572e37 100644
--- a/public/sass/components/_query_editor.scss
+++ b/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;
+ }
+}
diff --git a/public/sass/components/_tightform.scss b/public/sass/components/_tightform.scss
deleted file mode 100644
index 7c43854b06c..00000000000
--- a/public/sass/components/_tightform.scss
+++ /dev/null
@@ -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;
-}