Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update runtime app & usermenu styles #5769

Merged
merged 1 commit into from
Sep 2, 2021
Merged

Update runtime app & usermenu styles #5769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions packages/web-runtime/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</skip-to>
<div
v-if="user.isAuthenticated && !user.userReady"
class="loading-overlay"
class="loading-overlay uk-flex uk-flex-middle uk-flex-center"
:style="{
backgroundImage: 'url(' + configuration.theme.loginPage.backgroundImg + ')'
}"
>
<oc-spinner size="xlarge" :aria-label="$gettext('Loading')" class="uk-position-center" />
<oc-spinner size="xlarge" :aria-label="$gettext('Loading')" />
</div>
<template v-else-if="!showHeader">
<router-view name="fullscreen" />
Expand Down Expand Up @@ -402,7 +402,7 @@ export default {
}
}
</script>
<style>
<style lang="scss">
html,
body,
#web,
Expand Down Expand Up @@ -439,10 +439,6 @@ body,
overflow-y: auto;
}

#oc-header {
grid-area: header;
}

.oc-app-navigation {
position: sticky;
top: 0;
Expand All @@ -452,21 +448,18 @@ body,
.loading-overlay {
background-size: cover;
background-repeat: no-repeat;
background-position: 50%;
position: fixed;
top: 0;
left: 0;
width: 100%;
background-position: center;
height: 100%;
}

.loading-overlay .oc-spinner {
color: #0a264e;
}
width: 100%;

.loading-overlay .oc-spinner:after {
border: 10px solid;
border-bottom: 10px solid transparent;
.oc-spinner {
color: #0a264e;
display: inline-block;
&::after {
border: 10px solid;
border-bottom: 10px solid transparent;
}
}
}

@media only screen and (max-width: 960px) {
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/src/components/UserMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
>
<oc-grid flex>
<avatar-image
class="oc-topbar-personal-avatar uk-flex-inline uk-flex-center uk-flex-middle"
class="oc-topbar-personal-avatar uk-flex-inline uk-flex-center uk-flex-middle oc-px-s"
:width="24"
:userid="userId"
:user-name="userDisplayName"
Expand Down