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.

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

Update colors #5033

Merged
merged 12 commits into from
Aug 26, 2024
Merged

Update colors #5033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
363b08c
update colors, migrate Button dark-red to red, migrate Icon red to mi…
magicznyleszek Jul 29, 2024
a2c91e4
cleanup commments
magicznyleszek Jul 29, 2024
6c1cf93
Merge branch 'beta' into update-colors
magicznyleszek Aug 7, 2024
53470ec
Merge branch 'beta' into update-colors
duvld Aug 8, 2024
c79c57b
update nlp comment
magicznyleszek Aug 9, 2024
cbe4db8
Merge branch 'update-colors' of https://github.com/kobotoolbox/kpi in…
duvld Aug 9, 2024
0036cf2
rename colors from $kobo-gray-<lightness> to $kobo-neutral-<counter>
magicznyleszek Aug 12, 2024
f54a2dc
Merge branch 'update-colors' of github.com:kobotoolbox/kpi into updat…
magicznyleszek Aug 12, 2024
5fd7cb7
rename kobo-neutral-x to more future friendly names (-1 becomes -100)
magicznyleszek Aug 12, 2024
cf87db5
Merge branch 'beta' into update-colors
duvld Aug 14, 2024
133be7b
Merge branch 'beta' into update-colors
duvld Aug 16, 2024
6adfbac
undo "gray"s rename to "neutral"s after discussion with all devs
magicznyleszek Aug 26, 2024
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
4 changes: 2 additions & 2 deletions jsapp/js/account/accountFieldsEditor.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.checkboxLabel {
margin-top: sizes.$x6;
margin-bottom: sizes.$x6;
color: colors.$kobo-gray-24;
color: colors.$kobo-gray-800;
}

:global {
Expand Down Expand Up @@ -63,7 +63,7 @@
.socialLabel,
.checkboxLabel {
width: 100%;
color: colors.$kobo-gray-24;
color: colors.$kobo-gray-800;
font-size: sizes.$x12;
line-height: textBox.$label-leading;
margin-bottom: textBox.$label-margin;
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/accountSettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
h4 {
margin: 0;
font-weight: 400;
color: colors.$kobo-gray-24;
color: colors.$kobo-gray-800;
}

.kobo-select {
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/add-ons/addOnList.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}

.price {
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
}

.productName {
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/plans/confirmChangeModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const ConfirmChangeModal = ({
label={t('Submit')}
/>
<BillingButton
color='dark-red'
color='red'
isDisabled={isLoading}
onClick={onClickCancel}
label={t('Cancel')}
Expand Down
10 changes: 5 additions & 5 deletions jsapp/js/account/plans/plan.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ $plan-badge-height: 38px;

.priceName,
.enterpriseTitle {
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
font-size: sizes.$x24;
line-height: sizes.$x32;
Expand All @@ -133,7 +133,7 @@ $plan-badge-height: 38px;

.planContainer {
border-radius: sizes.$x6;
border: colors.$kobo-gray-85 solid sizes.$x1;
border: colors.$kobo-gray-400 solid sizes.$x1;
padding: sizes.$x24;
width: $plans-page-card-width;
display: flex;
Expand All @@ -150,7 +150,7 @@ $plan-badge-height: 38px;
}

.planContainer :global hr {
border-bottom: sizes.$x1 solid colors.$kobo-gray-96;
border-bottom: sizes.$x1 solid colors.$kobo-gray-200;
border-top: none;
margin: sizes.$x24 auto;
width: 100%;
Expand Down Expand Up @@ -202,7 +202,7 @@ a.enterpriseLink {
}

.listTitle {
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-size: sizes.$x14;
font-weight: 600;
padding: 0;
Expand Down Expand Up @@ -250,7 +250,7 @@ a.enterpriseLink {
bottom: sizes.$x20;
right: sizes.$x20;
border-radius: sizes.$x6;
background-color: colors.$kobo-gray-40;
background-color: colors.$kobo-gray-700;
width: sizes.$x50;
height: sizes.$x40;
color: colors.$kobo-white;
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/plans/planContainer.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const PlanContainer = ({
color={item.icon === 'positive_pro' ? 'teal' : 'storm'}
/>
) : (
<Icon name='close' size='m' color='red' />
<Icon name='close' size='m' color='mid-red' />
)}
</div>
{item.label}
Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/account/security/apiToken/apiTokenSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
align-items: baseline;
column-gap: sizes.$x16;
border-top: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;
}

.titleSection {
Expand All @@ -23,7 +23,7 @@

.title {
margin: 0;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
line-height: 1.6;
}
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/security/email/emailSection.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function EmailSection() {
<Button
label='Remove'
size='m'
color='dark-red'
color='red'
type='frame'
onClick={deleteNewUserEmail}
/>
Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/account/security/email/emailSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
align-items: baseline;
column-gap: sizes.$x16;
border-top: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;
}

.titleSection {
Expand All @@ -23,7 +23,7 @@

.title {
margin: 0;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
line-height: 1.6;
}
Expand Down
8 changes: 4 additions & 4 deletions jsapp/js/account/security/mfa/mfaSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
align-items: baseline;
column-gap: sizes.$x16;
border-top: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;

> * {
margin: 0;
Expand All @@ -21,7 +21,7 @@

.security-row__title {
flex: 2;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
line-height: 1.6;
}
Expand All @@ -45,7 +45,7 @@

.toggle-switch__label {
font-weight: 600;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
}
}
}
Expand All @@ -68,7 +68,7 @@
margin: sizes.$x14 0;
padding: 0 sizes.$x14 0 sizes.$x28;
justify-content: space-between;
background-color: colors.$kobo-gray-92;
background-color: colors.$kobo-gray-300;
}

.mfa-options__label {
Expand Down
6 changes: 3 additions & 3 deletions jsapp/js/account/security/password/passwordSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
align-items: baseline;
column-gap: sizes.$x16;
border-top: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;
}

.titleSection {
Expand All @@ -23,7 +23,7 @@

.title {
margin: 0;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
line-height: 1.6;
}
Expand All @@ -40,7 +40,7 @@
margin: 0;

// gray circles
color: colors.$kobo-gray-65;
color: colors.$kobo-gray-500;
cursor: default;
font-size: sizes.$x14;
// Allow cutoff if low on space
Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/account/security/sso/ssoSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
align-items: baseline;
column-gap: sizes.$x16;
border-top: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;
}

.titleSection {
Expand All @@ -23,7 +23,7 @@

.title {
margin: 0;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
font-weight: 600;
line-height: 1.6;
}
Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/account/usage/usage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
min-width: 250px;
width: 100%;
border: sizes.$x1 solid;
border-color: colors.$kobo-gray-92;
border-color: colors.$kobo-gray-300;
border-radius: sizes.$x6;
padding: sizes.$x24;
display: flex;
Expand All @@ -63,7 +63,7 @@

.title {
font-size: sizes.$x16;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
}

.date {
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/usage/usageContainer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}

.warningIcon {
color: colors.$kobo-red;
color: colors.$kobo-mid-red;
}

.overlimit {
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/account/usage/usageContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const UsageContainer = ({
})}
>
{isNearingLimit && <Icon name='warning' color='amber' size='m' />}
{isOverLimit && <Icon name='warning' color='red' size='m' />}
{isOverLimit && <Icon name='warning' color='mid-red' size='m' />}
<strong>{limitDisplay(usage, limit)}</strong>
</div>
</li>
Expand Down
18 changes: 9 additions & 9 deletions jsapp/js/account/usage/usageProjectBreakdown.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@
.root th {
font-weight: 700;
font-size: sizes.$x13;
color: colors.$kobo-gray-40;
color: colors.$kobo-gray-700;
text-align: initial;
padding-block: 1.5%;
}

.root tr {
font-weight: 400;
font-size: sizes.$x16;
color: colors.$kobo-gray-24;
border-bottom: sizes.$x1 solid colors.$kobo-gray-92;
color: colors.$kobo-gray-800;
border-bottom: sizes.$x1 solid colors.$kobo-gray-300;
}

.root td {
Expand All @@ -77,11 +77,11 @@
.pagination {
font-weight: 400;
font-size: sizes.$x14;
color: colors.$kobo-gray-24;
color: colors.$kobo-gray-800;
position: fixed;
bottom: sizes.$x20;
background-color: white;
border: sizes.$x1 solid colors.$kobo-gray-85;
border: sizes.$x1 solid colors.$kobo-gray-400;
width: sizes.$x150;
border-radius: sizes.$x4;
padding: sizes.$x5 0;
Expand All @@ -94,18 +94,18 @@
background: transparent;
border: none;
padding: 0 sizes.$x8 0 sizes.$x8;
color: colors.$kobo-gray-85;
color: colors.$kobo-gray-400;
cursor: pointer;

&.active {
color: colors.$kobo-gray-24;
color: colors.$kobo-gray-800;
}
}

.range {
padding: sizes.$x6 sizes.$x6;
border-right: sizes.$x1 solid colors.$kobo-gray-85;
border-left: sizes.$x1 solid colors.$kobo-gray-85;
border-right: sizes.$x1 solid colors.$kobo-gray-400;
border-left: sizes.$x1 solid colors.$kobo-gray-400;
flex: 1;
text-align: center;
}
Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/account/usage/yourPlan.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
align-items: center;
justify-content: space-between;
margin-block-end: 1.5em;
border-block: sizes.$x1 solid colors.$kobo-gray-96;
border-block: sizes.$x1 solid colors.$kobo-gray-200;
}

.plan {
Expand All @@ -29,7 +29,7 @@
.subscriptionChangeNotice {
width: 100%;
padding: sizes.$x12 sizes.$x16;
background-color: colors.$kobo-gray-96;
background-color: colors.$kobo-gray-200;
margin-bottom: 1.5em;
}

Expand Down
4 changes: 2 additions & 2 deletions jsapp/js/alertify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {createRoot} from 'react-dom/client';
interface MultiConfirmButton {
label: string;
/** Defaults to gray. */
color?: 'blue' | 'dark-red';
color?: 'blue' | 'red';
icon?: IconName;
isDisabled?: boolean;
callback: (() => void) | undefined;
Expand Down Expand Up @@ -65,7 +65,7 @@ export function multiConfirm(
let buttonClass = alertify.defaults.theme.input;
if (button.color === 'blue') {
buttonClass = alertify.defaults.theme.ok;
} else if (button.color === 'dark-red') {
} else if (button.color === 'red') {
buttonClass = alertify.defaults.theme.cancel;
}

Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/components/RESTServices/RESTServicesForm.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ export default class RESTServicesForm extends React.Component {

<Button
type='bare'
color='dark-red'
color='red'
size='m'
className='http-header-row-remove'
data-index={n}
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/components/RESTServices/RESTServicesList.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default class RESTServicesList extends React.Component {

<Button
type='bare'
color='dark-red'
color='red'
size='m'
onClick={() => this.deleteHookSafe(hook.uid, hook.name)}
tooltip={t('Delete')}
Expand Down
2 changes: 1 addition & 1 deletion jsapp/js/components/assetsTable/assetActionButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ class AssetActionButtons extends React.Component<
let label = t('Subscribe');

if (isUserSubscribed) {
color = 'dark-red';
color = 'red';
callbackFunction = this.unsubscribeFromCollection.bind(this);
icon = 'close';
label = t('Unsubscribe');
Expand Down
Loading
Loading