Merge branch 'fix/logo_distortion' into 'master'
Fix logo distortion issue and reduce the size of some logos rather than scaling them in the browser See merge request cara/cara!154
This commit is contained in:
Gabriella Azzopardi
commit
e6c791699f
14 changed files with 17 additions and 57 deletions
|
|
@ -5,7 +5,7 @@
|
|||
"metadata": {},
|
||||
"source": [
|
||||
"<div style=\"text-align: center;\" align=\"center\">\n",
|
||||
"<img src=\"../files/static/images/cara_logo_text_tight_margins.png\" align=\"center\" style=\"text-align: center; height: 12em;\" /></div>\n",
|
||||
"<img src=\"../files/static/images/cara_logo_text_cern.png\" align=\"center\" style=\"text-align: center; height: 12em;\" /></div>\n",
|
||||
"<p style=\"color: blue; font-weight: bold; font-size: x-large; text-align: center;\" align=\"center\">\n",
|
||||
"Airborne Transmission of SARS-CoV-2\n",
|
||||
"</p>"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
v{{ calculator_version }} <span style="float:right; font-weight:bold">Please send feedback to <a href="mailto:CARA-dev@cern.ch">CARA-dev@cern.ch</a></span>
|
||||
<div>
|
||||
<img src="/static/images/cara_logo.png" style="height:175px; width:100px; display:inline-block; vertical-align:middle; object-fit:cover;">
|
||||
<img src="/static/images/cara_logo.200x200.png" style="height: 7em; display:inline-block; vertical-align:middle; padding: 1em;">
|
||||
<h1 style="display:inline-block; vertical-align:middle;"><b>CARA - </b> COVID Airborne Risk Assessment calculator</h1>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
<body id="body">
|
||||
|
||||
<div style="position:relative; text-align:center; margin-left:-200pt; max-height:180pt;">
|
||||
<img src="/static/images/cara_logo_text.png" style="height:350px; margin-top:-50pt; display:inline-block; vertical-align:middle; object-fit:cover;">
|
||||
<h1 style="display:inline-block; vertical-align:middle; margin-left:-30pt;">Report</h1>
|
||||
<div style="position:relative; text-align:center; margin-left:-200pt; max-height:180pt; margin-bottom: 1em;">
|
||||
<img src="/static/images/cara_logo_text.png" style="height:150px; display:inline-block; vertical-align:middle; object-fit:cover;">
|
||||
<h1 style="display:inline; vertical-align:middle; margin-left:1em;">Report</h1>
|
||||
</div>
|
||||
|
||||
<p class=subtitle> Created {{ creation_date }} using CARA calculator version v{{ form.calculator_version }}</p><br>
|
||||
|
|
|
|||
|
|
@ -384,6 +384,10 @@ body header .site-info {
|
|||
display: flex;
|
||||
}
|
||||
|
||||
header .site-info__text img {
|
||||
height: 58pt;
|
||||
}
|
||||
|
||||
body header .site-info__logo {
|
||||
padding: 0 10px 0 0;
|
||||
}
|
||||
|
|
@ -875,6 +879,10 @@ body.has-header.cern-toolbar:not(.toolbar-vertical).toolbar-tray-open main nav.t
|
|||
width: 90%;
|
||||
max-height: 60px;
|
||||
}
|
||||
|
||||
header .site-info__text img {
|
||||
height: 60px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width:360px) {
|
||||
|
|
|
|||
BIN
cara/apps/static/images/cara_logo.200x200.png
Normal file
BIN
cara/apps/static/images/cara_logo.200x200.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 37 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 47 KiB |
BIN
cara/apps/static/images/cara_logo_text_cern.png
Executable file → Normal file
BIN
cara/apps/static/images/cara_logo_text_cern.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 37 KiB |
|
|
@ -1,48 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1"
|
||||
id="svg3759" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="logoCERN.svg" inkscape:version="0.92.1 r15371"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="618.3 -198.9 383.5 380.1" style="enable-background:new 618.3 -198.9 383.5 380.1;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style>
|
||||
<sodipodi:namedview inkscape:cy="560" showgrid="false" inkscape:cx="-127.14286" inkscape:zoom="0.35" borderopacity="1.0" pagecolor="#ffffff" bordercolor="#666666" id="base" inkscape:window-maximized="1" inkscape:window-y="-8" inkscape:current-layer="layer1" inkscape:pageshadow="2" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:window-height="1027" inkscape:window-x="1912" inkscape:window-width="1920">
|
||||
</sodipodi:namedview>
|
||||
<g id="layer1" inkscape:label="Capa 1" inkscape:groupmode="layer">
|
||||
|
||||
<path id="path3704" sodipodi:nodetypes="csccssscscscccsscscccsscsscccscssssscssccscsccccsccccscccsscssscscsccccccsccscsscccccscsccccsssccscccscccsscsccscccccccccccccccccscsscsccccscccccccccccccccccccccccccccccccscccccccscccccccscccccc" inkscape:connector-curvature="0" class="st0" d="
|
||||
M713.8,175.5c3.1-3.2,26.6-28.2,52.4-55.8s50-53.3,53.9-57.3l7.1-7.3l-10.5,5.5c-19.7,10.3-33.1,13.6-57.6,14.4
|
||||
c-20,0.6-30.9-0.8-47.1-6.2C683,59,659.2,41.2,643,16.9c-2.9-4.3-5.3-7.6-5.3-7.4c0,0.3,21.8,74.4,25.6,86.9
|
||||
c0.4,1.4-0.1,1.7-3.1,1.7c-3,0-3.8-0.5-4.6-2.7c-3.2-8.4-31.3-109.4-34.1-122.4c-3-14.2-3.3-20.8-3.3-33.9c0-7.4,0.4-20.4,1.8-26.8
|
||||
c5-22.6,14.7-43.1,29.1-60.8c19.6-24.4,48.3-41.7,79.6-48c7.7-1.6,20.5-1.8,140.7-2.1l132.3-0.4v3v3l-26.8,0
|
||||
c-14.7,0-60.9,0.3-102.7,0.7c-75.5,0.7-75.9,0.7-70.5,2.5c8.3,2.8,24.9,11.3,32.6,16.7c7.4,5.2,17.7,14.1,17.1,14.8
|
||||
c-0.2,0.2-3.2-0.3-6.6-1.2c-4.4-1.1-8.5-3.3-14.4-7.5c-33.1-23.9-76.7-30.7-115.4-18c-19.8,6.5-35.9,16.5-51.4,32
|
||||
c-25.5,25.5-38.2,55.7-38.2,91.1c0,21.1,3.5,36.8,12.4,55.9c12.6,27,37.6,51.3,65.1,63.2c29.2,12.8,62.5,14.3,92.5,4.4
|
||||
c20.5-6.8,34.7-15.7,51-31.9c15.9-15.9,25.3-30.9,31.8-51c5-15.5,6-22.3,6-40.6c0-14.5-0.4-17.8-2.7-27.1
|
||||
c-4.3-17.2-10.2-30.7-19-43.8c-5.4-8-5.1-8.3,3.7-3.9c4.9,2.5,5.3,3,11.4,14.7c10.3,20,14.3,33.7,28,96.5
|
||||
c9.3,42.4,44.8,201.7,45.7,204.8c0.4,1.5-0.2,1.7-3.5,1.7c-3.9,0-4,0-5-4.8c-14.5-68-50.8-229.8-51.3-228.5c-0.4,1-0.7,3.8-0.8,6.4
|
||||
C890.5-28.3,881.7-4,868,16.7c-9.8,14.8-20.4,26.8-86.5,97.2l-63.2,67.3h-5h-5L713.8,175.5z M805.7,120.6c-9.5-1-19.8-2.6-20.8-3.3
|
||||
c-0.8-0.5-0.3-1.6,1.7-3.5l2.9-2.8l9.1,1.2c11,1.5,30.4,0.8,41.1-1.5c25.7-5.5,48.1-17.5,66.2-35.7c4.8-4.8,8.9-8.4,9.1-8.1
|
||||
c0.2,0.4,0.7,2.3,1,4.3c0.8,4.5-0.5,6.2-11.6,15.6c-19.9,16.8-39.5,26.4-63.3,31.2C831.5,120,812.7,121.4,805.7,120.6L805.7,120.6z
|
||||
M756.7,107.6c-13.8-6.7-28.2-16.6-38.4-26.5l-9-8.7l7.7,2.2c5.8,1.7,8.7,3.2,12,6.2c9.9,9.1,25.9,18.8,38.7,23.5l6.2,2.3l-2.7,2.9
|
||||
c-1.5,1.6-3.2,2.9-3.9,2.9C766.6,112.2,761.8,110.2,756.7,107.6L756.7,107.6z M927,54.7c-1-4.3-0.8-4.9,3.6-13.8
|
||||
c9.9-19.7,13.6-35.6,13.5-58.2c0-22.2-4-40.4-13.1-60.4c-13.3-29.1-41-54.7-71.1-65.5c-48.7-17.5-98-7.1-136.1,28.8l-7.1,6.7
|
||||
l-2.5-1.8c-1.4-1-2.5-2.3-2.5-2.8c-0.1-1.7,14.7-15.1,23.8-21.5c9.9-7.1,25.1-14.7,36.4-18.4c14.6-4.7,23.8-6,42.7-6
|
||||
c25.5,0.1,40.8,3.7,62.5,14.7c18.8,9.6,38.3,26.6,49.5,43.1c10.6,15.7,19.7,38,22.4,54.7l1.3,8.4l0.7-5
|
||||
c0.8-5.9,11.7-118.5,11.7-120.8c0-1.2,0.9-1.7,3.5-1.7c3.2,0,3.5,0.3,3.5,2.8c0,3.4-9.2,95.5-12.1,120.6
|
||||
c-4.2,36.9-9.1,59.8-16.8,77.5c-3.4,7.8-11.6,23.1-12.5,23.1C928.2,59.2,927.6,57.2,927,54.7L927,54.7z M699,50.7
|
||||
c-4.4-2.1-5.6-3.2-8.1-8.2c-6.7-13.2-12.1-33.2-13.6-50.1l-0.7-7.3h4.1h4.1v4.9c0,7.1,3.6,24.8,7.1,34.9c1.7,4.8,5.3,12.9,8,18.1
|
||||
c2.7,5.2,4.8,9.5,4.6,9.7C704.3,53,701.8,52.1,699,50.7z M667.2-37.5c-11.1-4-17.1-12-18.1-24.1c-1.1-13.1,3.9-22.5,15-28.1
|
||||
c6.5-3.3,7.4-3.5,16-3.4c5,0.1,11.2,0.8,13.6,1.6c4.3,1.3,4.5,1.6,4.2,4.8c-0.4,4.5-0.8,4.7-3.5,2.2c-5.3-5-16.2-6.6-23.2-3.3
|
||||
c-8.8,4.1-13.8,12.4-13.7,23.1c0,10.7,4.7,18.5,13.7,22.6c8.1,3.8,16.5,2.7,24.1-3.1l3.6-2.7l-0.3,3.3c-0.3,2.8-1.1,3.7-4.8,5.8
|
||||
C687.7-35.5,674.6-34.9,667.2-37.5z M846.2-39c-4.3-5.1-35.8-38.2-36.8-38.6c-0.6-0.2-0.7,7.6-0.2,20.2l0.7,20.6h-3.7
|
||||
c-3.6,0-3.7-0.1-3.1-3.1c0.3-1.7,0.6-14.3,0.6-28c0-20.7,0.2-24.9,1.4-24.9c0.8,0,10.1,9,20.6,20c10.6,11,19.7,20,20.2,20
|
||||
c0.6,0,0.7-7,0.3-19.7l-0.7-19.8l3.7-0.1c3.6-0.1,3.7,0,3.1,2.9c-0.3,1.6-0.6,14.4-0.6,28.3C851.7-33.3,851.5-32.6,846.2-39
|
||||
L846.2-39z M708.7-64.5v-27.7h16.5h16.5v2.7v2.7l-12.5-0.6l-12.5-0.6v10.3v10.3l10-0.4l10-0.4v2.9v2.9l-10-0.4l-10-0.4v10.9v10.9
|
||||
l13-0.6l13-0.6v2.9v2.9h-17h-17L708.7-64.5z M753.2-64.5v-27.7l13.5,0.1c15.1,0.1,18.8,1.2,21.5,6.4c2.1,4,1.9,9.9-0.4,13.5
|
||||
c-2.1,3.2-8.6,7.5-11.2,7.6c-0.9,0-1.9,0.4-2.2,0.9c-0.3,0.5,4.4,6.8,10.5,14l11,13.2l-5.3,0l-5.3,0l-4.5-6.7
|
||||
c-9.3-13.7-14.9-20.3-17.7-20.3h-2.6l0.7,13.5l0.7,13.5l-4.4,0l-4.4,0L753.2-64.5z M772.3-67.9c9-2.3,12.2-10.7,6.5-17.1
|
||||
c-2.6-2.9-3.5-3.3-9.9-3.6l-7-0.4l-0.7,10c-0.4,5.5-0.4,10.5-0.1,11.1C762-66.5,766.7-66.5,772.3-67.9L772.3-67.9z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 5.3 KiB |
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
<div class="text-component text-component-page clearfix" style="position:relative; " >
|
||||
|
||||
<img src="/static/images/cara_logo.png" style="width:100px; height:200px; display:inline-block; vertical-align:middle; object-fit:cover;">
|
||||
<img src="/static/images/cara_logo.200x200.png" style="height:10em; display:inline-block; vertical-align:middle; padding: 1em;">
|
||||
<h2 class="text-component-title" style="display:inline-block; vertical-align:middle; align:center;">
|
||||
CARA: COVID Airborne Risk Assessment Tools
|
||||
</h2>
|
||||
|
|
|
|||
|
|
@ -89,15 +89,15 @@
|
|||
<header role="banner" style="display: block;">
|
||||
<img src="/static/images/hse_triangle_right_1.png" style="float:left; height: 65pt; margin-top: 7pt">
|
||||
<div class="header-wrapper" style="background: rgb(47, 52, 66); clear: none;">
|
||||
<div class="site-info col-sm-2" style="max-height: 76px;">
|
||||
<div class="site-info col-sm-3" style="max-height: 76px;">
|
||||
<div class="site-info__text col-lg-9 col-md-10 col-sm-9" style="overflow:hidden;">
|
||||
<a href="/" title="Home" rel="home">
|
||||
<img src="/static/images/cara_logo_white_text.png" alt="home" style="height: 150pt; margin-top: 7pt;">
|
||||
<img src="/static/images/cara_logo_white_text.png" alt="home">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="site-nav col-sm-10 ">
|
||||
<div class="site-nav col-sm-9 ">
|
||||
|
||||
<div class="region region-header">
|
||||
<nav role="navigation" aria-labelledby="block-cernoverride-main-menu-menu"
|
||||
|
|
|
|||
Loading…
Reference in a new issue