Open platform to collect and prioritize feedback
design: some UI improvements (#471)
Guilherme Oenning9d22ac14e3d2
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scssindex ffdb4c099..a361ba4b6 100644--- a/public/assets/styles/main.scss+++ b/public/assets/styles/main.scss@@ -195,7 +195,7 @@ body, h1, h2, h3, h4, h5, .ui, input {}.info {- font-size: 80%;+ font-size: 90%;font-weight: 400;color: rgba($text-color, .8);}diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scssindex 867e50d8a..ded734baa 100644--- a/public/assets/styles/variables.scss+++ b/public/assets/styles/variables.scss@@ -27,9 +27,9 @@ $gray: #d5d5d5;$gray-dark: rgba(0, 0, 0, 0.3);$gray-darker: rgba(0, 0, 0, 0.4);$gray-darkest: rgba(0, 0, 0, 0.5);-$green: #15CD72;-$green-darker: #0CB863;-$red: #db2828;+$green: #28a745;+$green-darker: #49852e;+$red: #c82333;$orange: #ff9320;$error: #ef7878;diff --git a/public/components/ShowTag.scss b/public/components/ShowTag.scssindex d35925c29..5a97bc341 100644--- a/public/components/ShowTag.scss+++ b/public/components/ShowTag.scss@@ -4,11 +4,11 @@display: inline-block;line-height: 1;vertical-align: baseline;- padding: 9px 12px;color: $text-color;- font-weight: 700;+ font-weight: 600;+ border-radius: 3px;border: 0;- border-radius: 5px;+ box-shadow: inset 0 -1px 0 rgba(27,31,35,0.12);&:last-child {margin-top: 0;@@ -43,27 +43,22 @@}&.m-mini {- font-size: 70%;- padding: 5px 8px;+ font-size: 75%;+ padding: 3px 5px;}&.m-tiny {font-size: 80%;- padding: 6px 9px;+ padding: 4px 6px;}&.m-small {font-size: 85%;- padding: 7px 10px;+ padding: 5px 7px;}&.m-normal {font-size: 90%;- padding: 8px 11px;- }-- &.m-large {- font-size: 100%;- padding: 9px 12px;+ padding: 5px 8px;}}\ No newline at end of filediff --git a/public/components/ShowTag.tsx b/public/components/ShowTag.tsxindex 88aca56bd..1d95fb633 100644--- a/public/components/ShowTag.tsx+++ b/public/components/ShowTag.tsx@@ -6,7 +6,7 @@ import { classSet } from "@fider/services";interface TagProps {tag: Tag;- size?: "mini" | "tiny" | "small" | "normal" | "large";+ size?: "mini" | "tiny" | "small" | "normal";circular?: boolean;}diff --git a/public/components/common/Button.scss b/public/components/common/Button.scssindex 7c23a5c4e..d2a25376f 100644--- a/public/components/common/Button.scss+++ b/public/components/common/Button.scss@@ -10,16 +10,26 @@border-radius: 3px;border: none;margin: 0 4px 0 0;- padding: 8px;+ padding: 8px 16px;text-align: left;font-weight: 600;+ &.m-cancel {+ color: $link-color;+ background-color: transparent;++ &:hover {+ text-decoration: underline;+ }+ }+&.m-default {color: $text-color;- background-color: $gray-lighter;+ background-color: $gray-lightest;+ border: 1px solid $gray;&:hover {- background-color: $gray;+ background-color: $gray-lighter;}}@@ -44,27 +54,27 @@}&.m-mini {- padding: 6px;+ padding: 6px 12px;font-size: $font-size-mini;}&.m-tiny {- padding: 7px;+ padding: 7px 14px;font-size: $font-size-tiny;}&.m-small {- padding: 8px;+ padding: 8px 16px;font-size: $font-size-small;}&.m-normal {- padding: 9px;+ padding: 9px 18px;font-size: $font-size;}&.m-large {- padding: 10px;+ padding: 10px 20px;font-size: $font-size-large;}@@ -96,23 +106,23 @@}&:after {- position: absolute;- content: '';- top: 50%;- left: 50%;- margin: -.64285714em 0 0 -.64285714em;- width: 1.28571429em;- height: 1.28571429em;- -webkit-animation: button-spin .6s linear;- animation: button-spin .6s linear;- -webkit-animation-iteration-count: infinite;- animation-iteration-count: infinite;- border-radius: 500rem;- border-color: #fff transparent transparent;- border-style: solid;- border-width: .2em;- -webkit-box-shadow: 0 0 0 1px transparent;- box-shadow: 0 0 0 1px transparent;+ position: absolute;+ content: '';+ top: 50%;+ left: 50%;+ margin: -.64285714em 0 0 -.64285714em;+ width: 1.28571429em;+ height: 1.28571429em;+ -webkit-animation: button-spin .6s linear;+ animation: button-spin .6s linear;+ -webkit-animation-iteration-count: infinite;+ animation-iteration-count: infinite;+ border-radius: 500rem;+ border-color: #fff transparent transparent;+ border-style: solid;+ border-width: .2em;+ -webkit-box-shadow: 0 0 0 1px transparent;+ box-shadow: 0 0 0 1px transparent;}}@@ -126,6 +136,8 @@text-align: center;height: 40px;line-height: 22px;+ padding: 8px;+ border: none;box-shadow: 0 0 0 1px rgba(20,11,47,0.1), 0 2px 4px -2px rgba(0,0,0,0.2);&.m-loading img {diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsxindex 94cee4546..ea5aea443 100644--- a/public/components/common/Button.tsx+++ b/public/components/common/Button.tsx@@ -6,7 +6,7 @@ interface ButtonProps {disabled?: boolean;href?: string;rel?: "nofollow";- color?: "positive" | "danger" | "default";+ color?: "positive" | "danger" | "default" | "cancel";fluid?: boolean;size?: "mini" | "tiny" | "small" | "normal" | "large";onClick?: (event: ButtonClickEvent) => Promise<any>;diff --git a/public/components/common/Segment.scss b/public/components/common/Segment.scssindex 52c727f72..573f5bbe0 100644--- a/public/components/common/Segment.scss+++ b/public/components/common/Segment.scss@@ -1,7 +1,10 @@+@import '~@fider/assets/styles/variables.scss';+.c-segment {position: relative;padding: 15px;margin: 10px 0;+ background-color: $white;box-shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);border-radius: 5px;border: 0.1px solid rgba(34, 36, 38, 0.15);diff --git a/public/components/common/form/ImageUploader.tsx b/public/components/common/form/ImageUploader.tsxindex e30dd407a..84b297517 100644--- a/public/components/common/form/ImageUploader.tsx+++ b/public/components/common/form/ImageUploader.tsx@@ -100,7 +100,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo{hasFile && <img className="preview" src={this.state.previewUrl} style={imgStyles} />}<input ref={e => (this.fileSelector = e)} type="file" onChange={this.fileChanged} /><DisplayError fields={[this.props.field]} error={ctx.error} />- <div>+ <div className="c-form-field-wrapper"><Button size="tiny" onClick={this.selectFile} disabled={this.props.disabled}>{hasFile ? "Change" : "Upload"}</Button>diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsxindex bb4282369..9cefefbf0 100644--- a/public/pages/Administration/components/OAuthForm.tsx+++ b/public/pages/Administration/components/OAuthForm.tsx@@ -342,7 +342,9 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {<Button color="positive" onClick={this.handleSave}>Save</Button>- <Button onClick={this.handleCancel}>Cancel</Button>+ <Button color="cancel" onClick={this.handleCancel}>+ Cancel+ </Button></div></Form></>diff --git a/public/pages/Administration/components/TagForm.tsx b/public/pages/Administration/components/TagForm.tsxindex d1710bb1d..db48265f8 100644--- a/public/pages/Administration/components/TagForm.tsx+++ b/public/pages/Administration/components/TagForm.tsx@@ -127,7 +127,9 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {<Button color="positive" onClick={this.handleSave}>Save</Button>- <Button onClick={this.handleCancel}>Cancel</Button>+ <Button onClick={this.handleCancel} color="cancel">+ Cancel+ </Button></Form>);}diff --git a/public/pages/Administration/components/TagListItem.tsx b/public/pages/Administration/components/TagListItem.tsxindex 69258dd23..a0b462051 100644--- a/public/pages/Administration/components/TagListItem.tsx+++ b/public/pages/Administration/components/TagListItem.tsx@@ -83,7 +83,7 @@ export class TagListItem extends React.Component<TagListItemProps, TagListItemStThe tag <ShowTag tag={this.state.tag} /> will be removed from all ideas.</span></div>- <Button className="right" onClick={this.cancelDelete}>+ <Button className="right" onClick={this.cancelDelete} color="cancel">Cancel</Button><Button color="danger" className="right" onClick={this.deleteTag}>diff --git a/public/pages/Administration/pages/AdvancedSettings.page.tsx b/public/pages/Administration/pages/AdvancedSettings.page.tsxindex 266cf9349..9354bf66b 100644--- a/public/pages/Administration/pages/AdvancedSettings.page.tsx+++ b/public/pages/Administration/pages/AdvancedSettings.page.tsx@@ -81,7 +81,7 @@ export class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPageProp{Fider.session.user.isAdministrator && (<div className="field"><Button color="positive" onClick={this.handleSave}>- Save changes+ Save</Button></div>)}diff --git a/public/pages/Administration/pages/Export.page.tsx b/public/pages/Administration/pages/Export.page.tsxindex 112506b79..669c59848 100644--- a/public/pages/Administration/pages/Export.page.tsx+++ b/public/pages/Administration/pages/Export.page.tsx@@ -21,7 +21,9 @@ export class ExportPage extends AdminBasePage<{}, {}> {</p></Field><Field>- <Button href="/admin/export/ideas.csv">Download</Button>+ <Button color="positive" href="/admin/export/ideas.csv">+ Download+ </Button></Field></Form>);diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsxindex c88f025b2..4d64b5167 100644--- a/public/pages/Administration/pages/GeneralSettings.page.tsx+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx@@ -196,7 +196,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,<div className="field"><Button disabled={!Fider.session.user.isAdministrator} color="positive" onClick={this.handleSave}>- Save changes+ Save</Button></div></Form>diff --git a/public/pages/Administration/pages/ManageAuthentication.page.tsx b/public/pages/Administration/pages/ManageAuthentication.page.tsxindex ecc4fec38..2fc8d3694 100644--- a/public/pages/Administration/pages/ManageAuthentication.page.tsx+++ b/public/pages/Administration/pages/ManageAuthentication.page.tsx@@ -65,8 +65,8 @@ export class ManageAuthenticationPage extends AdminBasePage<return <OAuthForm config={this.state.editing} onCancel={this.cancel} />;}- const enabled = <span className="m-enabled">Enabled</span>;- const disabled = <span className="m-disabled">Disabled</span>;+ const enabled = <p className="m-enabled">Enabled</p>;+ const disabled = <p className="m-disabled">Disabled</p>;return (<>@@ -98,7 +98,7 @@ export class ManageAuthenticationPage extends AdminBasePage<<div className="l-provider"><OAuthProviderLogo option={o} /><strong>{o.displayName}</strong>- <br /> {o.isEnabled ? enabled : disabled}+ {o.isEnabled ? enabled : disabled}</div>{o.isCustomProvider && (<span className="info">diff --git a/public/pages/Administration/pages/ManageTags.page.tsx b/public/pages/Administration/pages/ManageTags.page.tsxindex c6751aa5d..81c794293 100644--- a/public/pages/Administration/pages/ManageTags.page.tsx+++ b/public/pages/Administration/pages/ManageTags.page.tsx@@ -105,7 +105,6 @@ export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTagreturn (<>- {form}<Segment><List divided={true}><ListItem>@@ -127,6 +126,7 @@ export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTag{privateTagList.length === 0 ? <ListItem>There aren’t any private tags yet.</ListItem> : privateTagList}</List></Segment>+ {form}</>);}diff --git a/public/pages/Home/components/ListIdeas.tsx b/public/pages/Home/components/ListIdeas.tsxindex 551b14fd8..af57cd497 100644--- a/public/pages/Home/components/ListIdeas.tsx+++ b/public/pages/Home/components/ListIdeas.tsx@@ -34,7 +34,7 @@ const ListIdeaItem = (props: { idea: Idea; user?: CurrentUser; tags: Tag[] }) =></a><MultiLineText className="c-list-item-description" text={props.idea.description} style="simple" /><ShowIdeaResponse status={props.idea.status} response={props.idea.response} />- {props.tags.map(tag => <ShowTag key={tag.id} size="mini" tag={tag} />)}+ {props.tags.map(tag => <ShowTag key={tag.id} size="tiny" tag={tag} />)}</div></ListItem>);diff --git a/public/pages/Home/components/SimilarIdeas.tsx b/public/pages/Home/components/SimilarIdeas.tsxindex dc4e447ca..5326515c3 100644--- a/public/pages/Home/components/SimilarIdeas.tsx+++ b/public/pages/Home/components/SimilarIdeas.tsx@@ -58,7 +58,7 @@ export class SimilarIdeas extends React.Component<SimilarIdeasProps, SimilarIdea<><Headingtitle="Similar ideas"- subtitle="Consider voting on existing ideas before posting a new one."+ subtitle="Consider voting on existing ideas instead of posting a new one."icon="lightbulb outline"size="small"dividing={true}diff --git a/public/pages/MySettings/MySettings.page.tsx b/public/pages/MySettings/MySettings.page.tsxindex dadf077d9..6fb089d46 100644--- a/public/pages/MySettings/MySettings.page.tsx+++ b/public/pages/MySettings/MySettings.page.tsx@@ -149,7 +149,7 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySetti<Button color="positive" size="mini" onClick={this.submitNewEmail}>Confirm</Button>- <Button size="mini" onClick={this.cancelChangeEmail}>+ <Button color="cancel" size="mini" onClick={this.cancelChangeEmail}>Cancel</Button></>@@ -164,7 +164,7 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySetti/><Button color="positive" onClick={this.confirm}>- Save changes+ Save</Button></Form></div>diff --git a/public/pages/MySettings/components/DangerZone.tsx b/public/pages/MySettings/components/DangerZone.tsxindex 34a7d68bc..146e6a07c 100644--- a/public/pages/MySettings/components/DangerZone.tsx+++ b/public/pages/MySettings/components/DangerZone.tsx@@ -51,7 +51,7 @@ export class DangerZone extends React.Component<{}, DangerZoneState> {<Button color="danger" size="tiny" onClick={this.onConfirm}>Confirm</Button>- <Button size="tiny" onClick={this.onCancel}>+ <Button color="cancel" size="tiny" onClick={this.onCancel}>Cancel</Button></Modal.Footer>diff --git a/public/pages/ShowIdea/components/ModerationPanel.tsx b/public/pages/ShowIdea/components/ModerationPanel.tsxindex 99332026b..1071703ef 100644--- a/public/pages/ShowIdea/components/ModerationPanel.tsx+++ b/public/pages/ShowIdea/components/ModerationPanel.tsx@@ -73,7 +73,9 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder<Button color="danger" onClick={this.delete}>Delete</Button>- <Button onClick={this.closeModal}>Cancel</Button>+ <Button color="cancel" onClick={this.closeModal}>+ Cancel+ </Button></Modal.Footer></Modal.Window>);diff --git a/public/pages/ShowIdea/components/ResponseForm.tsx b/public/pages/ShowIdea/components/ResponseForm.tsxindex 7b179e7e1..44783acae 100644--- a/public/pages/ShowIdea/components/ResponseForm.tsx+++ b/public/pages/ShowIdea/components/ResponseForm.tsx@@ -110,7 +110,9 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor<Button color="positive" onClick={this.submit}>Submit</Button>- <Button onClick={this.closeModal}>Cancel</Button>+ <Button color="cancel" onClick={this.closeModal}>+ Cancel+ </Button></Modal.Footer></Modal.Window>);diff --git a/public/pages/ShowIdea/components/ShowComment.tsx b/public/pages/ShowIdea/components/ShowComment.tsxindex f47861a1e..45caef2db 100644--- a/public/pages/ShowIdea/components/ShowComment.tsx+++ b/public/pages/ShowIdea/components/ShowComment.tsx@@ -105,7 +105,7 @@ export class ShowComment extends React.Component<ShowCommentProps, ShowCommentSt<Button size="tiny" onClick={this.saveEdit} color="positive">Save</Button>- <Button size="tiny" onClick={this.cancelEdit}>+ <Button color="cancel" size="tiny" onClick={this.cancelEdit}>Cancel</Button></Form>diff --git a/public/pages/ShowIdea/components/TagsPanel.tsx b/public/pages/ShowIdea/components/TagsPanel.tsxindex 52453a45f..d1562d635 100644--- a/public/pages/ShowIdea/components/TagsPanel.tsx+++ b/public/pages/ShowIdea/components/TagsPanel.tsx@@ -61,7 +61,7 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {<List className="c-tag-list">{this.state.assignedTags.map(tag => (<ListItem key={tag.id}>- <ShowTag tag={tag} size="mini" />+ <ShowTag tag={tag} /></ListItem>))}</List>diff --git a/public/pages/UI/UIToolkit.page.tsx b/public/pages/UI/UIToolkit.page.tsxindex 8f5bccd95..1002d26ec 100644--- a/public/pages/UI/UIToolkit.page.tsx+++ b/public/pages/UI/UIToolkit.page.tsx@@ -39,8 +39,8 @@ const aryaStark: User = {status: UserStatus.Active};-const easyTag: Tag = { id: 2, slug: "easy", name: "Easy", color: "00a3a5", isPublic: true };-const hardTag: Tag = { id: 3, slug: "hard", name: "Hard", color: "ad43ec", isPublic: false };+const easyTag: Tag = { id: 2, slug: "easy", name: "easy", color: "FB3A62", isPublic: true };+const hardTag: Tag = { id: 3, slug: "hard", name: "hard", color: "fbca04", isPublic: false };const visibilityPublic = { label: "Public", value: "public" };const visibilityPrivate = { label: "Private", value: "private" };@@ -139,6 +139,9 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<Button color="danger" size="large">Large Danger</Button>+ <Button color="cancel" size="large">+ Large Cancel+ </Button></ListItem><ListItem>@@ -149,6 +152,9 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<Button color="danger" size="normal">Normal Danger</Button>+ <Button color="cancel" size="normal">+ Normal Cancel+ </Button></ListItem><ListItem>@@ -159,6 +165,9 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<Button color="danger" size="small">Small Danger</Button>+ <Button color="cancel" size="small">+ Small Cancel+ </Button></ListItem><ListItem>@@ -169,6 +178,9 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<Button color="danger" size="tiny">Tiny Danger</Button>+ <Button color="cancel" size="tiny">+ Tiny Cancel+ </Button></ListItem><ListItem>@@ -179,6 +191,9 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<Button color="danger" size="mini">Mini Danger</Button>+ <Button color="cancel" size="mini">+ Mini Cancel+ </Button></ListItem><ListItem>@@ -239,12 +254,6 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<h1>Tags</h1><List>- <ListItem>- <ShowTag tag={easyTag} size="large" />- <ShowTag tag={hardTag} size="large" />- <ShowTag tag={easyTag} circular={true} size="large" />- <ShowTag tag={hardTag} circular={true} size="large" />- </ListItem><ListItem><ShowTag tag={easyTag} size="normal" /><ShowTag tag={hardTag} size="normal" />