Merge branch 'develop' into 'master'

Fix ABB css in infoscreen

See merge request vtmk/web2.0!106
This commit is contained in:
Aarni Halinen
2018-01-30 17:36:35 +02:00
+2 -2
View File
@@ -1,10 +1,10 @@
<link rel="stylesheet" href="/static/infoscreen/infoscreen/css/abb.css">
<link rel="stylesheet" href="/static/infoscreen/css/abb.css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<div ng-controller="ABBController">
<!-- Only show the job listing if there are any jobs, i.e, the jobs list is non-empty -->
<div id="header" class="row" ng-if="jobs.length > 0">
<div id="header-logo">
<img src="/static/img/ABB_logo.png">
<img src="/static/infoscreen/img/ABB_logo.png">
</div>
<div id="header-title">
TYÖPAIKAT