Skip to content

Commit

Permalink
Merge branch 'front-style'
Browse files Browse the repository at this point in the history
# Conflicts:
#	front/src/components/FilesListBar/EditFileModal.tsx
#	front/src/components/FilesListBar/index.tsx
#	front/src/util/urbit.ts
  • Loading branch information
newcodepusher committed Jan 5, 2023
2 parents 5166af3 + ff5c3f5 commit 68b65b2
Show file tree
Hide file tree
Showing 94 changed files with 2,964 additions and 1,790 deletions.
2 changes: 2 additions & 0 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"remark-rehype": "^8.1.0",
"remark-sectionize": "^1.1.1",
"remark-wiki-link": "^1.0.4",
"sass": "^1.57.1",
"slate": "^0.66.5",
"slate-react": "^0.66.7",
"styled-jsx": "^4.0.1",
Expand All @@ -83,6 +84,7 @@
"word-wrap": "^1.2.3"
},
"devDependencies": {
"@types/classnames": "^2.3.1",
"@types/d3-interpolate": "^3.0.1",
"@types/react": "17.0.14",
"eslint": "7.31.0",
Expand Down
44 changes: 44 additions & 0 deletions front/src/components/Button/Button.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.container {
transition: background-color .3s, border-color .3s, color .3s;
border-radius: 5px;
font-family: 'Montserrat';
font-weight: 500;
line-height: 16px;
text-align: center;
font-size: 16px;
padding: 13px;
outline: none;
border: 1px solid #303FC0;
cursor: pointer;

&:not([type="submit"]) {
background-color: #FCFCFC;
color: #303FC0;
}

&[type="submit"] {
background-color: #303FC0;
color: #FCFCFC;
}

&:not(:disabled) {
&:focus,
&:hover {
background-color: #8158FF;
border-color: #8158FF;
color: #FCFCFC;
}

&:active {
background-color: #303FC0;
border-color: #303FC0;
}
}

&:disabled {
background-color: #E9E9EB;
border-color: #E9E9EB;
cursor: not-allowed;
color: #BABABE;
}
}
33 changes: 33 additions & 0 deletions front/src/components/Button/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { FC } from 'react';
import cn from 'classnames';

import styles from './Button.module.scss';

interface ButtonProps {
className: string;
disabled?: boolean;
onClick: () => void;
type?: 'submit' | 'button';
text: string;
}

const Button: FC<ButtonProps> = ({
className,
disabled,
onClick,
type,
text,
}) => {
return (
<button
className={cn(styles.container, className)}
disabled={disabled}
onClick={onClick}
type={type || 'button'}
>
{text}
</button>
);
};

export default Button;
5 changes: 5 additions & 0 deletions front/src/components/FilesListBar/EditFileModal.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.input {
&:not(:last-child) {
margin-bottom: 20px;
}
}
Loading

0 comments on commit 68b65b2

Please sign in to comment.