Correct styling and css precedence

MarkRobbo · MarkRobbo · commit bb716cc31c8d · 2017-07-13T11:24:16.000+01:00
diff --git a/src/main/resources/static/css/main-20170616.css b/src/main/resources/static/css/main-20170616.css
@@ -21,7 +21,7 @@ body {
     padding-top: 61px;
 }
 
-pre {
+.alert > pre {
     border: 0;
     background-color: transparent;
     white-space: pre-wrap;
@@ -31,6 +31,10 @@ pre {
     color: #a94442;
 }
 
+.navbar-nav > li > a {
+    padding-top: 20px;
+}
+
 #loadingWorkflow {
     opacity: 0.3;
     max-height: 500px;
diff --git a/src/main/resources/templates/apidocs.html b/src/main/resources/templates/apidocs.html
@@ -23,9 +23,9 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>API Documentation - 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" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
         <link rel="stylesheet" th:href="@{/bower_components/highlightjs/styles/github.css}" href="../static/bower_components/highlightjs/styles/default.css" />
+        <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
     </head>
     <body>
 
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -23,8 +23,8 @@
         <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-20170616.css}" href="../static/css/main-20170616.css" />
         <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-20170616.css}" href="../static/css/main-20170616.css" />
     </head>
     <body>
 
diff --git a/src/main/resources/templates/loading.html b/src/main/resources/templates/loading.html
@@ -29,7 +29,7 @@
     <meta name="twitter:image" th:content="${appURL + '/workflows/' + queued.tempRepresentation.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-20170616.css}" href="../static/css/main-20170616.css" />
 </head>
 <body>
 
diff --git a/src/main/resources/templates/selectworkflow.html b/src/main/resources/templates/selectworkflow.html
@@ -23,8 +23,8 @@
         <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-20170616.css}" href="../static/css/main-20170616.css" />
         <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-20170616.css}" href="../static/css/main-20170616.css" />
     </head>
     <body>
 
diff --git a/src/main/resources/templates/workflows.html b/src/main/resources/templates/workflows.html
@@ -23,8 +23,8 @@
         <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-20170616.css}" href="../static/css/main-20170616.css" />
         <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-20170616.css}" href="../static/css/main-20170616.css" />
     </head>
     <body>
 
