Merge pull request #108 from common-workflow-language/logo-fix

MarkRobbo · web-flow · commit dfec3c6bc9ad · 2017-06-13T14:58:19.000+01:00
Remove negative margins on logo to improve fitment
diff --git a/src/main/resources/static/css/main-20170613.css b/src/main/resources/static/css/main-20170613.css
@@ -37,8 +37,11 @@ body {
 
 #logo {
     height: 61px;
-    margin-top: -20px;
-    margin-left: -20px
+    padding: 5px;
+}
+
+#explore {
+    padding-top: 20px;
 }
 
 #githubURL {
diff --git a/src/main/resources/templates/fragments/error.html b/src/main/resources/templates/fragments/error.html
@@ -24,7 +24,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Common Workflow Language Viewer</title>
-        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
+        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170613.css}" href="../static/css/main-20170613.css" />
         <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
     </head>
     <body>
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
@@ -20,7 +20,7 @@
 
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
+    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170613.css" />
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
 </head>
 <body>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
@@ -20,21 +20,21 @@
 
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
+    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170613.css" />
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
 </head>
 <body>
 <nav th:fragment="navbar" class="navbar navbar-default navbar-fixed-top">
     <div class="container">
         <div class="navbar-header">
-            <a class="navbar-brand" href="/">
+            <a href="/" class="navbar-left">
                 <img id="logo" src="/img/CWL-Logo-nofonts.svg"></img>
             </a>
             <a href="/workflows" class="button navbar-toggle">Explore</a>
         </div>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="/workflows">Explore</a></li>
+                <li><a id="explore" href="/workflows">Explore</a></li>
             </ul>
         </div>
     </div>
diff --git a/src/main/resources/templates/fragments/pagination.html b/src/main/resources/templates/fragments/pagination.html
@@ -20,7 +20,7 @@
 
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
+    <link rel="stylesheet" type="text/css" href="../../static/css/main-20170613.css" />
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
 </head>
 <body>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -23,7 +23,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Common Workflow Language Viewer</title>
-        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
+        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170613.css}" href="../static/css/main-20170613.css" />
         <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
     </head>
     <body>
diff --git a/src/main/resources/templates/selectworkflow.html b/src/main/resources/templates/selectworkflow.html
@@ -23,7 +23,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Common Workflow Language Viewer</title>
-        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
+        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170613.css}" href="../static/css/main-20170613.css" />
         <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
     </head>
     <body>
diff --git a/src/main/resources/templates/workflow.html b/src/main/resources/templates/workflow.html
@@ -29,7 +29,7 @@
     <meta name="twitter:image" th:content="${appURL + '/workflows/' + workflow.id + '/graph/png'}" />
     <title>Common Workflow Language Viewer</title>
     <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
+    <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170613.css}" href="../static/css/main-20170613.css" />
 </head>
 <body>
 
diff --git a/src/main/resources/templates/workflows.html b/src/main/resources/templates/workflows.html
@@ -23,7 +23,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Common Workflow Language Viewer</title>
-        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
+        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170613.css}" href="../static/css/main-20170613.css" />
         <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
     </head>
     <body>
