diff --git a/css/main.css b/css/main.css index a2fd24044..ed9589164 100644 --- a/css/main.css +++ b/css/main.css @@ -105,36 +105,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%; @@ -181,7 +166,7 @@ span.panel-res { } .pending button { - margin: 0; + margin: 0 10px 0 0; } .line { @@ -239,6 +224,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;} diff --git a/css/tpl-default.css b/css/tpl-default.css index cab9f35f2..a08c5e5ad 100644 --- a/css/tpl-default.css +++ b/css/tpl-default.css @@ -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; diff --git a/index.html b/index.html index bf62b2ac5..5b0c9405a 100644 --- a/index.html +++ b/index.html @@ -54,7 +54,7 @@
-
+
{{$root.flashMessage.message}} ×
@@ -62,7 +62,7 @@
-
+
@@ -131,7 +131,7 @@