Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions packages/design-system/src/styles/defaults.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
--oc-color-icon-text: #171C1F;
--oc-color-icon-video: rgb(4, 84, 89);
--oc-font-family: OpenCloud, Inter, sans-serif;
--oc-role-background: #FBFCFE;
--oc-role-background: #FFFFFF;
--oc-role-chrome: #20434F;
--oc-role-error: #BA1A1A;
--oc-role-error-container: #FFDAD6;
Expand Down Expand Up @@ -55,17 +55,17 @@
--oc-role-secondary-container: #CFE6F1;
--oc-role-secondary-fixed: #CFE6F1;
--oc-role-shadow: #000000;
--oc-role-surface: #FBFCFE;
--oc-role-surface: #FFFFFF;
--oc-role-surface-bright: #F8F9FB;
--oc-role-surface-container: #ECEEF0;
--oc-role-surface-container-high: #E7E8EA;
--oc-role-surface-container-highest: #E1E3E4;
--oc-role-surface-container-low: #F2F4F5;
--oc-role-surface-container: #F6F8FA;
--oc-role-surface-container-high: #F2F4F5;
--oc-role-surface-container-highest: #ECEEF0;
--oc-role-surface-container-low: #FBFCFE;
--oc-role-surface-container-lowest: #FFFFFF;
--oc-role-surface-dim: #D8DADC;
--oc-role-surface-tint: #715289;
--oc-role-surface-variant: #DBE4E8;
--oc-role-tertiary: #5A5C7E;
--oc-role-tertiary-container: #E0E0FF;
--oc-role-tertiary-fixed: #E0E0FF;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div
id="admin-settings-app-bar"
ref="appBarRef"
class="pb-2 px-4 bg-role-surface top-0 z-20"
class="pb-2 px-4 top-0 z-20"
:class="{ sticky: isSticky }"
>
<div class="flex justify-between items-center h-13">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Spaces view > loading states > should render spaces list after loading
<main class="flex app-content size-full rounded-l-xl">
<div class="admin-settings-wrapper flex-1 flex size-full flex-nowrap sm:flex-wrap">
<div id="admin-settings-view-wrapper" class="flex-1 size-full flex-wrap overflow-y-auto">
<div id="admin-settings-app-bar" class="pb-2 px-4 bg-role-surface top-0 z-20 sticky">
<div id="admin-settings-app-bar" class="pb-2 px-4 top-0 z-20 sticky">
<div class="flex justify-between items-center h-13">
<oc-breadcrumb-stub items="[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" mobilebreakpoint="sm" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
<!--v-if-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Users view > list view > renders initially warning if filters are manda
<main class="flex app-content size-full rounded-l-xl">
<div class="admin-settings-wrapper flex-1 flex size-full flex-nowrap sm:flex-wrap">
<div id="admin-settings-view-wrapper" class="flex-1 size-full flex-wrap overflow-y-auto">
<div id="admin-settings-app-bar" class="pb-2 px-4 bg-role-surface top-0 z-20 sticky">
<div id="admin-settings-app-bar" class="pb-2 px-4 top-0 z-20 sticky">
<div class="flex justify-between items-center h-13">
<oc-breadcrumb-stub items="[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" mobilebreakpoint="sm" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
<!--v-if-->
Expand Down Expand Up @@ -65,7 +65,7 @@ exports[`Users view > list view > renders list initially 1`] = `
<main class="flex app-content size-full rounded-l-xl">
<div class="admin-settings-wrapper flex-1 flex size-full flex-nowrap sm:flex-wrap">
<div id="admin-settings-view-wrapper" class="flex-1 size-full flex-wrap overflow-y-auto">
<div id="admin-settings-app-bar" class="pb-2 px-4 bg-role-surface top-0 z-20 sticky">
<div id="admin-settings-app-bar" class="pb-2 px-4 top-0 z-20 sticky">
<div class="flex justify-between items-center h-13">
<oc-breadcrumb-stub items="[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" mobilebreakpoint="sm" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
<!--v-if-->
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/components/AppBar/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<h1 class="sr-only" v-text="pageTitle" />
<oc-hidden-announcer :announcement="selectedResourcesAnnouncement" level="polite" />
<div
class="flex items-center files-app-bar-controls min-h-13"
class="flex items-center files-app-bar-controls min-h-12"
:class="{
'justify-between': breadcrumbs.length || hasSharesNavigation,
'justify-end': !breadcrumbs.length && !hasSharesNavigation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`AppBar component > renders > by default no breadcrumbs, no bulkactions,
<div class="files-topbar py-2 w-full">
<h1 class="sr-only">ExampleTitle</h1>
<oc-hidden-announcer-stub announcement="No items selected." level="polite"></oc-hidden-announcer-stub>
<div class="flex items-center files-app-bar-controls min-h-13 justify-end">
<div class="flex items-center files-app-bar-controls min-h-12 justify-end">
<!--v-if-->
<mobile-nav-stub></mobile-nav-stub>
<!--v-if-->
Expand All @@ -27,7 +27,7 @@ exports[`AppBar component > renders > if given, with content in the actions slot
<div class="files-topbar py-2 w-full">
<h1 class="sr-only">ExampleTitle</h1>
<oc-hidden-announcer-stub announcement="No items selected." level="polite"></oc-hidden-announcer-stub>
<div class="flex items-center files-app-bar-controls min-h-13 justify-end">
<div class="flex items-center files-app-bar-controls min-h-12 justify-end">
<!--v-if-->
<mobile-nav-stub></mobile-nav-stub>
<!--v-if-->
Expand All @@ -49,7 +49,7 @@ exports[`AppBar component > renders > if given, with content in the content slot
<div class="files-topbar py-2 w-full">
<h1 class="sr-only">ExampleTitle</h1>
<oc-hidden-announcer-stub announcement="No items selected." level="polite"></oc-hidden-announcer-stub>
<div class="flex items-center files-app-bar-controls min-h-13 justify-end">
<div class="flex items-center files-app-bar-controls min-h-12 justify-end">
<!--v-if-->
<mobile-nav-stub></mobile-nav-stub>
<!--v-if-->
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/src/layouts/Application.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<router-view
v-for="name in ['default', 'app', 'fullscreen']"
:key="`router-view-${name}`"
class="app-content w-full bg-role-surface rounded-l-xl transition-all duration-350 ease-[cubic-bezier(0.34,0.11,0,1.12)]"
class="app-content border w-full bg-role-surface rounded-l-xl transition-all duration-350 ease-[cubic-bezier(0.34,0.11,0,1.12)]"
:name="name"
/>
</template>
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/src/pages/account/accountLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<SidebarNav :nav-items="navItems" />
<main
id="account"
class="flex justify-center p-4 overflow-auto app-content w-full bg-role-surface rounded-l-xl transition-all duration-350 ease-[cubic-bezier(0.34,0.11,0,1.12)]"
class="flex justify-center p-4 overflow-auto app-content border w-full bg-role-surface rounded-l-xl transition-all duration-350 ease-[cubic-bezier(0.34,0.11,0,1.12)]"
>
<div class="w-full lg:w-3/4 xl:w-1/2">
<router-view />
Expand Down