Преглед на файлове

Merge branch 'inline_styles' of github.com:mikhailov/grafana into mikhailov-inline_styles

Torkel Ödegaard преди 11 години
родител
ревизия
9245cd6aae
променени са 2 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 1 1
      src/app/partials/dashboard.html
  2. 6 0
      src/css/less/grafana.less

+ 1 - 1
src/app/partials/dashboard.html

@@ -14,7 +14,7 @@
 	<div class="main-view-container">
 	<div class="main-view-container">
 		<div class="grafana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" row-height>
 		<div class="grafana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" row-height>
 			<div class="row-control">
 			<div class="row-control">
-				<div class="row-control-inner" style="padding:0px;margin:0px;position:relative;">
+				<div class="row-control-inner">
 					<div class="row-close" ng-show="row.collapse" data-placement="bottom" >
 					<div class="row-close" ng-show="row.collapse" data-placement="bottom" >
 						<div class="row-close-buttons">
 						<div class="row-close-buttons">
 							<span class="row-button bgPrimary" ng-click="toggle_row(row)">
 							<span class="row-button bgPrimary" ng-click="toggle_row(row)">

+ 6 - 0
src/css/less/grafana.less

@@ -7,6 +7,12 @@
 @import "panel.less";
 @import "panel.less";
 @import "forms.less";
 @import "forms.less";
 
 
+.row-control-inner {
+  padding:0px;
+  margin:0px;
+  position:relative;
+}
+
 .hide-controls {
 .hide-controls {
   padding: 0;
   padding: 0;
   .row-control-inner {
   .row-control-inner {