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
97c61015
Commit
97c61015
authored
May 12, 2021
by
Philippe Fonzin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/style' into 'master'
fix logo and overflow See merge request
!19
parents
2ece3e60
ee962df1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
logo.svg
frontend/public/logo.svg
+1
-0
order.css
frontend/public/stylesheets/order.css
+1
-1
Header.jsx
frontend/src/components/header/Header.jsx
+1
-1
No files found.
frontend/public/logo.svg
0 → 100644
View file @
97c61015
<svg
id=
"Layer_3"
enable-background=
"new 0 0 64 64"
height=
"512"
viewBox=
"0 0 64 64"
width=
"512"
xmlns=
"http://www.w3.org/2000/svg"
><g><path
d=
"m2 15.054h60.001v46.946h-60.001z"
fill=
"#c1c8d1"
/><path
d=
"m1.999 15.054h60.002c-7.485-8.031-18.156-13.054-30.001-13.054s-22.516 5.023-30.001 13.054z"
fill=
"#8892a0"
/><path
d=
"m12 29h40v33h-40z"
fill=
"#e7e4dd"
/><path
d=
"m12 50h12v12h-12z"
fill=
"#976947"
/><path
d=
"m12 25h40v8h-40z"
fill=
"#758190"
/><g><path
d=
"m12 28h40v2h-40z"
fill=
"#a8b0bc"
/></g><path
d=
"m54 25h-44v-4c0-1.105.895-2 2-2h40c1.105 0 2 .895 2 2z"
fill=
"#243242"
/><g><path
d=
"m22 10h20v2h-20z"
fill=
"#a8b0bc"
/></g><g><path
d=
"m22 6h20v2h-20z"
fill=
"#a8b0bc"
/></g><path
d=
"m12 38h12v12h-12z"
fill=
"#c18e59"
/><path
d=
"m16 38v4h4v-4"
fill=
"#f7d881"
/><path
d=
"m16 50v4h4v-4"
fill=
"#f7d881"
/><path
d=
"m24 50h12v12h-12z"
fill=
"#c18e59"
/><path
d=
"m28 50v4h4v-4"
fill=
"#f7d881"
/><g><path
d=
"m15 45h6v2h-6z"
fill=
"#f7d881"
/></g><g><path
d=
"m27 57h6v2h-6z"
fill=
"#f7d881"
/></g><g><path
d=
"m15 57h6v2h-6z"
fill=
"#f7d881"
/></g><path
d=
"m62 35h-6v10h6"
fill=
"#c66b60"
/><g><path
d=
"m6 35h2v2h-2z"
fill=
"#758190"
/></g><g><path
d=
"m6 39h2v2h-2z"
fill=
"#758190"
/></g><g><path
d=
"m6 43h2v2h-2z"
fill=
"#758190"
/></g><g><path
d=
"m59 39h3v2h-3z"
fill=
"#f7d881"
/></g><path
d=
"m32 .999c-11.612 0-22.813 4.875-30.733 13.373-.172.185-.269.429-.269.682l.002 46.946c0 .552.448 1 1 1h60c.552 0 1-.448 1-1l.001-46.945c0-.253-.096-.497-.269-.682-7.92-8.499-19.121-13.374-30.732-13.374zm27.602 13.055h-55.205c7.405-7.052 17.335-11.055 27.603-11.055 10.267 0 20.197 4.003 27.602 11.055zm-8.602 17.946h-38v-2h38zm-34 7h2v2h-2zm-1 3.999h4c.553 0 1-.447 1-1v-3h2v10h-10v-9.999h2v3c0 .552.447.999 1 .999zm1 8.001h2v2h-2zm-4 0h2v3c0 .553.447 1 1 1h4c.553 0 1-.447 1-1v-3h2v10h-10zm16 0h2v2h-2zm-1 3.999h4c.553 0 1-.447 1-1v-3h2v10h-10v-9.999h2v3c0 .552.447.999 1 .999zm8-5.999h-11v-11c0-.553-.447-1-1-1h-11v-3h38v27h-14v-11c0-.553-.448-1-1-1zm-25-25.001v-3c0-.552.448-1 1-1h40c.552 0 1 .448 1 1v3zm40 2v2h-38v-2zm2 35.001v-32-3h1c.553 0 1-.447 1-1v-4c0-1.654-1.346-3-3-3h-40c-1.654 0-3 1.346-3 3v4c0 .553.447 1 1 1h1v3 9 12 11h-8v-44.945h58v17.945h-5c-.553 0-1 .447-1 1v10c0 .553.447 1 1 1h5v15zm8-20.001v3h-4v-8h4v3h-2v2z"
/><path
d=
"m22 10h20v2h-20z"
/><path
d=
"m22 6h20v2h-20z"
/><path
d=
"m15 57h6v2h-6z"
/><path
d=
"m15 45h6v2h-6z"
/><path
d=
"m27 57h6v2h-6z"
/><path
d=
"m6 35h2v2h-2z"
/><path
d=
"m6 39h2v2h-2z"
/><path
d=
"m6 43h2v2h-2z"
/></g></svg>
\ No newline at end of file
frontend/public/stylesheets/order.css
View file @
97c61015
...
...
@@ -128,7 +128,7 @@
overflow
:
hidden
;
padding
:
20px
50px
;
box-sizing
:
border-box
;
overflow
:
scroll
;
overflow
:
auto
;
}
.animate
{
...
...
frontend/src/components/header/Header.jsx
View file @
97c61015
...
...
@@ -6,7 +6,7 @@ const Header = ({ isLoggedIn, logout }) => {
return
(
<
div
className=
"header"
>
<
div
>
<
Image
src=
"
https://www.flaticon.com/svg/vstatic/svg/2562/2562296.svg?token=exp=1620448865~hmac=b6bb0b0a072e16f423c481f7a3175fa9
"
/>
<
Image
src=
"
./logo.svg
"
/>
<
div
>
Warehouse Management
</
div
>
</
div
>
{
isLoggedIn
?
<
Logout
onClick=
{
logout
}
/>
:
null
}
...
...
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