diff --git a/package-lock.json b/package-lock.json index 3eeb2a9..045e087 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1159,9 +1159,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.8.12", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.12.tgz", - "integrity": "sha512-BtB6OSSfMgVQMwYFk9DGIRV6Uazasw/BHFoW1cmnlXszD3lQdbMrIKTd3AQI2/tEacTVIUqcXJ+pWt6g0djbeQ==" + "version": "1.8.17", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.17.tgz", + "integrity": "sha512-x9TlnpLs/k2WyJAwlYyexSXs3q9QmSOe/43E1O8Scuh4V1qzs5pnMKz9B91lw9563d6u62Z5WyGPeqaS4detmA==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 9f5a3bb..8a91316 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ ] }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.8.12", + "@startinblox/hubl-styling-framework": "^1.8.17", "cross-env": "^7.0.3", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", diff --git a/src/styles/index.scss b/src/styles/index.scss index f6a3305..d85ea4a 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -104,6 +104,15 @@ hubl-create-contact { justify-content: center; } +/* Animation on cards in #communities */ +#communities { + + .segment.hover:hover { + box-shadow: 0 0 16px 0 rgba(46, 63, 88, 0.34); + bottom: 2px; + } +} + /* Fix on Join button in admin (circles + projects) */ /* Styles on buttons and .children-link don't work because this input is inside too many elements. */ /* And no I can't add that stupid icon because it'a an input. */ diff --git a/src/views/page-communities.pug b/src/views/page-communities.pug index c24baa2..e26480c 100644 --- a/src/views/page-communities.pug +++ b/src/views/page-communities.pug @@ -1,39 +1,42 @@ -div.padding-top-xlarge.padding-right-small.padding-bottom-xlarge.padding-left-small.whitespace-normal +div.padding-small.whitespace-normal.sm-padding-none.sm-padding-top-large.sm-padding-bottom-large - h2.margin-left-xsmall.sm-margin-none.text-xlarge.text-bold.text-color-heading.text-uppercase(data-trans='communities.list.title') + h2.margin-top-xxsmall.margin-left-xsmall.margin-bottom-medium.sm-margin-none.sm-margin-right-xsmall.sm-margin-bottom-large.sm-margin-left-xsmall.text-xlarge.text-bold.text-color-heading.text-uppercase(data-trans='communities.list.title') - div - solid-form-search.form.search-form.search-button( - id=`communities-filter-${page}` - fields='name' - label-name='' - widget-name='solid-form-text' - class-name="segment margin-bottom-medium sm-margin-bottom-none third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" - submit-button="" - submit-widget="button" - data-trans='label-name=communities.list.searchBy;submit-button=communities.list.searchButton' - ) + div.padding-top-xxsmall.margin-left-xsmall.sm-padding-none.sm-margin-none.sm-margin-right-xsmall.sm-margin-left-xsmall + div.segment.half.sm-full + solid-form-search.form.search-form.search-button( + id=`communities-filter-${page}` + fields='name' + placeholder-name='' + widget-name='solid-form-placeholder-text' + class-name="segment margin-bottom-medium sm-margin-bottom-none three-quarter sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow" + submit-button="" + submit-widget="button" + data-trans='placeholder-name=communities.list.searchBy;submit-button=communities.list.searchButton' + ) + div.segment.half.sm-full.text-right + solid-link.segment.children-link-rounded.children-icon-map.children-link-reversed.color-secondary.bordered + span -div.segment.full.padding-small.padding-top-xsmall.sm-padding-xsmall.whitespace-normal - solid-display( - class='segment full children children-quarter sm-children-full children-margin-bottom-medium sm-children-margin-bottom-xsmall children-padding-right-xsmall children-padding-left-xsmall sm-children-padding-none sm-whitespace-normal masonry pagination' - data-src='https://api.test3.startinblox.com/communities/' - fields='segment1(segment2(logo), segment3(name, shortDescription, counter))' - filtered-by=`communities-filter-${page}` - order-by='name' - paginate-by='20' - loader-id=`loader-communities-${page}` + div.segment.full.padding-top-xsmall.sm-padding-xsmall.whitespace-normal + solid-display( + class='segment full children children-quarter sm-children-full children-margin-bottom-medium sm-children-margin-bottom-xsmall children-padding-right-xsmall children-padding-left-xsmall sm-children-padding-none sm-whitespace-normal masonry pagination' + data-src='https://api.test3.startinblox.com/communities/' + fields='segment1(segment2(logo), segment3(name, profile.shortDescription, counter))' + filtered-by=`communities-filter-${page}` + order-by='name' + paginate-by='20' + loader-id=`loader-communities-${page}` - class-segment1='segment hover bg-color-white shadow border-rounded-xxsmall full text-top whitespace-normal' - class-segment2='segment block padding-xlarge text-center' - class-segment3='segment full padding-xlarge padding-top-medium sm-padding-medium border-top border-color-grey text-center whitespace-normal' - class-name='segment block text-xlarge text-bold text-color-heading margin-bottom-xsmall whitespace-normal' - class-shortDescription='segment two-lines-ellipsis margin-bottom-xlarge sm-margin-bottom-medium whitespace-normal circle-subtitle-custom' - class-counter='segment block margin-bottom-large whitespace-normal' + class-segment1='segment hover bg-color-white shadow border-rounded-xxsmall full text-top whitespace-normal' + class-segment2='segment block padding-xlarge text-center' + class-segment3='segment full padding-xlarge padding-top-medium sm-padding-medium border-top border-color-grey text-center whitespace-normal' + class-name='segment block one-line-ellipsis text-xlarge text-bold text-color-heading margin-bottom-xsmall' + class-profile.shortDescription='segment two-lines-ellipsis margin-bottom-xlarge sm-margin-bottom-medium whitespace-normal circle-subtitle-custom' + class-counter='segment block margin-bottom-large whitespace-normal' - widget-logo='hubl-communities-logo' - action-name=`` - widget-name='hubl-communities-name' - action-counter="counter" - widget-counter='hubl-communities-counter-alternate' - ) \ No newline at end of file + widget-logo='hubl-communities-logo' + action-counter="counter" + widget-counter='hubl-communities-counter-alternate' + next="" + ) \ No newline at end of file diff --git a/src/views/partials/communities/page-community-profile.pug b/src/views/partials/communities/page-community-profile.pug new file mode 100644 index 0000000..e69de29 diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index 58ae680..91ec5c3 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -22,7 +22,6 @@ include widgets/hubl-circle-team-contact.pug include widgets/hubl-circle-user-admin.pug include widgets/hubl-communities-counter-alternate.pug include widgets/hubl-communities-logo.pug -include widgets/hubl-communities-name.pug include widgets/hubl-counter.pug include widgets/hubl-create-contact.pug include widgets/hubl-email-field.pug diff --git a/src/views/partials/widgets/hubl-communities-name.pug b/src/views/partials/widgets/hubl-communities-name.pug deleted file mode 100644 index 5662457..0000000 --- a/src/views/partials/widgets/hubl-communities-name.pug +++ /dev/null @@ -1,18 +0,0 @@ -if componentSet.has('admin') && componentSet.has('communities') - solid-widget(name='hubl-communities-name-title') - template - div.segment.block.one-line-ellipsis( - title="\${value}" - ) ${value} - - solid-widget(name='hubl-communities-name') - template - solid-link( - data-src="${src || value}" - next=`` - ) - solid-display( - data-src="${src || value}" - fields="name" - widget-name="hubl-communities-name-title" - )