From 747783ad695bfc081351404c8c90fa5c9485573b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Sat, 23 Jan 2021 18:01:22 +0100 Subject: [PATCH] fix: link-button - styles applied on the right elements --- package-lock.json | 6 ++--- package.json | 2 +- src/styles/index.scss | 24 +++++++++++++++++++ .../admin/page-admin-circles-create.pug | 2 +- .../partials/admin/page-admin-circles.pug | 6 ++--- .../partials/admin/page-admin-communities.pug | 2 +- .../admin/page-admin-projects-create.pug | 2 +- .../partials/admin/page-admin-projects.pug | 4 ++-- .../admin/page-admin-users-create.pug | 2 +- .../partials/circle/page-circle-edit.pug | 2 +- .../partials/circle/page-circle-profile.pug | 2 +- .../partials/project/page-project-edit.pug | 2 +- .../partials/project/page-project-profile.pug | 2 +- 13 files changed, 41 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 729f343..b6c4092 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1159,9 +1159,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.7.1.tgz", - "integrity": "sha512-ypkeS8EJqVN7rETBxYUJRB6C+e06HksfZH9TLLgX6dwzw2G8RLdwzQGStj8Ev5/a/XGRYiY5yFcZ17cSNvRP2Q==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.7.3.tgz", + "integrity": "sha512-Rnw2ZDJDvWfFM+Rjz9Pm7/pUSElzUqrmHicmpm78SVeHd7qmC9NzBQYJ53/WwVV+FVd/IuSJEKbkwPd2ZcRgKg==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index effe594..c8986a7 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ ] }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.7.1", + "@startinblox/hubl-styling-framework": "^1.7.3", "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 f18ab6e..ffd5ccc 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -31,3 +31,27 @@ main#content { overflow: hidden; text-overflow: ellipsis; } + + +/* 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. */ +.join-button { + + input { + padding: 9px 20px; + border-radius: 16.5px; + height: 33px; + text-decoration: none; + font-weight: bold; + text-transform: uppercase; + background-color: var(--color-secondary); + color: white; + border: 1px solid var(--color-secondary); + + &:hover { + background: white; + color: var(--color-secondary); + } + } +} \ No newline at end of file diff --git a/src/views/partials/admin/page-admin-circles-create.pug b/src/views/partials/admin/page-admin-circles-create.pug index def8340..0b4864d 100644 --- a/src/views/partials/admin/page-admin-circles-create.pug +++ b/src/views/partials/admin/page-admin-circles-create.pug @@ -1,6 +1,6 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey div.segment.half.sm-full - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') div.segment.half.sm-hidden.text-right solid-link(class="backlink", bind-resources, next='admin-circles' data-trans='circle.create.backlink') diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug index c003411..4c93ec5 100644 --- a/src/views/partials/admin/page-admin-circles.pug +++ b/src/views/partials/admin/page-admin-circles.pug @@ -18,7 +18,7 @@ solid-widget(name='hubl-circle-owner') ) div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal @@ -50,7 +50,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac solid-widget(name='hubl-admin-circle-leave-button') template solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' + class='segment text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered' data-src="${src}" data-label='' data-trans='data-label=circle.list.buttonQuit' @@ -86,7 +86,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac solid-widget(name='hubl-admin-circle-join-button') template solid-form( - class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle' + class='join-button text-xsmall' data-src='${value}' fields='user.username' diff --git a/src/views/partials/admin/page-admin-communities.pug b/src/views/partials/admin/page-admin-communities.pug index 4615ce5..b958033 100644 --- a/src/views/partials/admin/page-admin-communities.pug +++ b/src/views/partials/admin/page-admin-communities.pug @@ -11,7 +11,7 @@ solid-widget(name='hubl-action-community') div.button.button-disabled(data-trans='communities.noPermission') div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 8780510..0037d9b 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -1,6 +1,6 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey div.segment.half.sm-full - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title') div.segment.half.sm-hidden.text-right solid-link(class="backlink right", next='admin-projects' data-trans='project.create.backlink') diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug index c28365d..9502747 100644 --- a/src/views/partials/admin/page-admin-projects.pug +++ b/src/views/partials/admin/page-admin-projects.pug @@ -1,5 +1,5 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title') div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal @@ -26,7 +26,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac solid-widget(name="hubl-admin-project-leave-button") template solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' + class='segment text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered' data-src="${src}" data-label='' data-trans='data-label=project.list.buttonQuit' diff --git a/src/views/partials/admin/page-admin-users-create.pug b/src/views/partials/admin/page-admin-users-create.pug index dd0c7a5..ebd20a7 100644 --- a/src/views/partials/admin/page-admin-users-create.pug +++ b/src/views/partials/admin/page-admin-users-create.pug @@ -1,6 +1,6 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.padding-large.border-bottom.border-color-grey div.segment.half.sm-full - h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') + h2.margin-none.text-color-heading.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') div.segment.half.sm-hidden.text-right solid-link(class="backlink", bind-resources, next='admin-communities' data-trans='circle.create.backlink') diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug index 47dfad2..2e203ba 100644 --- a/src/views/partials/circle/page-circle-edit.pug +++ b/src/views/partials/circle/page-circle-edit.pug @@ -19,7 +19,7 @@ div.segment.full.padding-large.whitespace-normal template solid-ac-checker(permission="acl:Delete", data-src="${src}") solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' + class='segment text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered' data-src="${src}" data-label='' data-trans='data-label=circle.edit.buttonDelete' diff --git a/src/views/partials/circle/page-circle-profile.pug b/src/views/partials/circle/page-circle-profile.pug index adf07e2..ecc2013 100644 --- a/src/views/partials/circle/page-circle-profile.pug +++ b/src/views/partials/circle/page-circle-profile.pug @@ -46,7 +46,7 @@ solid-router(default-route='circle-profile', hidden) solid-ac-checker.segment.full.text-right.margin-bottom-large.sm-margin-bottom-medium(permission='acl:Delete', bind-resources) solid-delete( - class='segment sm-full button text-xsmall text-bold text-uppercase text-uppercase text-center color-secondary bordered' + class='segment sm-full text-xsmall text-center children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered' bind-resources data-label='' data-trans='data-label=circle.profile.buttonDelete' diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index b32cbda..75462e3 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -23,7 +23,7 @@ div.segment.full.padding-large.whitespace-normal template solid-ac-checker(permission="acl:Delete", data-src="${src}") 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.edit.buttonDelete' diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index 6dd3ab3..8b5c616 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -52,7 +52,7 @@ solid-router(default-route='project-profile', hidden) solid-ac-checker.segment.full.text-right.margin-bottom-large.sm-margin-bottom-medium(permission='acl:Delete', bind-resources) solid-delete( - class='segment sm-full button text-xsmall text-bold text-uppercase text-center color-secondary bordered' + class='segment sm-full children-link-button text-xsmall text-center children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered' bind-resources data-label='' data-trans='data-label=project.profile.buttonDelete'