YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

add global confirmation helper and update base scss

Browse source
This commit is contained in:
Axolotle 2020-12-16 12:11:31 +01:00
parent a77095f7a4
commit 9e747579e1
3 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main.js
View file

@ -20,6 +20,16 @@ Vue.use(BootstrapVue, {
} }
}) })
// Ugly wrapper for `$bvModal.msgBoxConfirm` to set default i18n button titles
// FIXME find or wait for a better way
Vue.prototype.$askConfirmation = function (message, props) {
return this.$bvModal.msgBoxConfirm(message, {
okTitle: this.$i18n.t('yes'),
cancelTitle: this.$i18n.t('cancel'),
...props
})
}
// Register global components // Register global components
const requireComponent = require.context('@/components/globals', true, /\.(js|vue)$/i) const requireComponent = require.context('@/components/globals', true, /\.(js|vue)$/i)
// For each matching file name... // For each matching file name...

11
app/src/scss/_variables.scss
View file

@ -48,6 +48,17 @@ $font-family-monospace: 'Fira Code', SFMono-Regular, Menlo, Monaco, Consolas, 'L
@include list-group-item-variant($color, theme-color-level($color, -11), theme-color-level($color, 6)); @include list-group-item-variant($color, theme-color-level($color, -11), theme-color-level($color, 6));
} }
// Add breakpoints for w-*
@each $breakpoint in map-keys($grid-breakpoints) {
@each $size, $length in $sizes {
@include media-breakpoint-up($breakpoint) {
.w-#{$breakpoint}-#{$size} {
width: $length !important;
}
}
}
}
/* /*
╭──────────────────────────────────────╮ ╭──────────────────────────────────────╮

47
app/src/scss/main.scss
View file

@ -33,22 +33,21 @@ body {
min-height: 100vh min-height: 100vh
} }
// Bootstrap overrides
.menu-list { .menu-list {
.list-group-item { .list-group-item {
padding: 0.75rem 0; padding: 0.75rem 0;
display: flex; display: flex;
align-items: center; align-items: center;
} }
h2 { h2 {
font-size: 1.25rem; font-size: 1.25rem;
font-weight: 400; font-weight: 400;
margin: 0; margin: 0;
} }
} }
// Bootstrap overrides
.list-group-item { .list-group-item {
padding: 0.75rem 1rem; padding: 0.75rem 1rem;
@ -73,17 +72,24 @@ body {
@include media-breakpoint-down(sm) { @include media-breakpoint-down(sm) {
flex-direction: column; flex-direction: column;
margin-bottom: 0.5rem;
padding-bottom: 0.5rem; &:not(:last-of-type) {
border-bottom: $border-width solid $card-border-color; margin-bottom: 0.5rem;
padding-bottom: 0.5rem;
border-bottom: $border-width solid $card-border-color;
}
} }
} }
.card + .card { .card + .card {
margin-top: 2rem; margin-top: 2rem;
} }
.card-deck .card + .card {
margin-top: 0;
}
.card-header { .card-header {
h2, h4 { h1, h2, h3, h4, h5, h6 {
margin: 0; margin: 0;
} }
@ -96,10 +102,6 @@ body {
padding: 1rem; padding: 1rem;
} }
.card-footer {
display: flex;
}
// collapse icon // collapse icon
.not-collapsed > .icon { .not-collapsed > .icon {
transform: rotate(-90deg); transform: rotate(-90deg);
@ -123,14 +125,7 @@ body {
} }
.log { .log {
.card-body { margin-bottom: 0;
padding: 0; padding: 1rem;
background-color: $light;
pre {
margin-bottom: 0;
padding: 1rem;
background-color: $light;
}
}
} }