chore(app): use base font-size of 16px [EE-3186] (#6938)

pull/6040/head
Chaim Lev-Ari 2022-05-16 10:24:13 +03:00 committed by GitHub
parent df05914fac
commit 0e257c200f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 27 additions and 56 deletions

View File

@ -2,6 +2,10 @@
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
html {
font-size: 16px;
}
html, html,
body, body,
#page-wrapper, #page-wrapper,
@ -217,8 +221,8 @@ a[ng-click] {
} }
.blocklist-item { .blocklist-item {
padding: 0.7rem; padding: 7px;
margin-bottom: 0.7rem; margin-bottom: 7px;
cursor: pointer; cursor: pointer;
border: 1px solid var(--border-blocklist-color); border: 1px solid var(--border-blocklist-color);
border-radius: 2px; border-radius: 2px;

View File

@ -1,8 +1,8 @@
.published-url-container { .published-url-container {
display: grid; display: grid;
grid-template-columns: 1fr 1fr 3fr; grid-template-columns: 1fr 1fr 3fr;
padding-top: 1rem; padding-top: 10px;
padding-bottom: 0.5rem; padding-bottom: 5px;
} }
.publish-url-link { .publish-url-link {

View File

@ -9,8 +9,3 @@
.datatable-wide { .datatable-wide {
width: 55px; width: 55px;
} }
.datatable-padding-vertical {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}

View File

@ -1,5 +1,5 @@
.boxselector_wrapper { .boxselector_wrapper {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
margin: 0.5rem; margin: 5px;
} }

View File

@ -2,7 +2,7 @@
.boxselector_wrapper box-selector-item { .boxselector_wrapper box-selector-item {
--selected-item-color: var(--blue-2); --selected-item-color: var(--blue-2);
flex: 1; flex: 1;
padding: 0.5rem; padding: 5px;
} }
.boxselector_wrapper .boxselector_header { .boxselector_wrapper .boxselector_header {
@ -55,7 +55,7 @@
.boxselector_wrapper input[type='radio']:checked + label { .boxselector_wrapper input[type='radio']:checked + label {
background: var(--selected-item-color); background: var(--selected-item-color);
color: white; color: white;
padding-top: 2rem; padding-top: 20px;
border-color: var(--selected-item-color); border-color: var(--selected-item-color);
} }

View File

@ -1,3 +0,0 @@
.text-margin {
margin-right: 0.5rem;
}

View File

@ -1,8 +1,6 @@
import { PropsWithChildren } from 'react'; import { PropsWithChildren } from 'react';
import clsx from 'clsx'; import clsx from 'clsx';
import styles from './TextTip.module.css';
type Color = 'orange' | 'blue'; type Color = 'orange' | 'blue';
export interface Props { export interface Props {
@ -20,7 +18,7 @@ export function TextTip({
className={clsx( className={clsx(
'fa fa-exclamation-circle', 'fa fa-exclamation-circle',
`${color}-icon`, `${color}-icon`,
styles.textMargin 'space-right'
)} )}
/> />
{children} {children}

View File

@ -1,7 +1,7 @@
.sensitive-details-container { .sensitive-details-container {
display: grid; display: grid;
grid-template-columns: 25ch 25ch auto; grid-template-columns: 25ch 25ch auto;
gap: 2rem; gap: 20px;
align-items: start; align-items: start;
} }

View File

@ -1,3 +0,0 @@
.save-button {
margin-top: 2rem;
}

View File

@ -10,7 +10,6 @@ import { FormSectionTitle } from '@/portainer/components/form-components/FormSec
import { Settings } from '../types'; import { Settings } from '../types';
import styles from './EdgeComputeSettings.module.css';
import { validationSchema } from './EdgeComputeSettings.validation'; import { validationSchema } from './EdgeComputeSettings.validation';
export interface FormValues { export interface FormValues {
@ -107,12 +106,11 @@ export function EdgeComputeSettings({ settings, onSubmit }: Props) {
tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features." tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
/> />
<div className="form-group"> <div className="form-group mt-5">
<div className="col-sm-12"> <div className="col-sm-12">
<LoadingButton <LoadingButton
disabled={!isValid || !dirty} disabled={!isValid || !dirty}
dataCy="settings-edgeComputeButton" dataCy="settings-edgeComputeButton"
className={styles.saveButton}
isLoading={isSubmitting} isLoading={isSubmitting}
loadingText="Saving settings..." loadingText="Saving settings..."
> >

View File

@ -1,7 +1,3 @@
.save-button {
margin-top: 2rem;
}
.fdo-table { .fdo-table {
margin-top: 3em; margin-top: 3em;
} }

View File

@ -140,12 +140,11 @@ export function SettingsFDO({ settings, onSubmit }: Props) {
</> </>
)} )}
<div className="form-group"> <div className="form-group mt-5">
<div className="col-sm-12"> <div className="col-sm-12">
<LoadingButton <LoadingButton
disabled={!isValid || !dirty} disabled={!isValid || !dirty}
dataCy="settings-fdoButton" dataCy="settings-fdoButton"
className={styles.saveButton}
isLoading={isSubmitting} isLoading={isSubmitting}
loadingText="Saving settings..." loadingText="Saving settings..."
> >

View File

@ -1,3 +0,0 @@
.save-button {
margin-top: 2rem;
}

View File

@ -10,7 +10,6 @@ import { Input } from '@/portainer/components/form-components/Input';
import { FileUploadField } from '@/portainer/components/form-components/FileUpload'; import { FileUploadField } from '@/portainer/components/form-components/FileUpload';
import { OpenAMTConfiguration } from '@/portainer/hostmanagement/open-amt/model'; import { OpenAMTConfiguration } from '@/portainer/hostmanagement/open-amt/model';
import styles from './SettingsOpenAMT.module.css';
import { validationSchema } from './SettingsOpenAMT.validation'; import { validationSchema } from './SettingsOpenAMT.validation';
export interface Settings { export interface Settings {
@ -243,12 +242,11 @@ export function SettingsOpenAMT({ settings, onSubmit }: Props) {
</> </>
)} )}
<div className="form-group"> <div className="form-group mt-5">
<div className="col-sm-12"> <div className="col-sm-12">
<LoadingButton <LoadingButton
disabled={!isValid || !dirty} disabled={!isValid || !dirty}
dataCy="settings-fdoButton" dataCy="settings-fdoButton"
className={styles.saveButton}
isLoading={isSubmitting} isLoading={isSubmitting}
loadingText="Saving settings..." loadingText="Saving settings..."
> >

View File

@ -1,9 +0,0 @@
.add-button {
margin-top: 1rem;
margin-bottom: 3rem;
}
.copy-button {
margin-top: 1rem;
margin-bottom: 3rem;
}

View File

@ -11,8 +11,6 @@ import { Code } from '@/portainer/components/Code';
import { CopyButton } from '@/portainer/components/Button/CopyButton'; import { CopyButton } from '@/portainer/components/Button/CopyButton';
import { Input } from '@/portainer/components/form-components/Input'; import { Input } from '@/portainer/components/form-components/Input';
import styles from './CreateAccessToken.module.css';
interface AccessTokenResponse { interface AccessTokenResponse {
rawAPIKey: string; rawAPIKey: string;
} }
@ -75,13 +73,16 @@ export function CreateAccessToken({
value={description} value={description}
/> />
</FormControl> </FormControl>
<Button <div className="row mt-5">
disabled={!!errorText || !!accessToken} <div className="col-sm-12">
onClick={() => generateAccessToken()} <Button
className={styles.addButton} disabled={!!errorText || !!accessToken}
> onClick={() => generateAccessToken()}
{t('Add access token')} >
</Button> {t('Add access token')}
</Button>
</div>
</div>
</div> </div>
{accessToken && ( {accessToken && (
<> <>
@ -95,7 +96,7 @@ export function CreateAccessToken({
</Trans> </Trans>
</TextTip> </TextTip>
<Code>{accessToken}</Code> <Code>{accessToken}</Code>
<CopyButton copyText={accessToken} className={styles.copyButton}> <CopyButton copyText={accessToken}>
<Trans ns={translationNS}>Copy access token</Trans> <Trans ns={translationNS}>Copy access token</Trans>
</CopyButton> </CopyButton>
<hr /> <hr />