-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #155 from socialsoftware/deps-update
dependencies upgrade
- Loading branch information
Showing
6 changed files
with
115 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ test-db | |
| commands | ||
| src/main/resources/configuration.properties | ||
| .idea/ | ||
| .vscode | ||
| *.iml | ||
| opt/ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 84 additions & 80 deletions
164
edition-ldod/src/main/webapp/WEB-INF/jsp/common/meta-head.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,89 @@ | ||
| <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>LdoD</title> | ||
| <link rel="stylesheet" type="text/css" href="/resources/css/style.css" /> | ||
| <link rel="stylesheet" type="text/css" href="/resources/css/ldod.css" /> | ||
| <link rel="stylesheet" type="text/css" | ||
| href="/resources/css/font-awesome.min.css" /> | ||
| <link rel="stylesheet" | ||
| href="/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" /> | ||
| <script src="/webjars/jquery/1.11.3/jquery.min.js"></script> | ||
| <script src="/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js"></script> | ||
| <!-- Global site tag (gtag.js) - Google Analytics --> | ||
| <script async src="https://www.googletagmanager.com/gtag/js?id=UA-111295843-1"></script> | ||
| <script> | ||
| window.dataLayer = window.dataLayer || []; | ||
| function gtag(){dataLayer.push(arguments);} | ||
| gtag('js', new Date()); | ||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>LdoD</title> | ||
| <link rel="stylesheet" type="text/css" href="/resources/css/style.css" /> | ||
| <link rel="stylesheet" type="text/css" href="/resources/css/ldod.css" /> | ||
| <link rel="stylesheet" type="text/css" href="/resources/css/font-awesome.min.css" /> | ||
| <link rel="stylesheet" href="/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" /> | ||
| <script src="/webjars/jquery/3.6.0/jquery.min.js"></script> | ||
| <script src="/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js"></script> | ||
| <!-- Global site tag (gtag.js) - Google Analytics --> | ||
| <script async src="https://www.googletagmanager.com/gtag/js?id=UA-111295843-1"></script> | ||
| <script> | ||
| window.dataLayer = window.dataLayer || []; | ||
| gtag('config', 'UA-111295843-1'); | ||
| </script> | ||
| <style> | ||
| @media ( max-width : 767px) { | ||
| .text-xs-left { | ||
| text-align: left; | ||
| } | ||
| .text-xs-right { | ||
| text-align: right; | ||
| } | ||
| .text-xs-center { | ||
| text-align: center; | ||
| } | ||
| .text-xs-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| function gtag() { | ||
| dataLayer.push(arguments); | ||
| } | ||
| gtag('js', new Date()); | ||
| @media ( min-width : 768px) and (max-width: 991px) { /* sm */ | ||
| .text-sm-left { | ||
| text-align: left; | ||
| } | ||
| .text-sm-right { | ||
| text-align: right; | ||
| } | ||
| .text-sm-center { | ||
| text-align: center; | ||
| } | ||
| .text-sm-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| gtag('config', 'UA-111295843-1'); | ||
| </script> | ||
| <style> | ||
| @media ( max-width: 767px) { | ||
| .text-xs-left { | ||
| text-align: left; | ||
| } | ||
| .text-xs-right { | ||
| text-align: right; | ||
| } | ||
| .text-xs-center { | ||
| text-align: center; | ||
| } | ||
| .text-xs-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| @media ( min-width: 768px) and (max-width: 991px) { | ||
| /* sm */ | ||
| .text-sm-left { | ||
| text-align: left; | ||
| } | ||
| .text-sm-right { | ||
| text-align: right; | ||
| } | ||
| .text-sm-center { | ||
| text-align: center; | ||
| } | ||
| .text-sm-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| @media ( min-width: 992px) and (max-width: 1199px) { | ||
| /* md */ | ||
| .text-md-left { | ||
| text-align: left; | ||
| } | ||
| .text-md-right { | ||
| text-align: right; | ||
| } | ||
| .text-md-center { | ||
| text-align: center; | ||
| } | ||
| .text-md-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| @media ( min-width: 1200px) { | ||
| /* lg */ | ||
| .text-lg-left { | ||
| text-align: left; | ||
| } | ||
| .text-lg-right { | ||
| text-align: right; | ||
| } | ||
| .text-lg-center { | ||
| text-align: center; | ||
| } | ||
| .text-lg-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| </style> | ||
|
|
||
| @media ( min-width : 992px) and (max-width: 1199px) { /* md */ | ||
| .text-md-left { | ||
| text-align: left; | ||
| } | ||
| .text-md-right { | ||
| text-align: right; | ||
| } | ||
| .text-md-center { | ||
| text-align: center; | ||
| } | ||
| .text-md-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
|
|
||
| @media ( min-width : 1200px) { /* lg */ | ||
| .text-lg-left { | ||
| text-align: left; | ||
| } | ||
| .text-lg-right { | ||
| text-align: right; | ||
| } | ||
| .text-lg-center { | ||
| text-align: center; | ||
| } | ||
| .text-lg-justify { | ||
| text-align: justify; | ||
| } | ||
| } | ||
| </style> | ||
|
|
||
|
|
||
| <c:set var="contextPath" value="${pageContext.request.contextPath}" /> | ||
| <c:set var="contextPath" value="${pageContext.request.contextPath}" /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters