diff --git a/package-lock.json b/package-lock.json
index 01b4a7ddcec251a03967fe71b06814a998f2b84c..18ad18ad9b95a2442d1fc798de2cb41e2be1d062 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1615,9 +1615,9 @@
}
},
"@startinblox/hubl-styling-framework": {
- "version": "1.8.21",
- "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.21.tgz",
- "integrity": "sha512-4T0sqL7rqqe8uFmH4f8geigxZ4pIxI1ze3sycM762CQFtM5fXadAI9tl7wwAOQbY15y6xfZfDcPoK0YEjv0v9g=="
+ "version": "1.8.22",
+ "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.22.tgz",
+ "integrity": "sha512-00P0hIXjecgryh41Abq8ViVm18Aployr5TRbK/KDpNPAQqQ5x2to6z0of8oeeJeSm/srippfGdHLrJ7nyd1emg=="
},
"@types/q": {
"version": "1.5.4",
diff --git a/package.json b/package.json
index 5bd77755d7ed4983032d33c339d6fe77c02708b1..bf92dd528ae3c2c9edaa677e35a15b40bf5476ab 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"clearDist": false
},
"dependencies": {
- "@startinblox/hubl-styling-framework": "^1.8.21",
+ "@startinblox/hubl-styling-framework": "^1.8.22",
"cross-env": "^7.0.3",
"fs-extra": "^9.0.1",
"normalize.css": "^8.0.1",
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 1ede7e9e1080c3e02371a60f64793de68ab1c28a..c4b8fb3c354ef4642e4734807ab88121c51dbc33 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -17,7 +17,7 @@ if componentSet.has("autoLogin") || componentSet.has("registering")
//- script(type="module" src="/lib/sib-auth/index.js" defer)
if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects")
- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@5.2" defer)
+ script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@5.3" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
if componentSet.has("communities")
@@ -53,7 +53,7 @@ if componentSet.has("profileDirectory")
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if componentSet.has("resources")
- script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.1", defer)
+ script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.3", defer)
//- script(type="module" src="/lib/solid-resource/solid-resource.js" defer)
if componentSet.has("themeChecker")
diff --git a/src/locales/en.json b/src/locales/en.json
index 955cc4fc58cffacf9f2cbdec5f529493e5a5bf47..9bf13b51ebfd670436fc36e4c458136b1160f7f7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -280,7 +280,7 @@
"hublStatus": "Public = Public, Private = Private",
"success": "Success!",
"errors": {
- "somethingGoesWrong": "Something goes wrong, try to",
+ "somethingGoesWrong": "Something went wrong, try to",
"reload": "reload"
},
"goButton": "GO",
diff --git a/src/scripts/timeout-goeswrong.js b/src/scripts/timeout-goeswrong.js
index 8df7662f0f76cee51dc11cb85952df3dc6192c9a..0464b84fa8b4faa523e4ee7150bb8911889e4f4a 100644
--- a/src/scripts/timeout-goeswrong.js
+++ b/src/scripts/timeout-goeswrong.js
@@ -8,4 +8,4 @@ setTimeout(() => {
}
}
}
-}, 10000);
\ No newline at end of file
+}, 15000);
\ No newline at end of file
diff --git a/src/styles/content/_index.scss b/src/styles/content/_index.scss
index 782105b0544b613ef6d789a3985912abacce5436..0bca0a62fd822b11b798eb81d988ec78c4c0edfb 100644
--- a/src/styles/content/_index.scss
+++ b/src/styles/content/_index.scss
@@ -22,8 +22,8 @@ main {
&.sidebar-is-closed {
@media(min-width: 768.01px) {
- margin-left: -152px;
- transform: translate(152px);
+ margin-left: -157px;
+ transform: translate(157px);
}
}
}
@@ -39,18 +39,11 @@ main {
width: 217px;
@media (max-width: 768px) {
- width: 65px;
+ width: 60px;
}
ul {
-
- li {
- border-bottom: 1px solid #D6CECE;
-
- &>a {
- vertical-align: super;
- }
- }
+
&>li:first-child>a {
vertical-align: middle;
}
@@ -98,7 +91,7 @@ main {
&.jsRightMenu:not([open]) {
@media (min-width: 768.01px) {
- transform: translate(152px);
+ transform: translate(157px);
}
}
diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug
index 6e715bf0638632ca7d8849482b2b6e630540d264..2e33722276f6cd3698c47e7cb4c68b244a9f3447 100644
--- a/src/views/page-admin.pug
+++ b/src/views/page-admin.pug
@@ -60,7 +60,7 @@
nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold
ul
- li.segment.full.sm-hidden.padding-small.text-normal.jsOffsiteToggle
+ li.segment.full.sm-hidden.padding-small.text-normal.border-bottom.border-color-grey.jsOffsiteToggle
span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
span.segment.full.text-right(hidden)
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
@@ -69,16 +69,16 @@
if component.route
if component.type == "circles"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.circles')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-globe.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.circles')
if component.type == "projects"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-add.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.projects')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-folder-alt.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.projects')
if component.type == "chat"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-networking.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.community')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-grid.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.community')
diff --git a/src/views/partials/header.pug b/src/views/partials/header.pug
index 6a4f0c9d78ecb6649c9cf80a4ebf7716437caeae..a31802ff5df7ca671cb7e6b4461a31b78548031c 100644
--- a/src/views/partials/header.pug
+++ b/src/views/partials/header.pug
@@ -48,7 +48,7 @@ div
if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small
- a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
+ a.icon.icon-grid.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small