Skip to content
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.

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

[CPCN-480] For Company Admin user in Settings the Product names don't look like links that are clickable #686

Merged
merged 67 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
af79f19
[NHUB-351], Advanced search changes and Modal improvements
fritzSF Jul 31, 2023
a2b8502
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Jul 31, 2023
f6b45e5
fix lint
fritzSF Jul 31, 2023
e043db5
fix lint 2
fritzSF Jul 31, 2023
8cec273
small fix
fritzSF Aug 1, 2023
6768141
css fix
fritzSF Aug 1, 2023
3434c13
theme update
fritzSF Aug 1, 2023
d571509
CSS fixes and improvements
fritzSF Aug 4, 2023
8e7ea43
merged with develop
fritzSF Aug 4, 2023
b9dec7b
theme and logo handling improvements
fritzSF Aug 9, 2023
11a9918
merge theme and logo handling improvements with develop
fritzSF Aug 9, 2023
9eb3920
Theme CSS updates and Fixes
fritzSF Aug 11, 2023
a626c81
Theme CSS Fixes
fritzSF Aug 11, 2023
6fa56db
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 15, 2023
83a8a43
UI fixes based on feedback
fritzSF Aug 16, 2023
ac6ac86
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 16, 2023
400fd50
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 17, 2023
161f8bc
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 18, 2023
21a4a60
Misc UI fixes
fritzSF Aug 18, 2023
b02d147
New Coverage icons
fritzSF Aug 22, 2023
94e4f41
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 22, 2023
f13d787
logo.html update
fritzSF Aug 22, 2023
95bde5a
Various layout improvements
fritzSF Aug 25, 2023
5b8b981
Various design improvements
fritzSF Aug 25, 2023
050c8ae
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Aug 25, 2023
2e12005
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 5, 2023
28e5429
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 11, 2023
1dba79b
[CPCN-329] Broken design of Request more seats and Download dialog
fritzSF Sep 11, 2023
678f5cb
[NHUB-394], [CPCN-293], [NHUB-402]
fritzSF Sep 14, 2023
bb29e8a
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 14, 2023
1225cb9
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 19, 2023
9805406
NHUB-410
fritzSF Sep 20, 2023
d6130e3
[NHUB-410] and [NHUB-407]
fritzSF Sep 21, 2023
549e456
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 21, 2023
a16ca3a
merge with develop
fritzSF Sep 21, 2023
24b0049
[NHUB-421] Optimize list items for larger screen sizes
fritzSF Sep 25, 2023
608b193
merged with develop
fritzSF Sep 25, 2023
caa04be
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Sep 27, 2023
6c5d62f
[NHUB-412] Introduce a Planning item icon in the NH Agenda list views
fritzSF Sep 27, 2023
b33a789
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 3, 2023
b6b2757
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 6, 2023
83c628c
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 9, 2023
9426ef2
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 9, 2023
c555b56
Quick filters improvements
fritzSF Oct 12, 2023
98fa566
Quick filter improvements mobile behaviour
fritzSF Oct 12, 2023
8afa99c
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 12, 2023
498bac4
lint fix
fritzSF Oct 12, 2023
b7f64dd
Changed wording for Quick filter reset
fritzSF Oct 13, 2023
3cb5878
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 24, 2023
85b8653
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 24, 2023
fe312f7
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 25, 2023
b26154d
Mobile layout improvements
fritzSF Oct 25, 2023
ae8d3aa
small CSS fix
fritzSF Oct 26, 2023
a591f76
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 26, 2023
e5b831c
Small theme updates & fixes
fritzSF Oct 26, 2023
a7e2f9a
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 26, 2023
1baa527
CSS error fix
fritzSF Oct 26, 2023
360522c
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 26, 2023
85d52ff
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Oct 31, 2023
16bfa18
[NHUB-434] Improve the display of Wire list items with images on Mobi…
fritzSF Nov 1, 2023
c196a7f
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Nov 1, 2023
6d59256
[STTNHUB-290] HTML & CSS for the multi-day events display in the list…
fritzSF Nov 3, 2023
3935889
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Nov 3, 2023
8cfa4f5
CPCN-482 and CPCN-486
fritzSF Nov 29, 2023
8e63ecb
[CPCN-486] Final ajustments
fritzSF Dec 5, 2023
a79c420
Merge branch 'develop' of https://github.com/superdesk/newsroom-core …
fritzSF Dec 6, 2023
a223714
[CPCN-480] For Company Admin user in Settings...
fritzSF Dec 6, 2023
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
7 changes: 2 additions & 5 deletions assets/company-admin/components/CompanyDetailsProductRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ export function CompanyDetailsProductRow({product, onNameClicked, showSeatReques

return (
<tr>
<td
onClick={onNameClicked}
className={textClassName}
>
{product.name}
<td className={textClassName}>
<a className="text-link text-link--text-color" onClick={onNameClicked}>{product.name}</a>
</td>
{getConfig('allow_companies_to_manage_products') && (
<td className={textClassName}>
Expand Down
6 changes: 5 additions & 1 deletion assets/styles/custom-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ $container-max-widths: (
--color-text--inverse: var(--color-neutral-050);
--color-text--disabled: var(--color-neutral-600);

// CORE: TEXT LINK
--color-text-link: var(--color-interactive-focus);
--color-text-link-hover: hsl(var(--color-interactive-focus-base), calc(var(--color-interactive-focus-l) - 8%));

// CORE: LINE COLORS
--color-line--x-light: var(--color-neutral-150);
--color-line--light: var(--color-neutral-200);
Expand Down Expand Up @@ -284,7 +288,7 @@ $container-max-widths: (
--searchbar-color-shadow--focus: var(--color-interactive-focus--translucent);
--searchbar-color-button-bg: var(--color-text--muted);
--searchbar-color-button-bg--active: var(--button-color-bg--primary);
--searchbar-color-button-bg--active-hover: var(--button-color-bg--primary--hover);
--searchbar-color-button-bg--active-hover: var(--button-color-bg--primary-hover);

// COMPONENT: NAVBAR MAIN
--top-bar-color-bg: hsl(216, 45%, 14%);
Expand Down
31 changes: 31 additions & 0 deletions assets/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,37 @@ a {
text-decoration: none;
&:hover {
text-decoration: underline;
color: var(--color-text-link);
}
}

.text-link {
color: var(--color-text-link);
text-decoration: none;
display: inline;
border-bottom: 1px dotted var(--color-text-link);
transition: all 0.2s ease;
&:hover {
text-decoration: none !important;
color: var(--color-text-link-hover);
border-bottom: 1px solid var(--color-text-link);
cursor: pointer;
}
&.text-link--text-color {
color: var(--color-text);
&:hover {
color: var(--color-text-link);
}
}
&:focus {
outline: none;
box-shadow: none;
}
&:focus-visible {
outline: 1px dotted var(--color-text-link);
outline-offset: 2px;
border-radius: var(--border-radius--xs);
border: none;
}
}

Expand Down
2 changes: 1 addition & 1 deletion design_app/src/components/MyCompany.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function MyCompany() {
<td>Wire</td>
</tr>
<tr>
<td>Product one</td>
<td><a className="text-link text-link--text-color" href="#">Product one</a></td>
<td>16/30</td>
<td className="font-light">Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</td>
<td><button className="nh-button nh-button--tertiary nh-button--small">Request more seats</button></td>
Expand Down
Loading