autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jean-Baptiste Pasquier 2021-04-23 14:44:57 +02:00
parent fbedd4e3e6 19671ae96f
commit 5a86ff375d
8 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -1615,9 +1615,9 @@
} }
}, },
"@startinblox/hubl-styling-framework": { "@startinblox/hubl-styling-framework": {
"version": "1.8.21", "version": "1.8.22",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.21.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.22.tgz",
"integrity": "sha512-4T0sqL7rqqe8uFmH4f8geigxZ4pIxI1ze3sycM762CQFtM5fXadAI9tl7wwAOQbY15y6xfZfDcPoK0YEjv0v9g==" "integrity": "sha512-00P0hIXjecgryh41Abq8ViVm18Aployr5TRbK/KDpNPAQqQ5x2to6z0of8oeeJeSm/srippfGdHLrJ7nyd1emg=="
}, },
"@types/q": { "@types/q": {
"version": "1.5.4", "version": "1.5.4",

2
package.json
View File

@ -57,7 +57,7 @@
"clearDist": false "clearDist": false
}, },
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.8.21", "@startinblox/hubl-styling-framework": "^1.8.22",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",

4
src/dependencies.pug
View File

@ -17,7 +17,7 @@ if componentSet.has("autoLogin") || componentSet.has("registering")
//- script(type="module" src="/lib/sib-auth/index.js" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer)
if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects") 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) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
if componentSet.has("communities") if componentSet.has("communities")
@ -53,7 +53,7 @@ if componentSet.has("profileDirectory")
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if componentSet.has("resources") 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) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer)
if componentSet.has("themeChecker") if componentSet.has("themeChecker")

2
src/locales/en.json
View File

@ -280,7 +280,7 @@
"hublStatus": "Public = Public, Private = Private", "hublStatus": "Public = Public, Private = Private",
"success": "Success!", "success": "Success!",
"errors": { "errors": {
"somethingGoesWrong": "Something goes wrong, try to", "somethingGoesWrong": "Something went wrong, try to",
"reload": "reload" "reload": "reload"
}, },
"goButton": "GO", "goButton": "GO",

2
src/scripts/timeout-goeswrong.js
View File

@ -8,4 +8,4 @@ setTimeout(() => {
} }
} }
} }
}, 10000); }, 15000);

17
src/styles/content/_index.scss
View File

@ -22,8 +22,8 @@ main {
&.sidebar-is-closed { &.sidebar-is-closed {
@media(min-width: 768.01px) { @media(min-width: 768.01px) {
margin-left: -152px; margin-left: -157px;
transform: translate(152px); transform: translate(157px);
} }
} }
} }
@ -39,18 +39,11 @@ main {
width: 217px; width: 217px;
@media (max-width: 768px) { @media (max-width: 768px) {
width: 65px; width: 60px;
} }
ul { ul {
li {
border-bottom: 1px solid #D6CECE;
&>a {
vertical-align: super;
}
}
&>li:first-child>a { &>li:first-child>a {
vertical-align: middle; vertical-align: middle;
} }
@ -98,7 +91,7 @@ main {
&.jsRightMenu:not([open]) { &.jsRightMenu:not([open]) {
@media (min-width: 768.01px) { @media (min-width: 768.01px) {
transform: translate(152px); transform: translate(157px);
} }
} }

20
src/views/page-admin.pug
View File

@ -60,7 +60,7 @@
nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation') nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold .segment.whitespace-normal.text-color-heading.text-bold
ul 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.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
span.segment.full.text-right(hidden) span.segment.full.text-right(hidden)
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
@ -69,16 +69,16 @@
if component.route if component.route
if component.type == "circles" if component.type == "circles"
solid-link.segment.full(next=`admin-${component.route}`) solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium span.icon.icon-globe.icon-large.margin-right-medium
a(data-trans='admin.menuRight.circles') a.text-baseline(data-trans='admin.menuRight.circles')
if component.type == "projects" if component.type == "projects"
solid-link.segment.full(next=`admin-${component.route}`) solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.ci-add.icon-xlarge.margin-right-medium span.icon.icon-folder-alt.icon-large.margin-right-medium
a(data-trans='admin.menuRight.projects') a.text-baseline(data-trans='admin.menuRight.projects')
if component.type == "chat" if component.type == "chat"
solid-link.segment.full(next=`admin-${component.route}`) solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.ci-networking.icon-xlarge.margin-right-medium span.icon.icon-grid.icon-large.margin-right-medium
a(data-trans='admin.menuRight.community') a.text-baseline(data-trans='admin.menuRight.community')

2
src/views/partials/header.pug
View File

@ -48,7 +48,7 @@ div
if componentSet.has("communities") && getComponent("chat").route if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`) solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small 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 if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`) solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small li.segment.padding-top-small