Skip to content

Commit

Permalink
Merge pull request #7 from EurekaRanch/content_security_policy_fixes
Browse files Browse the repository at this point in the history
content security policy fixes
dunkoh authored Nov 6, 2023
2 parents bf79010 + 3d3421a commit 2146636
Showing 3 changed files with 110 additions and 113 deletions.
100 changes: 100 additions & 0 deletions public/css/overrides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
body {
/*background: #ffffff;*/
background:url('https://drknbmw32n1iy.cloudfront.net/images/people_meeting_flipped.jpg') no-repeat center center fixed;
background-size: cover;
background-color: dimgrey;
-webkit-background-size: 100% auto;
-moz-background-size: 100% auto;
-o-background-size: 100% auto;
color: white;
}
.form-signin
{
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading, .form-signin .checkbox
{
margin-bottom: 10px;
}
.form-signin .checkbox
{
font-weight: normal;
}
.form-signin .form-control
{
position: relative;
font-size: 16px;
height: auto;
padding: 10px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.form-signin .form-control:focus
{
z-index: 2;
}
.form-signin input[type="text"]
{
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.form-signin input[type="password"]
{
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.account-wall
{
margin-top: 20px;
padding: 40px 0px 20px 0px;
background-color: #f7f7f7;
-moz-box-shadow: 0px 2px 30px black;
-webkit-box-shadow: 0px 2px 30px black;
box-shadow: 0px 2px 30px black;
}
.login-title
{
color: #555;
font-size: 18px;
font-weight: 400;
display: block;
}
.profile-img
{
margin: 0 auto 10px;
display: block;
}
.forgot-password-link {
margin-top: 8px;
}
.sso-and-create-account-links {
margin: 15px;
padding: 5px;
}
.vertical-center {
min-height: 100%; /* Fallback for browsers do NOT support vh unit */
min-height: 100vh; /* These two lines are counted as one :-) */
background-color: transparent;
display: flex;
align-items: center;
}
.content {
background-color: transparent;
}

.login-logo {
max-height: 125px;
max-width: 100%;
padding: 10px;
}

@media (max-width: 767px) {
body {
background-image: none;
}
}
2 changes: 1 addition & 1 deletion themes/modern/core/loginuserpass.twig
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{% extends "@core/base.twig" %}

{% block postload %}
<script src="/{{baseurlpath}}module.php/themes/js/loginuserpass.js"></script>
<script src="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/js/loginuserpass.js"></script>
{% endblock %}

{% block content %}
121 changes: 9 additions & 112 deletions themes/modern/default/base.twig
Original file line number Diff line number Diff line change
@@ -5,124 +5,21 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="initial-scale=1.0">
<title>{{ pagetitle }}</title>
<link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/themes/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/themes/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/themes/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/themes/css/print.css" />
<link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/themes/css/screen.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/print.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/screen.css" />
<link rel="stylesheet" type="text/css" href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/overrides.css" />

<!--[if IE]>
<link href="/{{baseurlpath}}module.php/themes/css/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
<link href="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/css/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
<![endif]-->
<style>
body {
/*background: #ffffff;*/
background:url('https://drknbmw32n1iy.cloudfront.net/images/people_meeting_flipped.jpg') no-repeat center center fixed;
background-size: cover;
background-color: dimgrey;
-webkit-background-size: 100% auto;
-moz-background-size: 100% auto;
-o-background-size: 100% auto;
color: white;
}
.form-signin
{
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading, .form-signin .checkbox
{
margin-bottom: 10px;
}
.form-signin .checkbox
{
font-weight: normal;
}
.form-signin .form-control
{
position: relative;
font-size: 16px;
height: auto;
padding: 10px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.form-signin .form-control:focus
{
z-index: 2;
}
.form-signin input[type="text"]
{
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.form-signin input[type="password"]
{
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.account-wall
{
margin-top: 20px;
padding: 40px 0px 20px 0px;
background-color: #f7f7f7;
-moz-box-shadow: 0px 2px 30px black;
-webkit-box-shadow: 0px 2px 30px black;
box-shadow: 0px 2px 30px black;
}
.login-title
{
color: #555;
font-size: 18px;
font-weight: 400;
display: block;
}
.profile-img
{
margin: 0 auto 10px;
display: block;
}
.forgot-password-link {
margin-top: 8px;
}
.sso-and-create-account-links {
margin: 15px;
padding: 5px;
}
.vertical-center {
min-height: 100%; /* Fallback for browsers do NOT support vh unit */
min-height: 100vh; /* These two lines are counted as one :-) */
background-color: transparent;
display: flex;
align-items: center;
}
.content {
background-color: transparent;
}
.login-logo {
max-height: 125px;
max-width: 100%;
padding: 10px;
}
@media (max-width: 767px) {
body {
background-image: none;
}
}
</style>

<meta name="robots" content="noindex, nofollow">
{# <link rel="preload" href="{{ asset('js/bundle.js') }}" as="script">#}
{# <script src="https://code.jquery.com/jquery-3.6.0.slim.min.js" integrity="sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=" crossorigin="anonymous"></script>#}
<script src="/{{baseurlpath}}module.php/themes/js/jquery.js"></script>
<script src="/{{baseurlpath}}module.php/themes/js/bootstrap.js"></script>
<script src="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/js/jquery.js"></script>
<script src="{{ constant('WEBSITE') }}{{baseurlpath}}module.php/themes/js/bootstrap.js"></script>
{% block preload %}{% endblock %}
</head>
<body id="{{ templateId }}">

0 comments on commit 2146636

Please sign in to comment.