Skip to content

N
nexpie-grafana-theme
Commit ddd5e5ae by Torkel Ödegaard
Options

tech: updated react-grid-layout to latest official release, closes #12100

parent c67d72db
Showing with 22 additions and 38 deletions
package.json
...@@ -134,11 +134,11 @@ ...@@ -134,11 +134,11 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"angular": "^1.6.6", "angular": "1.6.6",
"angular-bindonce": "^0.3.1", "angular-bindonce": "^0.3.1",
"angular-native-dragdrop": "^1.2.2", "angular-native-dragdrop": "^1.2.2",
"angular-route": "^1.6.6", "angular-route": "1.6.6",
"angular-sanitize": "^1.6.6", "angular-sanitize": "1.6.6",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"baron": "^3.0.3", "baron": "^3.0.3",
"brace": "^0.10.0", "brace": "^0.10.0",
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"react": "^16.2.0", "react": "^16.2.0",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
"react-grid-layout-grafana": "0.16.0", "react-grid-layout": "0.16.6",
"react-highlight-words": "^0.10.0", "react-highlight-words": "^0.10.0",
"react-popper": "^0.7.5", "react-popper": "^0.7.5",
"react-select": "^1.1.0", "react-select": "^1.1.0",
......
public/app/features/dashboard/dashgrid/DashboardGrid.tsx
import React from 'react'; import React from 'react';
import ReactGridLayout from 'react-grid-layout-grafana'; import ReactGridLayout from 'react-grid-layout';
import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT } from 'app/core/constants'; import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT } from 'app/core/constants';
import { DashboardPanel } from './DashboardPanel'; import { DashboardPanel } from './DashboardPanel';
import { DashboardModel } from '../dashboard_model'; import { DashboardModel } from '../dashboard_model';
......
public/img/resize-handle-white.svg deleted 100644 → 0
<?xml version="1.0" standalone="no"?>
<!-- Generator: Adobe Fireworks CS6, Export SVG Extension by Aaron Beall (http://fireworks.abeall.com) . Version: 0.6.1 -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg id="Untitled-Page%201" viewBox="0 0 6 6" style="background-color:#ffffff00" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
x="0px" y="0px" width="6px" height="6px"
>
<g opacity="0.302">
<path d="M 6 6 L 0 6 L 0 4.2 L 4 4.2 L 4.2 4.2 L 4.2 0 L 6 0 L 6 6 L 6 6 Z" fill="#FFFFFF"/>
</g>
</svg>
public/sass/components/_dashboard_grid.scss
@import '~react-grid-layout-grafana/css/styles.css'; @import '~react-grid-layout/css/styles.css';
@import '~react-resizable/css/styles.css'; @import '~react-resizable/css/styles.css';
.panel-in-fullscreen { .panel-in-fullscreen {
...@@ -44,11 +44,6 @@ ...@@ -44,11 +44,6 @@
border-right: 2px solid $gray-1; border-right: 2px solid $gray-1;
border-bottom: 2px solid $gray-1; border-bottom: 2px solid $gray-1;
} }
// temp fix since we use old commit of grid component
// this can be removed when we revert to non fork grid component
.react-grid-item > .react-resizable-handle {
background-image: url('../img/resize-handle-white.svg');
}
} }
.theme-light { .theme-light {
......
yarn.lock
...@@ -405,17 +405,17 @@ angular-native-dragdrop@^1.2.2: ...@@ -405,17 +405,17 @@ angular-native-dragdrop@^1.2.2:
version "1.2.2" version "1.2.2"
resolved "https://registry.yarnpkg.com/angular-native-dragdrop/-/angular-native-dragdrop-1.2.2.tgz#d646c6b75b131c48073c3f6e36a225b2726d8bae" resolved "https://registry.yarnpkg.com/angular-native-dragdrop/-/angular-native-dragdrop-1.2.2.tgz#d646c6b75b131c48073c3f6e36a225b2726d8bae"
angular-route@^1.6.6: angular-route@1.6.6:
version "1.6.10" version "1.6.6"
resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.6.10.tgz#4247a32eab19495624623e96c1626dfba17ebf21" resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.6.6.tgz#8c11748aa195c717b1b615a7e746442bfc7c61f4"
angular-sanitize@^1.6.6: angular-sanitize@1.6.6:
version "1.6.10" version "1.6.6"
resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.10.tgz#635a362afb2dd040179f17d3a5455962b2c1918f" resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.6.tgz#0fd065a19931517fbece66596d325d72b6e06041"
angular@^1.6.6: angular@1.6.6:
version "1.6.10" version "1.6.6"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.6.tgz#fd5a3cfb437ce382d854ee01120797978527cb64"
ansi-align@^2.0.0: ansi-align@^2.0.0:
version "2.0.0" version "2.0.0"
...@@ -8898,22 +8898,22 @@ react-dom@^16.2.0: ...@@ -8898,22 +8898,22 @@ react-dom@^16.2.0:
object-assign "^4.1.1" object-assign "^4.1.1"
prop-types "^15.6.0" prop-types "^15.6.0"
"react-draggable@^2.2.6 || ^3.0.3", react-draggable@^3.0.3: react-draggable@3.x, "react-draggable@^2.2.6 || ^3.0.3":
version "3.0.5" version "3.0.5"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz#c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz#c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d"
dependencies: dependencies:
classnames "^2.2.5" classnames "^2.2.5"
prop-types "^15.6.0" prop-types "^15.6.0"
react-grid-layout-grafana@0.16.0: react-grid-layout@0.16.6:
version "0.16.0" version "0.16.6"
resolved "https://registry.yarnpkg.com/react-grid-layout-grafana/-/react-grid-layout-grafana-0.16.0.tgz#12242153fcd0bb80a26af8e41694bc2fde788b3a" resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.6.tgz#9b2407a2b946c2260ebaf66f13b556e1da4efeb2"
dependencies: dependencies:
classnames "2.x" classnames "2.x"
lodash.isequal "^4.0.0" lodash.isequal "^4.0.0"
prop-types "15.x" prop-types "15.x"
react-draggable "^3.0.3" react-draggable "3.x"
react-resizable "^1.7.5" react-resizable "1.x"
react-highlight-words@^0.10.0: react-highlight-words@^0.10.0:
version "0.10.0" version "0.10.0"
...@@ -8973,7 +8973,7 @@ react-reconciler@^0.7.0: ...@@ -8973,7 +8973,7 @@ react-reconciler@^0.7.0:
object-assign "^4.1.1" object-assign "^4.1.1"
prop-types "^15.6.0" prop-types "^15.6.0"
react-resizable@^1.7.5: react-resizable@1.x:
version "1.7.5" version "1.7.5"
resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.7.5.tgz#83eb75bb3684da6989bbbf4f826e1470f0af902e" resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.7.5.tgz#83eb75bb3684da6989bbbf4f826e1470f0af902e"
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment