Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CS123-Canteeneo
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Willard Torres
CS123-Canteeneo
Commits
5e4018f1
Commit
5e4018f1
authored
Oct 29, 2016
by
Willard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor style and text changes
parent
6c93b87c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
17 deletions
+15
-17
Raleway-Regular.ttf
canteeneo/static/Raleway-Regular.ttf
+0
-0
style.css
canteeneo/static/style.css
+11
-13
base.html
canteeneo/templates/base.html
+1
-1
stall.html
canteeneo/templates/stall.html
+3
-3
No files found.
canteeneo/static/Raleway-Regular.ttf
deleted
100644 → 0
View file @
6c93b87c
File deleted
canteeneo/static/style.css
View file @
5e4018f1
@font-face
{
@import
url('https://fonts.googleapis.com/css?family=Raleway:400,700')
;
font-family
:
'Raleway'
;
src
:
url('Raleway-Regular.ttf')
;
}
body
{
body
{
margin
:
0
;
margin
:
0
;
...
@@ -16,8 +13,8 @@ body {
...
@@ -16,8 +13,8 @@ body {
}
}
button
{
button
{
background-color
:
#
3333
FF
;
background-color
:
#
5555
FF
;
border
:
2px
solid
#3333
DD
;
border
:
1px
solid
#5555
DD
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
outline
:
0
;
outline
:
0
;
font-size
:
32pt
;
font-size
:
32pt
;
...
@@ -26,24 +23,24 @@ button {
...
@@ -26,24 +23,24 @@ button {
}
}
button
:hover
{
button
:hover
{
background-color
:
#
3333
DD
;
background-color
:
#
5555
DD
;
}
}
button
:active
{
button
:active
{
background-color
:
#
3333
DD
;
background-color
:
#
5555
DD
;
}
}
.button-delete
{
.button-delete
{
background-color
:
#FF
3333
;
background-color
:
#FF
5555
;
border
:
2px
solid
#DD
3333
;
border
:
2px
solid
#DD
5555
;
}
}
.button-delete
:hover
{
.button-delete
:hover
{
background-color
:
#DD
3333
;
background-color
:
#DD
5555
;
}
}
.button-delete
:active
{
.button-delete
:active
{
background-color
:
#DD
3333
;
background-color
:
#DD
5555
;
}
}
.field-label
{
.field-label
{
...
@@ -145,7 +142,7 @@ button:active {
...
@@ -145,7 +142,7 @@ button:active {
.list-item
{
.list-item
{
display
:
flex
;
display
:
flex
;
width
:
4
0
%
;
width
:
4
8
%
;
margin
:
10px
;
margin
:
10px
;
background-color
:
white
;
background-color
:
white
;
}
}
...
@@ -164,6 +161,7 @@ button:active {
...
@@ -164,6 +161,7 @@ button:active {
.list-name
{
.list-name
{
font-size
:
28pt
;
font-size
:
28pt
;
font-weight
:
700
;
}
}
.list-button
{
.list-button
{
...
...
canteeneo/templates/base.html
View file @
5e4018f1
<!DOCTYPE html>
<html>
<html>
<head>
<head>
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
...
...
canteeneo/templates/stall.html
View file @
5e4018f1
...
@@ -4,20 +4,20 @@
...
@@ -4,20 +4,20 @@
<span
style=
"font-size: 32pt; flex-grow: 2;"
>
<span
style=
"font-size: 32pt; flex-grow: 2;"
>
{{stall.name}}
{{stall.name}}
</span>
</span>
<a
href=
"{{ url_for('new_dish', stall_id=stall.id) }}"
><button
class=
"link-button"
style=
"flex-grow: 1;"
>
Add
Food Item
</button></a>
<a
href=
"{{ url_for('new_dish', stall_id=stall.id) }}"
><button
class=
"link-button"
style=
"flex-grow: 1;"
>
Add
Dish
</button></a>
<a
href=
"{{ url_for('edit_stall', stall_id=stall.id) }}"
><button
class=
"link-button"
style=
"flex-grow: 1;"
>
Edit Info
</button></a>
<a
href=
"{{ url_for('edit_stall', stall_id=stall.id) }}"
><button
class=
"link-button"
style=
"flex-grow: 1;"
>
Edit Info
</button></a>
</div>
</div>
<div
class=
"dashboard-row"
>
<div
class=
"dashboard-row"
>
<div
class=
"list"
>
<div
class=
"list"
>
{% if dishes|length > 0 %} {% for dish in dishes %}
{% if dishes|length > 0 %} {% for dish in dishes %}
<div
class=
"list-item"
>
<div
class=
"list-item"
>
<div
class
"
list-image
"
>
<div
class
=
"list-image"
>
<img
width=
"200px"
height=
"200px"
src=
"{{url_for('static', filename='uploads/'+dish.image_path)}}"
alt=
""
>
<img
width=
"200px"
height=
"200px"
src=
"{{url_for('static', filename='uploads/'+dish.image_path)}}"
alt=
""
>
</div>
</div>
<div
class=
"list-info"
>
<div
class=
"list-info"
>
<span
class=
"list-name"
>
{{dish.name}}
</span>
<span
class=
"list-name"
>
{{dish.name}}
</span>
<span
class=
"list-price"
>
Php{{dish.price}}
</span>
<span
class=
"list-price"
>
Php{{dish.price}}
</span>
<a
href=
"{{ url_for('edit_dish', stall_id=stall.id, dish_id=dish.id) }}"
><button
class=
"list-button"
>
Edit
Dish
</button></a>
<a
href=
"{{ url_for('edit_dish', stall_id=stall.id, dish_id=dish.id) }}"
><button
class=
"list-button"
>
Edit
</button></a>
</div>
</div>
</div>
</div>
{% endfor %} {% endif %}
{% endfor %} {% endif %}
...
...
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