From 17a83bc2b1ca613cbb08a298bc888e26a836c4ee Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 12 May 2021 20:30:08 +0200 Subject: [PATCH] patch: classes added to button[type='submit'] --- package-lock.json | 6 +-- package.json | 2 +- src/styles/admin-circles/_index.scss | 30 --------------- src/styles/forms/_index.scss | 4 +- src/styles/index.scss | 37 ++++++++++++++++++- src/styles/projects/_index.scss | 13 +++---- .../partials/admin/page-admin-chat-create.pug | 2 + src/views/partials/admin/page-admin-chat.pug | 1 + .../admin/page-admin-circles-create.pug | 1 + .../partials/admin/page-admin-circles.pug | 5 ++- .../admin/page-admin-projects-create.pug | 2 + .../partials/admin/page-admin-projects.pug | 1 + .../partials/circle/page-circle-edit.pug | 6 ++- .../communities/page-community-directory.pug | 5 ++- .../communities/page-community-edit.pug | 2 + .../communities/page-community-map.pug | 5 ++- .../partials/project/page-project-edit.pug | 7 +++- .../partials/project/page-project-profile.pug | 2 +- 18 files changed, 75 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd3d710..d5227f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,9 +1615,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.0.tgz", - "integrity": "sha512-2LDouqJcJUEX7fAsvRx/FO6i6eJWcYlA3yln5NB72W3+sZBL2F6E8yelzu60G3sbwX2EcwxxPLhAgd0sCaQsjQ==" + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.4.tgz", + "integrity": "sha512-iDpCn5yxkalrJ1/5Bc4x0sDYafr83JdpTugIPqDiNeNeMwi/R0QYTYRmLME8ZSZQSQ1n0/1TmhwbP/gjT9lQ4A==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 2f1b6b1..6193613 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "clearDist": false }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.9.0", + "@startinblox/hubl-styling-framework": "^1.9.4", "cross-env": "^7.0.3", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss index d47aad1..25c195a 100644 --- a/src/styles/admin-circles/_index.scss +++ b/src/styles/admin-circles/_index.scss @@ -57,36 +57,6 @@ } } - .form.search-button :not(.add-member)+button[type=submit] { - background-color: transparent; - border: 1px solid var(--color-secondary); - color: var(--color-secondary); - - &:hover { - background-color: var(--color-secondary); - color: #fff; - } - - &:before { - font-size: 15px; - margin-right: 6px; - content: "\e079"; - font-family: simple-line-icons; - font-style: normal; - font-weight: 400; - speak: none; - display: inline-block; - text-decoration: inherit; - width: 1em; - text-align: center; - font-variant: normal; - text-transform: none; - line-height: 13px; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - } - .masonry>div:nth-child(1) { /* change from directory (nth-child(2))*/ display: flex !important; diff --git a/src/styles/forms/_index.scss b/src/styles/forms/_index.scss index b0269de..115199c 100644 --- a/src/styles/forms/_index.scss +++ b/src/styles/forms/_index.scss @@ -1,4 +1,4 @@ -.search-form { +/*.search-form { [type="submit"] { margin-bottom: 20px; @media (min-width: 768.01px) { @@ -7,4 +7,4 @@ margin-top: 0 !important; } } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index 98c9fd3..d11d396 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -103,4 +103,39 @@ hubl-menu-empty+hubl-menu-empty { &:hover { text-decoration: none; } -} \ No newline at end of file +} + +.submit-button { + float: right; + margin-top: 10px; + + button { + line-height: 1; + + @media (max-width: 768px) { + width: 100%; + } + } +} + +.search-button { + + button { + line-height: 1; + + @media (max-width: 768px) { + margin-bottom: 20px; + width: 100%; + } + } +} + +.add-member-button { + + button[type='submit'] { + + @media (max-width: 768px) { + width: 100%; + } + } +} diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss index 04bc481..c899823 100644 --- a/src/styles/projects/_index.scss +++ b/src/styles/projects/_index.scss @@ -10,6 +10,10 @@ font-size: 12px; line-height: 14px; border-radius: 16.5px; + + @media (max-width: 768px) { + width: 100%; + } } button:hover { background-color: var(--color-secondary); @@ -20,6 +24,7 @@ display: table-row; border-bottom: 1px solid #C9C8C8; border-right: 1px solid #C9C8C8; + text-align: center; .segment.table-cell { border-bottom: 1px solid #C9C8C8; border-right: 1px solid #C9C8C8; @@ -27,15 +32,7 @@ padding: 10px; } [type="submit"] { - float: none; - display: flex; margin: 19px auto; - color: var(--color-secondary); - background-color: white; - } - [type="submit"]:hover { - background-color: var(--color-secondary); - color: white; } } #projects-information .display-businessprovider { diff --git a/src/views/partials/admin/page-admin-chat-create.pug b/src/views/partials/admin/page-admin-chat-create.pug index a2a70bb..e424f36 100644 --- a/src/views/partials/admin/page-admin-chat-create.pug +++ b/src/views/partials/admin/page-admin-chat-create.pug @@ -59,5 +59,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-button='' submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" + data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit' ) diff --git a/src/views/partials/admin/page-admin-chat.pug b/src/views/partials/admin/page-admin-chat.pug index 8af7019..42eb676 100644 --- a/src/views/partials/admin/page-admin-chat.pug +++ b/src/views/partials/admin/page-admin-chat.pug @@ -17,6 +17,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" submit-button="" submit-widget="button" + class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" data-trans='label-cell1=communities.searchBy;submit-button=goButton' ) diff --git a/src/views/partials/admin/page-admin-circles-create.pug b/src/views/partials/admin/page-admin-circles-create.pug index c5e5f70..e992588 100644 --- a/src/views/partials/admin/page-admin-circles-create.pug +++ b/src/views/partials/admin/page-admin-circles-create.pug @@ -53,6 +53,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-button='' submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" data-trans='enum-status=hublStatus;label-status=circle.create.labelStatus;label-community.community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp' ) diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug index e9c9843..8eccc49 100644 --- a/src/views/partials/admin/page-admin-circles.pug +++ b/src/views/partials/admin/page-admin-circles.pug @@ -23,15 +23,16 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi data-trans='circle.list.buttonCreate' ) - solid-form-search.form.search-form.search-button( + solid-form-search.form.search-form( id=`admin-circle-filter-${page}` fields='searchname' search-searchname='name, circle.name' label-searchname='' widget-searchname='solid-form-label-text' - class-searchname="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" + class-searchname="segment margin-bottom-medium margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" submit-button="" submit-widget="button" + class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" data-trans='label-searchname=circle.list.searchBy;submit-button=circle.list.searchButton' ) diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 7eb6106..a3220bb 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -54,6 +54,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-button='' submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" + next=getRoute('projects', true) data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug index 831516e..33cf5af 100644 --- a/src/views/partials/admin/page-admin-projects.pug +++ b/src/views/partials/admin/page-admin-projects.pug @@ -25,6 +25,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" submit-button="" submit-widget="button" + class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" data-trans='label-cell1=project.list.searchBy;submit-button=goButton' ) diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug index 1e0bfcd..554a263 100644 --- a/src/views/partials/circle/page-circle-edit.pug +++ b/src/views/partials/circle/page-circle-edit.pug @@ -66,6 +66,7 @@ div.segment.full.padding-large.whitespace-normal submit-button='' submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" next=`${component.route}-information` data-trans='enum-status=hublStatus;label-status=circle.edit.labelStatus;label-community.community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp' @@ -74,17 +75,18 @@ div.segment.full.padding-large.whitespace-normal h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.edit.subTitle') solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-form.segment.block.margin-bottom-xlarge.form( + solid-form.segment.block.whitespace-normal.margin-bottom-xlarge.form( bind-resources nested-field='members' fields='user' range-user=`${component.endpoints.users}` - class-user='add-member' + class-user='segment block margin-bottom' widget-user='solid-form-dropdown-autocompletion' submit-button='' submit-widget="button" + class-submit-button="add-member-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered" data-trans='submit-button=circle.edit.buttonAddMember' ) diff --git a/src/views/partials/communities/page-community-directory.pug b/src/views/partials/communities/page-community-directory.pug index fd4d529..1cea2a2 100644 --- a/src/views/partials/communities/page-community-directory.pug +++ b/src/views/partials/communities/page-community-directory.pug @@ -3,14 +3,15 @@ div.padding-top-xxsmall.margin-left-xsmall.margin-right-xsmall.sm-padding-none.sm-margin-none.sm-margin-right-xsmall.sm-margin-left-xsmall div.segment.quarter.sm-full - solid-form-search.form.search-form.search-button( + solid-form-search.form.search-form.sm-whitespace-normal( id=`communities-filter` fields='name' placeholder-name='' widget-name='solid-form-placeholder-text' - class-name="segment margin-bottom-medium sm-margin-bottom-none full sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow" + class-name="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow" submit-button="" submit-widget="button" + class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" data-trans='placeholder-name=communities.list.searchBy;submit-button=communities.list.searchButton' ) div.segment.sm-full.text-right(style='float:right') diff --git a/src/views/partials/communities/page-community-edit.pug b/src/views/partials/communities/page-community-edit.pug index d89dc66..5f81ad5 100644 --- a/src/views/partials/communities/page-community-edit.pug +++ b/src/views/partials/communities/page-community-edit.pug @@ -58,6 +58,7 @@ div.bg-color-white submit-button="" submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" data-trans="label-logo=communities.edit.labelLogo;label-profile.shortDescription=communities.edit.labelShortDescription;label-profile.description=communities.edit.labelDescription;label-profile.phone=communities.edit.labelPhone;label-profile.tweeter=communities.edit.labelTwitter;label-profile.facebook=communities.edit.labelFacebook;label-profile.linkedin=communities.edit.labelLinkedin;label-profile.instagram=communities.edit.labelInstagram;submit-button=communities.edit.buttonSubmit" ) @@ -87,6 +88,7 @@ div.bg-color-white submit-button="" submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" data-trans="label-profile.picture1=communities.edit.labelPicture1;label-profile.picture2=communities.edit.labelPicture2;label-profile.picture3=communities.edit.labelPicture3;submit-button=communities.edit.buttonSubmit" ) diff --git a/src/views/partials/communities/page-community-map.pug b/src/views/partials/communities/page-community-map.pug index 62affce..898b74b 100644 --- a/src/views/partials/communities/page-community-map.pug +++ b/src/views/partials/communities/page-community-map.pug @@ -3,16 +3,17 @@ div.mobile-map-search-field.padding-top-xxsmall.margin-left-xsmall.margin-right-xsmall.sm-padding-none.sm-margin-none.sm-margin-right-xsmall.sm-margin-left-xsmall div.segment.quarter.sm-full - solid-form-search.form.search-form.search-button( + solid-form-search.form.search-form.sm-whitespace-normal( id=`communities-filter-map` fields='filter' search-filter='community.name, address_line1, address_line2' placeholder-filter='' widget-filter='solid-form-placeholder-text' - class-filter="segment margin-bottom-medium sm-margin-bottom-none full sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow" + class-filter="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow" submit-button="" submit-widget="button" + class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" data-trans='placeholder-filter=communities.list.searchBy;submit-button=communities.list.searchButton' ) div.segment.sm-full.text-right(style='float:right') diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 6a679ca..e80a0e3 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -59,6 +59,7 @@ div.segment.full.padding-large.whitespace-normal submit-button='' submit-widget="button" + class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall" next=`${component.route}-information` data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' @@ -117,6 +118,7 @@ div.segment.full.padding-large.whitespace-normal submit-button='' submit-widget="button" + class-submit-button="segment children text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered" data-trans='submit-button=project.edit.buttonAddBusinessProvider;placeholder-name=project.edit.businessTableHeader1;placeholder-fee=project.edit.businessTableHeader2' ) @@ -125,18 +127,19 @@ div.segment.full.padding-large.whitespace-normal h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-form.segment.block.margin-bottom-xlarge.form( + solid-form.segment.block.margin-bottom-xlarge.sm-whitespace-normal.form( bind-resources nested-field='members' fields='user' range-user=`${component.endpoints.users}` - class-user='add-member whitespace-normal' + class-user='add-member' label-user='' widget-user='solid-form-dropdown-autocompletion' submit-button='' submit-widget="button" + class-submit-button="add-member-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered" data-trans='submit-button=project.edit.buttonAddMember' ) diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index 5e33c8e..53e0604 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -65,7 +65,7 @@ div( solid-widget(name=`hubl-project-leave-button-${component.uniq}`) template solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' + class='segment text-xsmall children-link-text-bold children-link-text-uppercase children-link-button children-link-color-secondary bordered' data-src="${src}" data-label='' data-trans='data-label=project.profile.buttonQuit'