Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
6580547
animatiom
Maryamshr Mar 9, 2015
9f4918e
Not done yet.
peralbinmattsson Mar 13, 2015
aa830d3
Fixed filter beer/wine on beer page and different image for different…
peralbinmattsson Mar 13, 2015
cae807c
probleme translation and change theme
mariin Mar 13, 2015
4e446ef
Changed load icon.
peralbinmattsson Mar 13, 2015
a78f5ee
Have to merge with master.
peralbinmattsson Mar 13, 2015
c1e9471
Fixed scroll.
peralbinmattsson Mar 13, 2015
6e62ff0
Fixed 80s theme.
peralbinmattsson Mar 13, 2015
8fa80cf
Update paypage.html
thevanthony Mar 14, 2015
904ae04
Update paypage.js
thevanthony Mar 14, 2015
6600db4
Update paypage.js
thevanthony Mar 14, 2015
dee4f94
Update paypage.css
thevanthony Mar 14, 2015
21116ca
Update paypage.css
thevanthony Mar 14, 2015
95bd1cf
Update paypage.css
thevanthony Mar 14, 2015
257ca97
Update paypage.css
thevanthony Mar 14, 2015
552d92e
Update settings.js
thevanthony Mar 14, 2015
cf6c2e7
Update translation.json
thevanthony Mar 14, 2015
0711587
Update translation.json
thevanthony Mar 14, 2015
1674442
Update translation.js
thevanthony Mar 14, 2015
c4fd85d
Update translation.json
thevanthony Mar 14, 2015
deaaea0
Update translation.js
thevanthony Mar 14, 2015
75e1223
Back button and picture for every beer on settings page.
peralbinmattsson Mar 14, 2015
303ca83
Merge branch 'master' into peralbin
peralbinmattsson Mar 14, 2015
965402b
Small fix in start80s.
peralbinmattsson Mar 14, 2015
f62d73a
Update translation.js
thevanthony Mar 14, 2015
8353bf9
Update translation.js
thevanthony Mar 14, 2015
c22093a
Update translation.js
thevanthony Mar 14, 2015
0888eb2
Update translation.js
thevanthony Mar 14, 2015
4334dbe
Update translation.js
thevanthony Mar 14, 2015
5879ed0
Update translation.js
thevanthony Mar 14, 2015
625b7b4
Update login.js
thevanthony Mar 14, 2015
d97973b
Update mainObjects.js
thevanthony Mar 14, 2015
2f01046
Update order.js
thevanthony Mar 14, 2015
b739824
Update paypage.js
thevanthony Mar 14, 2015
ffc8007
Update settings.js
thevanthony Mar 14, 2015
7085afc
Merge branch 'master' of github.com:peralbinmattsson/projectUIP
peralbinmattsson Mar 14, 2015
b7abcca
Small fixes.
peralbinmattsson Mar 14, 2015
b3cd75c
Small fix again.
peralbinmattsson Mar 14, 2015
972a31a
Rightside instruction.
peralbinmattsson Mar 14, 2015
507fb8d
Changed ship picture.
peralbinmattsson Mar 14, 2015
af2b2f9
Fixed removeFromOrder-bug.
peralbinmattsson Mar 14, 2015
e75885c
Merge remote-tracking branch 'origin/master'
Maryamshr Mar 15, 2015
a24d65a
Removed old ship.
peralbinmattsson Mar 15, 2015
5ebc974
Fixed translation
josandberg Mar 15, 2015
b64b792
Update translation.js
thevanthony Mar 15, 2015
cbedfc4
Update translation.json
thevanthony Mar 15, 2015
5d122aa
Update translation.json
thevanthony Mar 15, 2015
5ebc020
Fixed type buttons and a lang bug.
peralbinmattsson Mar 15, 2015
766ffb9
Merge branch 'master' of github.com:peralbinmattsson/projectUIP
peralbinmattsson Mar 15, 2015
21b23da
Fixed total price on pay page.
peralbinmattsson Mar 15, 2015
504ff17
Some things
josandberg Mar 15, 2015
54b720e
All except wine is beer.
peralbinmattsson Mar 15, 2015
e6b3cdb
Fixed some translations
josandberg Mar 15, 2015
f436928
fixed a bug
josandberg Mar 15, 2015
7ae6c08
paypage design
mariin Mar 15, 2015
3ab8423
Merge branch 'master' of https://github.com/peralbinmattsson/projectUIP
mariin Mar 15, 2015
2f9ef38
Update translation.js
thevanthony Mar 15, 2015
15b2a1e
Fixed some problems
josandberg Mar 15, 2015
2e63184
Fixed pay page a little.
peralbinmattsson Mar 15, 2015
51ebf6d
Merge branch 'master' of github.com:peralbinmattsson/projectUIP
peralbinmattsson Mar 15, 2015
7abac8c
paypage design
mariin Mar 15, 2015
57f3708
Merge branch 'master' of https://github.com/peralbinmattsson/projectUIP
mariin Mar 15, 2015
f3e6a8d
Small thing.
peralbinmattsson Mar 15, 2015
3ec28ef
Gray buttons.
peralbinmattsson Mar 15, 2015
5c92797
Small fix.
peralbinmattsson Mar 15, 2015
10c16a6
Pay fix.
peralbinmattsson Mar 16, 2015
48ada57
Removed mainObjects.js.
peralbinmattsson Mar 16, 2015
cbc0501
some changes
Mar 16, 2015
ad426ff
some changes
Mar 16, 2015
6e413f8
Fix payment.
peralbinmattsson Mar 16, 2015
762a93a
Merge with master.
peralbinmattsson Mar 16, 2015
246f964
Update translation.json
thevanthony Mar 16, 2015
c2ea208
Update translation.json
thevanthony Mar 16, 2015
f3b4882
Update translation.js
thevanthony Mar 16, 2015
da66c70
Update paypage.css
thevanthony Mar 16, 2015
a6d7d06
Update paypage.css
thevanthony Mar 16, 2015
10abe6c
Final fixes.
peralbinmattsson Mar 16, 2015
9f8e3f7
Merge branch 'master' of github.com:peralbinmattsson/projectUIP
peralbinmattsson Mar 16, 2015
1032888
Update translation.json
thevanthony Mar 17, 2015
75c3ebc
Update translation.json
thevanthony Mar 17, 2015
baee7a6
Update paypage.html
thevanthony Mar 17, 2015
94a966a
Fixed the start pictures.
peralbinmattsson Mar 18, 2015
8fc9d75
Fixed the stuff Lars talked about.
peralbinmattsson Mar 18, 2015
b239444
Some small fixes.
peralbinmattsson Mar 18, 2015
24f6712
Some more.
peralbinmattsson Mar 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 3 additions & 28 deletions css/beer.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,12 @@
margin-left: 150px;
margin-right: 150px;
}
#leftSide {
/*position: relative;*/
float: left;
margin-bottom: 20px;
}
span {
width: 300px;
}
#payButton {
float: left;
width: 64px;
height: 40px;
background-color: white;
border: 5px solid white;
border-radius: 5px;
font-weight: bold;
margin-bottom: 10px;
margin-left: 30px;
}


input.search {
height: 20px;
margin-top: 10px;
margin-left: 10px;
margin-bottom: 20px;
}
#add{
background-color: #FFF;
border: 0;
}
#cost p {
font-weight: bold;
}
#icon {
cursor: pointer;
}
54 changes: 54 additions & 0 deletions css/beer80s.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#beerContainer {
position: relative;
height: 600px;
margin-top: 200px;
margin-left: 150px;
margin-right: 150px;
}
#leftSide {
/*position: relative;*/
float: left;
margin-bottom: 20px;
}
span {
width: 300px;
}
#payButton {
float: left;
width: 64px;
height: 40px;
background-color: white;
border: 5px solid white;
border-radius: 5px;
font-weight: bold;
margin-bottom: 10px;
margin-left: 45px;
}
button.typeButton {
cursor: pointer;
background-color: white;
border: 3px solid white;
}
button.typeButton:hover {
font-weight: bold;
background-color: #26C6B0;
color: #D76DA9;
border: 3px solid #639BF1;
}
input.search {
height: 20px;
width: 150px;
margin-top: 10px;
margin-left: 10px;
margin-bottom: 20px;
}
#add{
background-color: #FFF;
border: 0;
}
#cost p {
font-weight: bold;
}
#icon {
cursor: pointer;
}
10 changes: 8 additions & 2 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,23 @@ img.icon_language {
}*/

#username-wrapper {
margin-left: 62px;
margin-left: 32px;
margin-top: 45px;
align-items: center;
}

#password-wrapper {
margin-left: 63px;
margin-left: 32px;
margin-top: 10px;
margin-bottom: 10px;
}

#login-btn{
display:inline;
margin: auto;
margin-left: 50px;
}

/*#password-wrapper {
margin-left: 30px;
margin-top: 10px;
Expand Down
61 changes: 29 additions & 32 deletions css/paypage.css
Original file line number Diff line number Diff line change
@@ -1,41 +1,35 @@


#leftBox {
position: fixed;
width: 500px;
background-color: #FFFFFF;
#container {
position: relative;
width: 2000px;
background-color: #222930;
border-radius: 8px;
margin-top:10px;
margin-left: 100px;
margin-top: 20px;
overflow: auto;
min-height: 350px;

min-height: 420px;

}
/*rightBox is in start.css*/
#paymentButton{
width: 200px;
height: 20px;
padding: 25px;
border-radius: 3px;
line-height: 1px;
background-color: green;
/*text style*/
background-color: mediumseagreen;
text-align:center;
color: white;
font-style: italic;

/*hover*/
position: fixed;
position: absolute;
display: inline-block;
margin-left: 280px;
margin-top: 280px;
opacity: 1;
}

#cancel{
font-family:"Verdana", Verdana, sans-serif ;
color: #000000;
text-decoration: underline;
position: fixed;
margin-left:40px;
margin-top: 310px;
color: #000000;
position: absolute;
margin-left: 27px;
margin-top: 289px;
background: salmon;
}


Expand All @@ -50,14 +44,6 @@
margin-left: 150px;

}
/*#part0 {
border: 2px solid #a1a1a1;
padding: 10px 40px;
width: 300px;
border-radius: 25px;
position: absolute;
}
*/
#credit{
font-size: 26px;
line-height: 300%;
Expand All @@ -72,7 +58,6 @@
margin-top: 10px ;
}

/*common with setting*/
div#black_wrapper{
background-color: rgba(0, 0, 0, 0.7);
width: 100%;
Expand All @@ -96,6 +81,18 @@ div#confirm_editer{
box-shadow: 10px 10px 5px black;
}

#confirm_btn{
float: left;
margin-left: 50px;
margin-top: 20px;
margin-bottom: 20px;
}

#cancel_btn{
margin-top: 20px;
margin-bottom: 20px;
}

.hidden{
visibility: hidden;
display: none;
Expand Down
19 changes: 6 additions & 13 deletions css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
margin: 200px 150px 0px;
*/
position: relative;
float: left;
/*float: left;*/
margin-bottom: 20px;
}
/*
Expand All @@ -49,13 +49,6 @@ span {
width: 300px;
}

input.search {
height: 20px;
margin-top: 10px;
margin-left: 10px;
margin-bottom: 20px;
}

div#black_wrapper{
background-color: rgba(0, 0, 0, 0.7);
width: 100%;
Expand All @@ -70,19 +63,20 @@ div#item_editer{
left: 25%;
padding: 10px;
width: 500px;
min-height: 450px;
/*min-height: 450px;*/
text-align: center;
background-color: #4EB1BA;
overflow: auto;
border: 5px solid #4EB1BA;
border-radius: 5px;
box-shadow: 10px 10px 5px black;
padding-bottom: 30px;
}

#user_btn, #stock_btn{
/*#user_btn, #stock_btn{
background-color: #FFF;
border: 0;
}
}*/

.hidden{
visibility: hidden;
Expand All @@ -99,8 +93,8 @@ div#item_editer{
}

#rightSide{
margin-top: 0px;
height: 400px;
color: black;
}
#rightSide table{
margin-left: 10px;
Expand All @@ -109,5 +103,4 @@ div#item_editer{
#confirm_button{
float: left;
}
}

Loading