diff --git a/package-lock.json b/package-lock.json index bfa3db6..0934a83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1159,9 +1159,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.0.55", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.55.tgz", - "integrity": "sha512-amHi8b2adsx3qyMNLQcYBnYX17xO0eD+zR8x+HcWMVnQ1zP5xVdrrR0e/KPs9qwsTZGX7kYHCuxSoEr0l1s6yg==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.4.0.tgz", + "integrity": "sha512-SPkKRrWUzS2TJaesnCumr+DkixODktBbWc2P8kMRNUFBe2hJ+U6vKGtxVmnoPQPcGmm3sJJ4ZC2ZHbeZX1DCHg==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 16a2dd2..875101a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ ] }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.0.55", + "@startinblox/hubl-styling-framework": "^1.4.0", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", "parcel-bundler": "^1.12.4", diff --git a/src/images/alien.svg b/src/images/alien.svg deleted file mode 100644 index 343f740..0000000 --- a/src/images/alien.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/src/images/alien.webp b/src/images/alien.webp new file mode 100644 index 0000000..25869ee Binary files /dev/null and b/src/images/alien.webp differ diff --git a/src/styles/content/_index.scss b/src/styles/content/_index.scss index b5906ab..668c345 100644 --- a/src/styles/content/_index.scss +++ b/src/styles/content/_index.scss @@ -97,7 +97,7 @@ main { min-width: 60%; position: fixed; top: 50px; - z-index: 1; + z-index: 3000; } } } diff --git a/src/styles/header/_index.scss b/src/styles/header/_index.scss index 2118caa..fc4cf26 100644 --- a/src/styles/header/_index.scss +++ b/src/styles/header/_index.scss @@ -1,7 +1,7 @@ header { height: 72px; position: fixed; - z-index: 999; + z-index: 10000; >div { display: flex; diff --git a/src/styles/index.scss b/src/styles/index.scss index 54c19e2..052147d 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -30,176 +30,9 @@ solid-display>div { } } -.send-display { - position: absolute; - right: 20px; - top: 20px; - z-index: 1; - - &::before { - margin-top: 4px; - margin-right: 0.5px; - } -} - -.button-modify-picture { - position: absolute; - bottom: 51px; - right: 30px; - z-index: 1; - - @media (max-width: 768px) { - right: 20px; - } -} - -.button-modify-profile { - position: absolute; - top: 40px; - right: 40px; - z-index: 1; - - @media (max-width: 768px) { - top: 20px; - right: 20px; - } -} - -.button-modify-skill { - position: absolute; - z-index: 1; - right: 40px; - - @media (max-width: 768px) { - right: 20px; - } -} - -.counter>div:nth-child(1) { - display: block !important; - position: relative; - text-align: center; - margin-right: 10px; - margin-bottom: 20px; - margin-left: 10px; - - &::before { - border-top: 1px solid #807A7A; - bottom: 0; - content: ''; - left: 0; - margin: 0 auto; - opacity: 0.2; - position: absolute; - right: 0; - top: 50%; - width: 100%; - } - &>span { - padding: 0 18.5px 0 21.5px; - background: #F6F6F6; - font-size: 16px; - position: relative; - color: var(--color-heading); - text-align: center; - } -} - -.pagination nav { - display: grid; - font-size: 20px; - margin-top: 56px; - grid-template-columns: auto 7% auto; - grid-template-rows: auto; - grid-template-areas: "left middle right"; - overflow: hidden; - text-align: center; - align-content: center; - width: 100%; - - @media(max-width: 768px) { - grid-template-columns: auto 27% auto; - } - - >[data-id="prev"] { - align-self: end; - grid-area: left; - justify-self: end; - line-height: 1; - } - - >[data-id="next"] { - align-self: baseline; - grid-area: right; - justify-self: start; - transform: rotate(180deg); - } - - button { - color: transparent; - - &:before { - background-color: var(--color-secondary); - content: ''; - display: inline-block; - height: 20px; - - mask: url('/lib/solid-directory/dist/assets/arrow-left-circle.svg') 1% 1% / 1px 1px no-repeat; - mask-size: cover; - -webkit-mask: url('/lib/solid-directory/dist/assets/arrow-left-circle.svg') 1% 1% / 1px 1px no-repeat; - -webkit-mask-size: cover; - width: 20px; - } - - &:disabled::before { - background-color: #5D7393; - opacity: 50%; - } - } - - span { - color: #5D7393; - font-size: 20px; - font-weight: 600; - line-height: 27px; - } -} -/* Member-profile */ -#member-profile .send-message { - right: 20px; - position: absolute; - bottom: 0; -} -#member-profile .member-bio, -#profile .member-bio { - - @media (min-width: 768.01px) { - max-width: 50%; - } -} - -.icon-location-pin::before, -.icon-bell::before { - margin-left: -3px; -} - -#member-profile, -#solid-profile-my-profile { - .avatar { - margin-left: auto; - margin-right: auto; - } - - @media (max-width: 768px) { - .member-bio { - max-width: none; - width: 100%; - } - } -} /* Job-offers */ .job-edit { diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 77168f7..e180005 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -47,6 +47,11 @@ nav#main__menu { vertical-align: middle; } + .menu-chevron { + float: right; + margin-top: 8px; + } + /* Ellipsis */ .ellipsis { @@ -71,6 +76,10 @@ nav#main__menu { } } + .badge { + float: right; + } + .divider { height: 1px; background-color: #D7DBE0; diff --git a/src/views/page-dashboard.pug b/src/views/page-dashboard.pug index c930878..3ed82c4 100644 --- a/src/views/page-dashboard.pug +++ b/src/views/page-dashboard.pug @@ -1,4 +1,4 @@ -div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-xsmall.sm-padding-top-medium.whitespace-normal +div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-xsmall.sm-padding-top-medium.bg-color-grey.whitespace-normal solid-dashboard( data-src=`${endpoints.dashboards || endpoints.get.dashboards}` ) diff --git a/src/views/partials/admin/page-admin-circles-create.pug b/src/views/partials/admin/page-admin-circles-create.pug index 6e41ae1..8648da4 100644 --- a/src/views/partials/admin/page-admin-circles-create.pug +++ b/src/views/partials/admin/page-admin-circles-create.pug @@ -1,5 +1,5 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey - h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div#loader-circles-create.loader.loader-top diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug index 189aae3..6abd3a7 100644 --- a/src/views/partials/admin/page-admin-circles.pug +++ b/src/views/partials/admin/page-admin-circles.pug @@ -19,9 +19,8 @@ solid-router(default-route='admin-circle-list', hidden) class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-name='text-semibold text-color-heading text-sub' - class-line2='block' - class-username='' + class-name='text-small text-semibold text-color-heading text-sub' + class-line2='block text-xsmall' widget-account.picture='hubl-user-avatar' @@ -29,7 +28,7 @@ solid-router(default-route='admin-circle-list', hidden) ) div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal @@ -80,11 +79,11 @@ solid-router(default-route='admin-circle-list', hidden) fields='cell1(circle.name, circle.description), cell2(circle.owner), cell3(leaveButton)' loader-id='loader-admin-circles' - class-cell1='segment table-cell padding-xsmall lg-third text-left text-top' - class-cell2='segment table-cell padding-top-xsmall padding-right-xlarge padding-bottom-xsmall padding-left-xlarge lg-third text-center text-left' - class-cell3='segment table-cell padding-xsmall lg-third text-center' + class-cell1='segment table-cell lg-third text-left text-top' + class-cell2='segment table-cell lg-third text-center text-left' + class-cell3='segment table-cell lg-third text-center' - class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis' action-leaveButton="joinButton" widget-leaveButton="hubl-admin-circle-leave-button" @@ -120,11 +119,11 @@ solid-router(default-route='admin-circle-list', hidden) fields='cell1(name, description), cell2(owner), cell3(members)' loader-id='loader-admin-circles' - class-cell1='segment table-cell padding-xsmall lg-third text-left text-top' - class-cell2='segment table-cell padding-top-xsmall padding-right-xlarge padding-bottom-xsmall padding-left-xlarge lg-third text-center text-left' - class-cell3='segment table-cell padding-xsmall lg-third text-center' + class-cell1='segment table-cell lg-third text-left text-top' + class-cell2='segment table-cell lg-third text-center text-left' + class-cell3='segment table-cell lg-third text-center' - class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis' widget-owner='hubl-circle-owner' widget-members="hubl-admin-circle-join-button" diff --git a/src/views/partials/admin/page-admin-communities.pug b/src/views/partials/admin/page-admin-communities.pug index 14aa503..a59f450 100644 --- a/src/views/partials/admin/page-admin-communities.pug +++ b/src/views/partials/admin/page-admin-communities.pug @@ -16,7 +16,7 @@ solid-widget(name='hubl-action-community') #admin-communities-list(hidden, data-view="admin-communities-list") div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal @@ -36,10 +36,10 @@ solid-widget(name='hubl-action-community') fields='cell1(community.name), cell2(community)' loader-id='loader-admin-community' - class-cell1='segment table-cell padding-medium lg-half text-center' - class-cell2='segment table-cell padding-medium lg-half text-center' + class-cell1='segment table-cell lg-half text-center' + class-cell2='segment table-cell lg-half text-center' - class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large' + class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis' widget-community='hubl-action-community' order-asc='community.name' diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 6653ac3..aff9cd1 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -1,5 +1,5 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey - h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div#loader-projects-create.loader.loader-top diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug index bf6906b..1eccbdb 100644 --- a/src/views/partials/admin/page-admin-projects.pug +++ b/src/views/partials/admin/page-admin-projects.pug @@ -9,7 +9,7 @@ solid-router(default-route='admin-project-list', hidden) #admin-project-list(hidden, data-view="admin-project-list") div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal @@ -59,9 +59,8 @@ solid-router(default-route='admin-project-list', hidden) class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-name='text-semibold text-color-heading text-sub' - class-line2='block' - class-username='' + class-name='text-small text-semibold text-color-heading text-sub' + class-line2='block text-xsmall' widget-account.picture='hubl-user-avatar' @@ -96,12 +95,12 @@ solid-router(default-route='admin-project-list', hidden) fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)' loader-id='loader-admin-projects' - class-cell1='segment table-cell padding-xsmall lg-quarter text-left' - class-cell2='segment table-cell padding-xsmall lg-quarter text-left' - class-cell3='segment table-cell padding-top-xsmall padding-right-small padding-bottom-xsmall padding-left-small lg-quarter text-left' - class-cell4='segment table-cell padding-xsmall lg-quarter text-center' + class-cell1='segment table-cell lg-quarter text-left' + class-cell2='segment table-cell lg-quarter text-left' + class-cell3='segment table-cell lg-quarter text-left' + class-cell4='segment table-cell lg-quarter text-center' - class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis' action-leaveButton="joinButton" widget-leaveButton="hubl-admin-project-leave-button" @@ -140,12 +139,12 @@ solid-router(default-route='admin-project-list', hidden) fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)' loader-id='loader-admin-projects' - class-cell1='segment table-cell padding-xsmall lg-quarter text-left' - class-cell2='segment table-cell padding-xsmall lg-quarter text-left' - class-cell3='segment table-cell padding-top-xsmall padding-right-small padding-bottom-xsmall padding-left-small lg-quarter text-left' - class-cell4='segment table-cell padding-xsmall lg-quarter text-center' + class-cell1='segment table-cell lg-quarter text-left' + class-cell2='segment table-cell lg-quarter text-left' + class-cell3='segment table-cell lg-quarter text-left' + class-cell4='segment table-cell lg-quarter text-center' - class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis' action-joinButton="joinButton" # Workaround: I need members two times widget-joinButton="hubl-admin-project-join-button" diff --git a/src/views/partials/admin/page-admin-users-create.pug b/src/views/partials/admin/page-admin-users-create.pug index 24c0ffc..8d6ae22 100644 --- a/src/views/partials/admin/page-admin-users-create.pug +++ b/src/views/partials/admin/page-admin-users-create.pug @@ -1,5 +1,5 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.padding-large.border-bottom.border-color-grey - h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') + h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug index 98e2c60..025b497 100644 --- a/src/views/partials/circle/page-circle-edit.pug +++ b/src/views/partials/circle/page-circle-edit.pug @@ -95,15 +95,15 @@ div.segment.lg-full.padding-large.whitespace-normal fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self' loader-id='loader-circle-edit' - class-cell='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-two-third labelled-avatar two-lines text-left' - class-self='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-third text-center' + class-cell='segment table-cell lg-two-third labelled-avatar two-lines text-left' + class-self='segment table-cell lg-third text-center' class-segment1='segment' class-user.account.picture='avatar' class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-user.name='text-semibold text-color-heading text-sub' + class-user.name='text-small text-semibold text-color-heading text-sub' class-is_admin='segment margin-left-medium tag color-primary' class-line2='block' class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall' @@ -120,4 +120,4 @@ div.segment.lg-full.padding-large.whitespace-normal ) //- Only to show the table grid - div.segment.padding-top-xsmall.padding-right-medium.padding-bottom-xsmall.padding-left-medium.table-cell.lg-third + div.segment.table-cell.lg-third diff --git a/src/views/partials/circle/page-circle-profile.pug b/src/views/partials/circle/page-circle-profile.pug index 812502a..4468c38 100644 --- a/src/views/partials/circle/page-circle-profile.pug +++ b/src/views/partials/circle/page-circle-profile.pug @@ -109,7 +109,7 @@ solid-router(default-route='circle-profile', hidden) class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-user.name='text-semibold text-color-heading text-sub' + class-user.name='text-small text-semibold text-color-heading text-sub' class-line2='block' class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall' class-user.communities='lg-full' diff --git a/src/views/partials/header.pug b/src/views/partials/header.pug index b983eca..8766e85 100644 --- a/src/views/partials/header.pug +++ b/src/views/partials/header.pug @@ -46,16 +46,16 @@ div li.segment.padding-small.border-bottom.border-color-grey div(data-trans='header.admin') ul.text-normal - if (endpoints.users || (endpoints.get && endpoints.get.users)) - solid-route.text-hover(name='admin-communities') + if endpoints.get.users + solid-link.text-hover(next='admin-communities') li.segment.padding-top-small a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community') - if endpoints.circles || (endpoints.get && endpoints.get.circles) - solid-route.text-hover(name='admin-circles') + if endpoints.get.circles + solid-link.text-hover(next='admin') li.segment.padding-top-small a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles') - if endpoints.projects || (endpoints.get && endpoints.get.projects) - solid-route.text-hover(name='admin-projects') + if endpoints.get.projects + solid-link.text-hover(next='admin-projects') li.segment.padding-top-small a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects') li.border-bottom.border-color-grey diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index b6a92a3..e5bd2e5 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -102,52 +102,50 @@ solid-widget(name='hubl-menu-fix-url-project') solid-router#navbar-router(default-route='dashboard') - if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) + if endpoints.get.dashboards solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='dashboard') div.segment.margin-right-xxsmall div.icon.icon-small.icon-home div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.dashboard") div.divider - if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + if publicDirectory && endpoints.get.users solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='members') div.segment.margin-right-xxsmall div.icon.icon-small.icon-people div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.profileDirectory") div.divider - if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) + if endpoints.get.joboffers solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='job-offers', rdf-type='hd:joboffer') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-briefcase div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.jobBoard") div.divider - if endpoints.resources || (endpoints.get && endpoints.get.resources) + if endpoints.get.resources solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='resources') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-docs div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.resources") div.divider - if endpoints.polls || (endpoints.get && endpoints.get.polls) + if endpoints.get.polls solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='polls') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-bubbles div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.gov") div.divider - if endpoints.events || (endpoints.get && endpoints.get.events) + if endpoints.get.events solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='events') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-calendar div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") div.divider - if endpoints.projects || (endpoints.get && endpoints.get.projects) + if endpoints.get.projects div.menu-wrapper - solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active - //- (next='admin-project-list') + solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-project-list') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-folder-alt div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects") div.menu-chevron.segment - div.icon-arrow-up - //- div.menu-icon.icon-arrow-right-circle + div.icon-arrow-right-circle solid-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification div#loader-projects.loader.loader-menu @@ -167,16 +165,14 @@ solid-router#navbar-router(default-route='dashboard') order-asc="project.customer.name" ) div.divider - if endpoints.circles || (endpoints.get && endpoints.get.circles) + if endpoints.get.circles div.menu-wrapper - solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active - //- (next='admin-circle-list') + solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-circle-list') div.segment.margin-right-xxsmall div.segment.icon.icon-small.icon-folder-alt div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles") div.menu-chevron.segment - div.icon-arrow-up - //- div.menu-icon.icon-arrow-right-circle + div.menu-icon.icon-arrow-right-circle solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification div#loader-circles.loader.loader-menu diff --git a/src/views/partials/notifications/message-circle.pug b/src/views/partials/notifications/message-circle.pug index e0136ff..761a4d8 100644 --- a/src/views/partials/notifications/message-circle.pug +++ b/src/views/partials/notifications/message-circle.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='hd:circle') template .solid-notification__avatar - | ${await author['account.foaf:depiction'] ? `` : ``} + | ${await author['account.foaf:depiction'] ? `` : ``} .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side diff --git a/src/views/partials/notifications/message-private.pug b/src/views/partials/notifications/message-private.pug index 9825d74..1dba1f5 100644 --- a/src/views/partials/notifications/message-private.pug +++ b/src/views/partials/notifications/message-private.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='foaf:user') template .solid-notification__avatar - | ${await author['account.foaf:depiction'] ? `` : ``} + | ${await author['account.foaf:depiction'] ? `` : ``} .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side(data-trans='notification.private.private') diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index efed341..ac75f49 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -103,15 +103,15 @@ div.segment.lg-full.padding-large.whitespace-normal fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self' loader-id='loader-project-edit' - class-cell='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-two-third labelled-avatar two-lines text-left' - class-self='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-third text-center' + class-cell='segment table-cell lg-two-third labelled-avatar two-lines text-left' + class-self='segment table-cell lg-third text-center' class-segment1='segment' class-user.account.picture='avatar' class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-user.name='text-semibold text-color-heading text-sub' + class-user.name='text-small text-semibold text-color-heading text-sub' class-is_admin='segment margin-left-medium tag color-primary' class-line2='block' class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall' diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index 5f9da7a..f2fc3cf 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -105,7 +105,7 @@ solid-router(default-route='project-profile', hidden) class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-user.name='text-semibold text-color-heading text-sub' + class-user.name='text-small text-semibold text-color-heading text-sub' class-line2='block' class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall' class-user.communities='lg-full' diff --git a/src/views/partials/widgets/hubl-captain.pug b/src/views/partials/widgets/hubl-captain.pug index 5efa4d7..6e9a435 100644 --- a/src/views/partials/widgets/hubl-captain.pug +++ b/src/views/partials/widgets/hubl-captain.pug @@ -13,7 +13,7 @@ solid-widget(name='hubl-captain') class-segment2='segment lg-three-quarter margin-left-xsmall' class-line1='block' - class-name='text-semibold text-color-heading text-sub' + class-name='text-small text-semibold text-color-heading text-sub' class-line2='block' class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall' class-communities='lg-full' diff --git a/src/views/partials/widgets/hubl-user-avatar.pug b/src/views/partials/widgets/hubl-user-avatar.pug index f41f0b2..1548cd3 100644 --- a/src/views/partials/widgets/hubl-user-avatar.pug +++ b/src/views/partials/widgets/hubl-user-avatar.pug @@ -1,2 +1,2 @@ solid-widget(name='hubl-user-avatar') - template ${value ? `` : ``} \ No newline at end of file + template ${value ? `` : ``} \ No newline at end of file