Skip to content

[ENG-3243] Refactor node and draft reg cards for better CSS #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2021
Merged

[ENG-3243] Refactor node and draft reg cards for better CSS #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8066655
Refactor node and draft reg cards for better CSS
futa-ikeda Nov 17, 2021
30e72ad
Merge branch 'release/21.10.0' into node-card-and-draft-card-tweaks
adlius Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/osf-components/addon/components/draft-registration-card/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,16 @@
}
}

// stylelint-disable selector-no-qualifying-type
a.DraftRegistrationCard__review {
margin-right: 10px;
.DraftRegistrationCard__review {
composes: Button from '../button/styles.scss';
composes: SecondaryButton from '../button/styles.scss';
composes: MediumButton from '../button/styles.scss';

&:hover {
text-decoration: none;
text-decoration: none !important; /* override OsfLink hover style */
}
}

// stylelint-enable selector-no-qualifying-type
.DraftRegistrationCard__edit {
vertical-align: bottom;
}

.DraftRegistrationCard__delete {
button {
padding: 6px 12px;
Expand Down
9 changes: 3 additions & 6 deletions lib/osf-components/addon/components/draft-registration-card/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,17 @@
@route='registries.drafts.draft.review'
@models={{array this.draftRegistration.id}}
>
<Button>
{{t 'osf-components.draft-registration-card.review'}}
</Button>
{{t 'osf-components.draft-registration-card.review'}}
</OsfLink>
{{#unless this.draftRegistration.currentUserIsReadOnly}}
<OsfLink
data-test-draft-card-edit
local-class='DraftRegistrationCard__review'
data-analytics-name='Edit'
@route='registries.drafts.draft'
@models={{array this.draftRegistration.id}}
>
<Button local-class='DraftRegistrationCard__edit'>
{{t 'general.edit'}}
</Button>
{{t 'general.edit'}}
</OsfLink>
{{/unless}}
</div>
Expand Down
10 changes: 10 additions & 0 deletions lib/osf-components/addon/components/node-card/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,13 @@
overflow: hidden;
white-space: nowrap;
}

.NodeCard__link {
composes: Button from '../button/styles.scss';
composes: SecondaryButton from '../button/styles.scss';
composes: MediumButton from '../button/styles.scss';

&:hover {
text-decoration: none !important; /* override OsfLink hover style */
}
}
14 changes: 4 additions & 10 deletions lib/osf-components/addon/components/node-card/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,30 +172,24 @@
</dl>
<div local-class='MyRegistrationsButtons'>
<OsfLink
local-class='NodeCard__link'
data-analytics-name='View registration'
data-test-view-button='{{@node.id}}'
@route='resolve-guid'
@models={{array @node.id}}
>
<Button
local-class='RegistrationCard_view'
>
{{t 'node_card.view_button'}}
</Button>
{{t 'node_card.view_button'}}
</OsfLink>
{{#if this.latestSchemaResponse}}
{{#if this.shouldShowViewChangesButton}}
<OsfLink
local-class='NodeCard__link'
data-analytics-name='View changes'
data-test-view-changes-button={{@node.id}}
@route='registries.edit-revision.review'
@models={{array this.latestSchemaResponse.id}}
>
<Button
{{!-- local-class='RegistrationCard_update' --}}
>
{{t 'node_card.view_changes_button'}}
</Button>
{{t 'node_card.view_changes_button'}}
</OsfLink>
{{/if}}
{{/if}}
Expand Down