From 743168a53f40e56c92fe35800c140fdf90e7cc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Sajdl?= Date: Wed, 3 Jan 2018 12:17:11 +0100 Subject: [PATCH] Added help with translations & some css tweaks --- css/main.css | 37 ++++++++++++++++++++++++++----------- css/print.css | 42 +++++++++++++++++++++++++++++++++++------- footer.php | 4 +++- 3 files changed, 64 insertions(+), 19 deletions(-) diff --git a/css/main.css b/css/main.css index 686aa04..ad79d89 100644 --- a/css/main.css +++ b/css/main.css @@ -43,7 +43,7 @@ a:focus { .navbar-default .navbar-nav > li > a { color: #f5f4f4; - font-size: 16px; + font-size: 1em; } .navbar-default .navbar-nav > li > a:hover { @@ -83,7 +83,7 @@ body { } .navbar-left{ - margin-top: 10px; + margin-top: 8px; } div.center { @@ -121,14 +121,14 @@ div.center { min-width: 200px; padding: 15px 35px; font-weight: bold; - font-size: 16px; + font-size: 1.1em; font-family: 'Fira Sans', sans-serif; } a h1{ - font-size:16px; + font-size: 1.3em; margin: 0; - line-height: 20px + line-height: 1.3em } .status{ @@ -138,7 +138,7 @@ a h1{ min-width: 150px; padding: 15px 35px; text-align: right; - font-size: 14px; + font-size: 1.05em; font-family: 'Fira Sans', sans-serif; } @@ -206,7 +206,7 @@ a h1{ text-align: left; padding: 15px; border-radius: 5px; - font-size: 21px; + font-size: 1.3em; font-family: 'Fira Sans', sans-serif; } @@ -247,7 +247,12 @@ a h1{ border-left-color: transparent; } -.timeline .panel .panel-heading.icon * { font-size: 20px; vertical-align: middle; line-height: 40px; } +.timeline .panel .panel-heading.icon * { + /*This shouldn't be relative in size...*/ + font-size: 20px; + vertical-align: middle; + line-height: 40px; +} .timeline .panel .panel-heading.icon { position: absolute; left: -59px; @@ -321,7 +326,7 @@ a h1{ } #footerwrap i { - font-size: 30px; + font-size: 1.7em; color: #ebebeb; padding-right: 15px; } @@ -515,7 +520,7 @@ i.danger{ .delete { margin-left: 5px; - font-size: 20px; + font-size: 1.2em; color: white; line-height: 25px } @@ -533,7 +538,7 @@ i.danger{ .delete-service { color: red; - font-size: 16px + font-size: 1em } .service label @@ -584,4 +589,14 @@ i.danger{ max-width: 25px; margin-right: 5px; vertical-align: middle; +} + +.col-md-4.text-left, .col-md-4.text-right{ + line-height: 2.5; +} + +.dropup hr.divider +{ + margin: 2px; + border: 1px; } \ No newline at end of file diff --git a/css/print.css b/css/print.css index d2446c0..221d4ed 100644 --- a/css/print.css +++ b/css/print.css @@ -31,7 +31,7 @@ body { width: 100%; text-align: center; font-family: 'Fira Sans', sans-serif; - font-size: 28px + font-size: 1.5em } #wrapper{ @@ -46,7 +46,7 @@ body { min-width: 200px; padding: 15px 35px; font-weight: bold; - font-size: 16px; + font-size: 1em; font-family: 'Fira Sans', sans-serif; } @@ -57,24 +57,24 @@ body { min-width: 150px; padding: 15px 35px; text-align: right; - font-size: 14px; + font-size: 0.8em; font-family: 'Fira Sans', sans-serif; } -.status.success{ +#status-container .status.success{ color:#2fcc66; } -.status.warning{ +#status-container .status.warning{ color:#edaa16; } -.status.danger{ +#status-container .status.danger{ color:#e74c3c; } -.status.primary{ +#status-container .status.primary{ color:#3A72BD; } @@ -105,4 +105,32 @@ h2.panel-title{ .panel,.panel-heading,.panel-footer{ border-width: 3px +} + +body .panel-danger, +.panel-danger > .panel-body, +.panel-danger > .panel-heading, +.panel-danger > .panel-footer{ + border-color: #a94442 +} + +body .panel-success, +.panel-success > .panel-body, +.panel-success > .panel-heading, +.panel-success > .panel-footer{ + border-color: #2fcc66 +} + +body .panel-warning, +.panel-warning > .panel-body, +.panel-warning > .panel-heading, +.panel-warning > .panel-footer{ + border-color: #edaa16 +} + +body .panel-primary, +.panel-primary > .panel-body, +.panel-primary > .panel-heading, +.panel-primary > .panel-footer{ + border-color: #337ab7 } \ No newline at end of file diff --git a/footer.php b/footer.php index f15eca3..501e94e 100644 --- a/footer.php +++ b/footer.php @@ -18,9 +18,11 @@ function render_footer($admin = false)