Skip to content

Solved Issue: 31909 #32965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PrathamSinghSaluja wants to merge 2 commits into from
Closed

Solved Issue: 31909 #32965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5af3cf
Solved Issue: 31909
PrathamSinghSaluja Apr 2, 2021
b164d16
Merge branch '4.0-dev' into 4.0-dev
PrathamSinghSaluja Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/media_source/system/css/fields/joomla-image-select.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
joomla-field-mediamore details {
position: absolute;
background: #f5f5f5;
padding: 0.5rem;
border-radius: 0.25rem;
border: 1px solid #c9c9c9;
}
Expand Down
2 changes: 1 addition & 1 deletion templates/system/build_incomplete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Joomla: Environment Setup Incomplete</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
<style>html{background:#ee2a00;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-repeat:no-repeat;background-attachment:fixed}body{font:14px/18px sans-serif;color:#555;background-color:transparent}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;-webkit-transform:rotate(10deg);transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:700;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:400;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
<script>window.errorLocale={"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
<script>window.errorLocale={"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
</head>
<body>
<div class="container">
Expand Down
2 changes: 1 addition & 1 deletion templates/system/fatal-error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>An Error Occurred: {{statusText}}</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
<style>html{background:#ee2a00;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-repeat:no-repeat;background-attachment:fixed}body{font:14px/18px sans-serif;color:#555;background-color:transparent}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;-webkit-transform:rotate(10deg);transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:700;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:400;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
<script>window.errorLocale={"en-GB":{"language":"English GB","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
<script>window.errorLocale={"en-US":{"language":"English US","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
Copy link
Member

@richard67 richard67 Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this unrelated and unintended change.

</head>
<body>
<div class="container">
Expand Down