Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
warehouse-management
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
warehouse-management
Commits
d0251490
Commit
d0251490
authored
May 13, 2021
by
Darrick Yong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finalize styling
parent
f5b127d4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
8 deletions
+25
-8
index.html
frontend/public/index.html
+2
-0
filter.css
frontend/public/stylesheets/filter.css
+2
-2
header.css
frontend/public/stylesheets/header.css
+11
-4
master.css
frontend/public/stylesheets/master.css
+5
-0
Search.jsx
frontend/src/components/filter/Search.jsx
+4
-1
OrderDetails.jsx
frontend/src/components/order/OrderDetails.jsx
+1
-1
No files found.
frontend/public/index.html
View file @
d0251490
...
...
@@ -10,6 +10,8 @@
content=
"Web site created using create-react-app"
/>
<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
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
...
...
frontend/public/stylesheets/filter.css
View file @
d0251490
...
...
@@ -90,13 +90,13 @@
cursor
:
pointer
;
padding
:
10px
0
;
font-size
:
16px
;
font-family
:
"Times New Roman"
,
Times
,
serif
;
font-family
:
'Lato'
,
sans-
serif
;
}
.search
>
input
{
padding
:
10px
;
font-size
:
16px
;
font-family
:
"Times New Roman"
,
Times
,
serif
;
font-family
:
'Lato'
,
sans-
serif
;
}
.search-btn
:hover
,
...
...
frontend/public/stylesheets/header.css
View file @
d0251490
...
...
@@ -43,8 +43,7 @@
}
.user
:hover
{
border-radius
:
5px
;
background
:
red
;
color
:
#CCCDCF
;
}
.dropdown
{
...
...
@@ -60,12 +59,20 @@
border
:
1px
solid
black
;
font-size
:
16px
;
font-weight
:
400
;
top
:
4
0px
;
top
:
3
0px
;
right
:
10px
;
}
.dropdown
>
*
~
*
{
margin-top
:
5px
;
margin-top
:
10px
;
}
.dropdown
>
*
{
padding
:
5px
10px
;
}
.dropdown
>
*
:hover
{
background
:
#e9ecef
;
}
.logout
{
...
...
frontend/public/stylesheets/master.css
View file @
d0251490
...
...
@@ -12,3 +12,8 @@
/* background: #f5f0f6; */
/* background: #acb0bd; */
body
{
font-family
:
'Lato'
,
sans-serif
;
}
\ No newline at end of file
frontend/src/components/filter/Search.jsx
View file @
d0251490
...
...
@@ -10,7 +10,10 @@ const Search = ({ orders, setOrdersToShow, setFiltersOn }) => {
const
[
inputError
,
setInputError
]
=
useState
(
false
);
const
[
byError
,
setByError
]
=
useState
(
false
);
const
searchOptions
=
[
"Warehouse ID"
,
"Order ID"
];
const
searchOptions
=
[
// "Warehouse ID",
"Order ID"
];
const
search
=
()
=>
{
setInputError
(
false
);
...
...
frontend/src/components/order/OrderDetails.jsx
View file @
d0251490
...
...
@@ -50,7 +50,7 @@ const OrderDetails = ({ order, showDetails }) => {
))
}
</
tbody
>
</
table
>
{
`Warehouse Order #: ${order.id}`
}
{
/* {`Warehouse Order #: ${order.id}`} */
}
</
div
>
</
div
>
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment