senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/senaduka/ribica

Browse Source 
Conflicts:
	front-ui/app/components/cart/cartPage.js
This commit is contained in:
Edin Dazdarevic
2015-05-26 18:12:26 +02:00
parent 8bed4eb3f7 db6dd6a1ab
commit 12f48ab0e7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
front-ui/app/css/main.css
View File

@@ -46,9 +46,7 @@ h1 h2 h3 h4 h5{
.mybutton{
background-color: #00a8a8;
padding: 6px 11px !important;
display: block;
border-radius: 3px;
margin-top: 8px;
border: solid #06c3c3 1px;
color: #ffffff !important;
}
@@ -56,9 +54,8 @@ h1 h2 h3 h4 h5{
.mybutton:hover {
background-color: #06c3c3 !important;
padding: 6px 11px !important;
color: black !important;
margin-top: 8px;
display: block;
border-radius: 3px;
border: solid #06c3c3 1px;
color: #ffffff !important;
@@ -105,7 +102,7 @@ background: none;
}
.mynav li .mybutton:hover {
background-color: #06c3c3;
padding: 4px 10px !important;
padding: 4px 10px !important;
margin-top: 6px;
display: block;
border-radius: 3px;