diff --git a/src/dependencies.pug b/src/dependencies.pug
index 68df828e60474166afa17b57c88c41eb79e8e306..9c397d81a898ee34811624fa154f2507cf08e45a 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -36,4 +36,5 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
script(type="module" src="https://unpkg.com/@startinblox/core@0.6")
script(type="module" src="https://unpkg.com/@startinblox/router@0.6")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1")
+script(type="module" src="https://unpkg.com/@startinblox/component-notifications")
diff --git a/src/header.pug b/src/header.pug
index 73797308947aa7a8b25387f425319e8f63c3df5d..7d4200a37a08a1183de291a6cd367fc6227197c1 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -7,16 +7,14 @@
i#search-icon.icon-magnifier(aria-hidden='true')
i#close-search-icon.icon-close(aria-hidden='true')
-details
- summary#notifications-button
- div.menu-notification
- div 7
- #notifications
- include page-notifications.pug
+sib-notifications(
+ data-src=`${sdn}/users/4/`,
+ id-suffix="inbox"
+)
sib-display#profile(
+ data-src=`${sdn}/users/4/`,
data-fields='first_name, account.picture',
widget-account.picture='sib-display-img',
- bind-user
)
diff --git a/src/page-notifications.pug b/src/page-notifications.pug
deleted file mode 100644
index 68b15af74219f0af581489f66e86fa40ab811f07..0000000000000000000000000000000000000000
--- a/src/page-notifications.pug
+++ /dev/null
@@ -1,7 +0,0 @@
-div.frame
- h1 Notifications
-
- sib-display(
- bind-user
- data-fields='summary'
-)
\ No newline at end of file
diff --git a/src/page-project-profile.pug.orig b/src/page-project-profile.pug.orig
deleted file mode 100644
index 6b5516171bb90a680704c1c92727421c03fde6a7..0000000000000000000000000000000000000000
--- a/src/page-project-profile.pug.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-.frame
-
- include templates/template-customer.pug
- include templates/template-team.pug
-
- sib-display(
- data-fields='block-title, infos, block-lead, block-fee, block-customer, block-team',
- extra-context='{"project-profile":"${sdn}/projects/"}'
-
- set-block-title='const-title1, number, customer.name, const-title2, name, entitled, creationDate',
- value-const-title1='N°',
- value-const-title2='-',
- value-entitled='Creation date:'
-
- set-infos='block-description, block-logo',
- set-block-description='label-description, description',
- set-block-logo='customer.logo',
- value-label-description='DESCRIPTION:',
- widget-customer.logo='sib-display-img',
-
- set-block-fee='label-fee, details-cell, details-business',
- set-details-cell='cell-name, cell-fee, percentage',
- set-details-business='business-contribution, businessProvider, comma, businessProviderFee, percentage',
- value-label-fee='FEE:',
- value-cell-name='Happy Dev Paris:',
- value-cell-fee='5',
- value-percentage='%',
- value-business-contribution='Business contribution:',
- value-comma=', ',
-
- set-block-customer='label-customer, customer',
- value-label-customer='CUSTOMER INFORMATIONS:'
- widget-customer='customer-template',
-
- set-block-team='label-team, members',
- value-label-team='TEAM:'
- widget-members='team-template',
- multiple-members,
-
- bind-resources
- )
-<<<<<<< HEAD
-
- div(name='block-team')
- h2(name='label-team') Team:
- sib-display(
- id-suffix='members',
- data-fields='teammate-img, teammate-profile, teammate-job',
- set-teammate-img='user.account.picture',
- set-teammate-profile='user.first_name, user.last_name, user.groups',
- set-teammate-job='name',
- widget-user.account.picture='sib-display-img',
- widget-user.groups='sib-display-lookuplist',
- next='profile',
- bind-resources,
- )
-=======
->>>>>>> b8190bc... ui(all pages): MR!13 - upgrade to sib-core v0.6
diff --git a/src/styles/header.scss b/src/styles/header.scss
index 26d477cdea7e45b791288f8139cb30646637728b..94609f0b7c10af866a7e49aa64fb256af7c6f926 100644
--- a/src/styles/header.scss
+++ b/src/styles/header.scss
@@ -72,50 +72,7 @@
}
}
-details {
- summary::-webkit-details-marker {
- display: none;
- }
-
- #notifications-button {
- cursor: pointer;
- font-size: 3rem;
- list-style-type: none;
- position: relative;
- @include icon(bell);
-
- .menu-notification {
- //flex-basis: 3em;
- align-items: center;
- display: flex;
- flex-direction: column;
- flex-grow: 0;
- flex-shrink: 0;
- justify-content: center;
- left: 0.3rem;
- position: absolute;
- top: -0.3rem;
- width: 2em;
-
- @extend %notification;
- }
- }
- #notifications {
- bottom: 0;
- height: 0;
- left: 0;
- position: absolute;
- right: 0;
- z-index: 1;
-
- > div {
- position: absolute;
- right: 0;
- top: 0;
- }
- }
-}
#profile {
div {
diff --git a/src/styles/main.scss b/src/styles/main.scss
index f432d5e872ddf6d7c3c4a0f86bc9ed500bd5f17d..942a91b57a87eceb4f59342002c282db3ef11a15 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -13,6 +13,7 @@
:root {
font-size: 62.5%;
font-family: Open Sans, sans-serif;
+ --sib-notifications-theme: #{$color-46-100-50};
body {
//box-sizing: border-box;
diff --git a/src/styles/menu-left.scss b/src/styles/menu-left.scss
index 16587bfb69a18bd7da20b01c70c72ec47f3b4014..670fe52c696574cea8fc835e44709465d2e77e45 100644
--- a/src/styles/menu-left.scss
+++ b/src/styles/menu-left.scss
@@ -93,7 +93,9 @@
> sib-display {
- @extend %notification;
+ > div:first-of-type {
+ @extend %notification;
+ }
}
}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index bf1660460fff9efccdff83baf6781d4059588fd2..420b3a3f61cbadb529769d2aa12576a183978da1 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -6,6 +6,7 @@ $color-white: hsl(0, 0%,100%);
$color-selective-yellow: hsl(43, 100%, 50%);
$color-mikado-yellow: hsl(45, 95%, 54%);
$color-mustard: hsl(46, 100%, 67%);
+$color-46-100-50: hsl(46, 100%, 50%);
$color-rolling-stone: hsl(210, 4%, 50%);
$color-taupe-gray: hsl(210, 5%, 56%);
@@ -101,18 +102,15 @@ $color-majorelle-blue: hsl(244, 73%, 62%);
}
%notification {
-
- > div:first-of-type {
- align-items: center;
- background-color: $color-mustard;
- border-radius: 100%;
- color: $color-dark-lava;
- display: flex;
- font-size: 1.3rem;
- height: 1.7em;
- justify-content: center;
- width: 1.7em;
- }
+ align-items: center;
+ background-color: $color-mustard;
+ border-radius: 100%;
+ color: $color-dark-lava;
+ display: flex !important;
+ font-size: 1.3rem;
+ height: 1.7em;
+ justify-content: center;
+ width: 1.7em;
}
%shadow {