anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fixes conflicts in index.html

Browse source
This commit is contained in:
Gustavo Cortez 2014-04-30 16:32:07 -03:00
commit 2bd7242308
3 changed files with 91 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

28
css/main.css
View file

@ -108,36 +108,21 @@ html, body {height: 100%;}
border: 1px solid #eee;
}
.transactions .panel.pending {
padding: 1rem;
.transactions .panel {
padding: 0;
}
.pending .txheader {
margin-bottom: 10px;
padding-bottom: 10px;
/* border-bottom: 1px solid #eee; */
}
.pending .txbottom {
margin-top: 10px;
padding-top: 10px;
/* border-top: 1px solid #eee; */
font-size: 12px;
}
.btransactions .txheader {
/*.btransactions .txheader {
font-size: 12px;
margin-bottom: 10px;
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
.btransactions .txbottom {
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid #eee;
font-size: 12px;
}
}*/
.pending table {
width: 100%;
@ -184,7 +169,7 @@ span.panel-res {
}
.pending button {
margin: 0;
margin: 0 10px 0 0;
}
.line {
@ -249,6 +234,9 @@ hr { margin: 2.25rem 0;}
.size-60 { font-size: 60px; }
.size-72 { font-size: 72px; }
.m10t {margin-top: 10px;}
.m10r {margin-right: 10px;}
.m10 {margin: 10px !important;}
.m15 {margin: 15px !important;}
.p10t {padding-top: 10px;}
.p0r {padding-right: 0;}
.p70r {padding-right: 70px;}

32
css/tpl-default.css
View file

@ -150,13 +150,35 @@ small.has-error {
color: #f04124;
}
button.primary { background-color: #111; }
button.secondary { background-color: #FAE448 !important; }
.panel.radius {
-webkit-border-radius: 10px;
border-radius: 10px;
}
button.primary:hover { background-color: #333;}
button.secondary:hover { background-color: #FFDF00 !important;}
.transactions button, .transactions .button {
padding: 0.5rem 2rem;
}
.small {
font-size: 60%;
line-height: inherit;
}
.text-gray { color: #999;}
button.radius, .button.radius {
-webkit-border-radius: 5px;
border-radius: 5px;
}
button.primary, button.secondary, button.primary:hover, button.secondary:hover {color: #fff !important;}
button.primary { background-color: #E67E22; }
button.secondary { background-color: #1ABC9C !important; }
button.warning { background-color: #C0392A; }
button.primary:hover { background-color: #D86601;}
button.secondary:hover { background-color: #16A085 !important;}
button.warning:hover { background-color: #82251A; }
.text-gray { color: #999 !important;}
#footer {
background: #2C3E50;