Skip to content

Commit e74219a

Browse files
committed
Merged changes and builded
1 parent f6de91e commit e74219a

7 files changed

Lines changed: 22 additions & 13 deletions

File tree

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-files/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@ Component.register('frosh-tools-tab-files', {
3131
primary: true
3232
}
3333
];
34-
}
34+
},
35+
36+
isLoadingClass() {
37+
return {
38+
'is-loading': this.isLoading
39+
}
40+
},
3541
},
3642

3743
methods: {

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-files/style.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
.frosh-tools-tab-files__files-card {
44
.sw-card__content {
5-
padding: 0;
6-
75
.sw-alert {
86
margin: 30px;
97
}
8+
}
109

11-
.sw-data-grid {
12-
border-top: 1px solid $color-gray-300;
10+
&:not(.is-loading) {
11+
.sw-card__content {
12+
padding: 0;
1313
}
1414
}
1515
}

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-files/template.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<sw-card-view>
2-
<sw-card class="frosh-tools-tab-files__files-card" :title="$tc('frosh-tools.tabs.files.title')" :isLoading="isLoading" :large="true">
2+
<sw-card class="frosh-tools-tab-files__files-card" :class="isLoadingClass" :title="$tc('frosh-tools.tabs.files.title')" :isLoading="isLoading" :large="true">
33
<sw-alert variant="error" v-if="items.error">{{ items.error }}</sw-alert>
44

55
<sw-alert variant="success" v-if="items.ok">{{ $tc('frosh-tools.tabs.files.allFilesOk') }}</sw-alert>

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-logs/style.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
padding: 0;
44
}
55

6+
.sw-card__toolbar {
7+
display: grid;
8+
grid-template-columns: auto 1fr;
9+
grid-gap: 20px;
10+
}
11+
612
.sw-single-select {
713
margin: 0;
814
}

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-logs/template.twig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<sw-card-view>
22
<sw-card class="frosh-tools-tab-logs__logs-card" :title="$tc('frosh-tools.tabs.logs.title')" :isLoading="isLoading" :large="true">
33
<template #toolbar>
4+
<!-- @todo: Make the refresh button fancy -->
5+
<sw-button variant="ghost" @click="refresh"><sw-icon :small="true" name="default-arrow-360-left"></sw-icon></sw-button>
46
<sw-single-select
57
:options="logFiles"
68
:isLoading="isLoading"
@@ -12,11 +14,6 @@
1214
></sw-single-select>
1315
</template>
1416

15-
<template #toolbar>
16-
<!-- @todo: Make the refresh button fancy -->
17-
<sw-button variant="ghost" @click="refresh"><sw-icon :small="true" name="default-arrow-360-left"></sw-icon></sw-button>
18-
</template>
19-
2017
<sw-data-grid
2118
:showSelection="false"
2219
:showActions="false"

src/Resources/public/administration/css/frosh-tools.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Resources/public/administration/js/frosh-tools.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)