Commit d0251490 authored by Darrick Yong's avatar Darrick Yong

finalize styling

parent f5b127d4
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
content="Web site created using create-react-app" content="Web site created using create-react-app"
/> />
<link rel="stylesheet" href="./stylesheets/master.css"> <link rel="stylesheet" href="./stylesheets/master.css">
<link href='http://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
<!-- <!--
manifest.json provides metadata used when your web app is installed on a manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
......
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
cursor: pointer; cursor: pointer;
padding: 10px 0; padding: 10px 0;
font-size: 16px; font-size: 16px;
font-family: "Times New Roman", Times, serif; font-family: 'Lato', sans-serif;
} }
.search > input { .search > input {
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
font-family: "Times New Roman", Times, serif; font-family: 'Lato', sans-serif;
} }
.search-btn:hover, .search-btn:hover,
......
...@@ -43,8 +43,7 @@ ...@@ -43,8 +43,7 @@
} }
.user:hover { .user:hover {
border-radius: 5px; color: #CCCDCF;
background: red;
} }
.dropdown { .dropdown {
...@@ -60,12 +59,20 @@ ...@@ -60,12 +59,20 @@
border: 1px solid black; border: 1px solid black;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
top: 40px; top: 30px;
right: 10px; right: 10px;
} }
.dropdown > * ~ * { .dropdown > * ~ * {
margin-top: 5px; margin-top: 10px;
}
.dropdown > * {
padding: 5px 10px;
}
.dropdown > *:hover {
background: #e9ecef;
} }
.logout { .logout {
......
...@@ -12,3 +12,8 @@ ...@@ -12,3 +12,8 @@
/* background: #f5f0f6; */ /* background: #f5f0f6; */
/* background: #acb0bd; */ /* background: #acb0bd; */
body {
font-family: 'Lato', sans-serif;
}
\ No newline at end of file
...@@ -10,7 +10,10 @@ const Search = ({ orders, setOrdersToShow, setFiltersOn }) => { ...@@ -10,7 +10,10 @@ const Search = ({ orders, setOrdersToShow, setFiltersOn }) => {
const [inputError, setInputError] = useState(false); const [inputError, setInputError] = useState(false);
const [byError, setByError] = useState(false); const [byError, setByError] = useState(false);
const searchOptions = ["Warehouse ID", "Order ID"]; const searchOptions = [
// "Warehouse ID",
"Order ID"
];
const search = () => { const search = () => {
setInputError(false); setInputError(false);
......
...@@ -50,7 +50,7 @@ const OrderDetails = ({ order, showDetails }) => { ...@@ -50,7 +50,7 @@ const OrderDetails = ({ order, showDetails }) => {
))} ))}
</tbody> </tbody>
</table> </table>
{`Warehouse Order #: ${order.id}`} {/* {`Warehouse Order #: ${order.id}`} */}
</div> </div>
</div> </div>
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment