IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: final fixes to new datasource page

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-10-06 19:22:16 +02:00
parent 8e2859625f
commit 2e4a1f317d
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/features/datasources/state/actions.ts
View File

@ -82,21 +82,22 @@ export function loadDataSources(): ThunkResult<void> {
export function addDataSource(plugin: Plugin): ThunkResult<void> {
return async (dispatch, getStore) => {
let dataSources = getStore().dataSources.dataSources;
await dispatch(loadDataSources());
if (dataSources.length === 0) {
dispatch(loadDataSources());
const dataSources = getStore().dataSources.dataSources;
dataSources = getStore().dataSources.dataSources;
const newInstance = {
name: plugin.name,
type: plugin.id,
access: 'proxy',
isDefault: dataSources.length === 0,
};
if (nameExits(dataSources, newInstance.name)) {
newInstance.name = findNewName(dataSources, newInstance.name);
}
let name = plugin.name;
if (nameExits(dataSources, name)) {
name = findNewName(dataSources, name);
}
const result = await getBackendSrv().post('/api/datasources', { name: name, type: plugin.id, access: 'proxy' });
const result = await getBackendSrv().post('/api/datasources', newInstance);
dispatch(updateLocation({ path: `/datasources/edit/${result.id}` }));
};
}

2
public/sass/_variables.dark.scss
View File

@ -120,7 +120,7 @@ $code-tag-border: lighten($code-tag-bg, 2%);
// cards
$card-background: linear-gradient(135deg, #2f2f32, #262628);
$card-background-hover: linear-gradient(135deg, $dark-3, $dark-2);
$card-background-hover: linear-gradient(135deg, #343436, #262628);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, 0.1), 1px 1px 0 0 rgba(0, 0, 0, 0.3);
// Lists

3
public/sass/components/_add_data_source.scss
View File

@ -28,10 +28,11 @@
cursor: pointer;
background: $card-background;
box-shadow: $card-shadow;
color: $headings-color;
color: $text-color;
&:hover {
background: $card-background-hover;
color: $text-color-strong;
}
}

2
public/sass/components/_cards.scss
View File

@ -191,6 +191,7 @@
.card-item-wrapper {
padding: 0;
width: 100%;
margin-bottom: 3px;
}
.card-item-wrapper--clickable {
@ -198,7 +199,6 @@
}
.card-item {
border-bottom: 3px solid $page-bg;
border-radius: 2px;
}