diff --git a/src/app/directives/arrayJoin.js b/src/app/directives/arrayJoin.js index 9f0900d880d..a2b5fbe59dd 100644 --- a/src/app/directives/arrayJoin.js +++ b/src/app/directives/arrayJoin.js @@ -31,4 +31,5 @@ function (angular, app, _) { } }; }); + }); diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index 151f40f264d..3bc49e3a1f0 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -5,7 +5,7 @@
+
+
+
+ +
+
+ + + + + +
+
+
+
+
    +
  • + Thresholds +
  • +
  • + Level 1 +
  • +
  • + +
  • +
  • + +
  • +
  • + Level 2 +
  • +
  • + +
  • +
  • + +
  • +
  • + Line mode +
  • +
+
+
+ +
+
+
+ +
+
+
+
+
    +
  • + Legend +
  • +
  • + Show: +
  • +
  • + Table: +
  • +
  • + Right side: +
  • +
  • + Hide empty: +
  • +
  • + Min: +
  • +
  • + Max: +
  • +
  • + Avg: +
  • +
  • + Total: +
  • +
  • + Current:
@@ -90,81 +184,3 @@
-
-
-
-
-
    -
  • - Thresholds -
  • -
  • - Level 1 -
  • -
  • - -
  • -
  • - -
  • -
  • - Level 2 -
  • -
  • - -
  • -
  • - -
  • -
  • - Line mode -
  • -
-
-
-
-
-
- -
-
-
-
-
    -
  • - Legend -
  • -
  • - Show: -
  • -
  • - Table: -
  • -
  • - Right side: -
  • -
  • - Hide empty: -
  • -
  • - Min: -
  • -
  • - Max: -
  • -
  • - Avg: -
  • -
  • - Total: -
  • -
  • - Current: -
  • -
-
-
-
-
-
- diff --git a/src/css/less/forms.less b/src/css/less/forms.less index e1affd09ae9..5018b9329da 100644 --- a/src/css/less/forms.less +++ b/src/css/less/forms.less @@ -15,7 +15,7 @@ input[type="checkbox"]+.cr1 { height: 19px; clear: none; text-indent: 2px; - margin-top: 4px; + margin: 0; padding: 0 0 0 20px; vertical-align:middle; background: url(@checkboxImageUrl) left top no-repeat;