Merge pull request #178 from Reqrefusion/main

Sisyphus revision or changes made until the New Site is Built:Part 1

404.php

@@ -15,7 +15,7 @@ function onClickArrow() {
         <img class="img-fluid" src="svg/WhatsThis.svg" alt="Error Photo"/>
       </div>
 
-      <div class="col-lg-4 text-center text-lg-left align-content-center order-lg-first">
+      <div class="col-lg-4 text-center text-lg-start align-content-center order-lg-first">
         <h1 class="home-title text-light mt-n5 mb-0 mt-lg-0">ERROR 404!</h1>
         <!-- displays the incorrect URL -->
         <h2 class="home-subtitle text-light mb-4"><?php echo $_SERVER['REQUEST_URI']; ?> does not exist, sorry.</h2>

css/style.css

@@ -91,7 +91,7 @@ h6 {
 
 code {
   color: #fff;
-  background: #2C5F83;
+  background: #1F425C;
   padding: 3px;
   border-radius: 2px;
 }
@@ -146,14 +146,16 @@ code {
   font-family: "Montserrat-Bold", sans-serif;
   font-size: 1em;
   padding: 0.4em 1.6em 0.4em 1.6em;
+  margin-bottom: 1em;
 }
 
 #main .section-cover {
-  margin-top: 6em;
+  margin-top: 4em;
 }
 
 #main .section {
   margin: 4em 0 4em 0;
+  background-color: rgba(52, 58, 64, 0.5);
 }
 
 .section-title {
@@ -163,7 +165,6 @@ code {
 .section-body {
   font-size: 1em;
 }
-
 #floating-arrow {
   width: 3em;
   margin: 1em 0 4em 0;
@@ -294,6 +295,7 @@ code {
 
   #main .section {
     margin: 6em 0 6em 0;
+	background-color: transparent;
   }
 
   .navbar-custom .nav-pills .nav-link {
@@ -307,6 +309,12 @@ code {
   .btn {
     font-size: 0.8em;
   }
+  .model-backround {
+    background-color: rgba(52, 58, 64, 0.5);
+  }
+  .text-backround {
+    background-color: rgba(52, 58, 64, 0.5);
+  }
 }
 
 @media (min-width: 1200px) {
@@ -319,7 +327,7 @@ code {
   }
 
   #main .section-cover {
-    margin-top: 0;
+    margin-top: 2em;
   }
 
   #main .section {
@@ -368,7 +376,7 @@ code {
   }
 
   #main .section-cover {
-    margin-top: 6em;
+    margin-top: 4em;
   }
 
   #main .section {
@@ -394,7 +402,7 @@ code {
   }
 
   #main .section-cover {
-    margin-top: 8em;
+    margin-top: 6em;
   }
 
   #main .section {

donation.php

@@ -64,6 +64,7 @@ function send (button) {
              <!--<option value="eur">EUR</option>-->
       </select>
       <br/>
+      <br/>
       <label for="method"><?php echo _('Donation method'); ?>:</label>
       <select id="method" name="method" onClick="process(this)">
              <option value="null" selected><?php echo _('Please choose'); ?>...</option>
@@ -74,6 +75,7 @@ function send (button) {
              <option value="opencollective" title="<?php echo _('OpenCollective acts as a fiscal host for open-source projects. You can donate with a credit card or bank account. OpenCollective is a 501(c)3 org and provides tax deduction in the US.') ?>"><?php echo _('OpenCollective (501(c)3)'); ?></option>
       </select>
       <br/>
+      <br/>
       <div class="sepainfo hidden">
           <b><?php echo _('SEPA Information'); ?></b><br/>
           <?php echo _('Please set up your SEPA bank transfer to'); ?>:<br/>

downloads.php

@@ -97,7 +97,7 @@ function thankyou(e) {
     <div class="download-notes text-center">
       <p>
         <?php echo _("See what has changed since last version in the"); ?>
-        <a class="badge badge-light" href="<?php echo _('https://wiki.freecad.org/Release_notes_0.21'); ?>"><?php echo _('FreeCAD 0.21 release notes'); ?></a>
+        <a class="badge text-bg-light text-decoration-none" href="<?php echo _('https://wiki.freecad.org/Release_notes_0.21'); ?>"><?php echo _('FreeCAD 0.21 release notes'); ?></a>
       </p>
     </div>
 
@@ -114,10 +114,10 @@ function thankyou(e) {
         <?php echo _("These builds are not suitable for production use, and care should be taken when using them (back up your files regularly, etc.)."); ?>
         <?php echo _("Development builds should be expected to be slower, consume more memory, and be less stable than the official release versions."); ?>
         <br/><br/>
-        <a href="https://github.com/FreeCAD/FreeCAD-AppImage/releases/tag/weekly-builds" class="badge badge-light"><?php echo ('Download here a weekly build for Windows, macOS or Linux'); ?></a>
-        . <?php echo ("On Linux"); ?>, <a href="<?php echo _('https://wiki.freecad.org/Snap'); ?>" class="badge badge-light"><?php echo ('Snap'); ?></a>
-        and <a href="<?php echo _('https://wiki.freecad.org/Flatpak'); ?>" class="badge badge-light"><?php echo ('Flatpak'); ?></a>
-        <?php echo ("also provide developement channels"); ?>.
+        <?php echo _('Download here a '); ?><a href="https://github.com/FreeCAD/FreeCAD-AppImage/releases/tag/weekly-builds" class="badge text-bg-light text-decoration-none"><?php echo _('Weekly Build'); ?></a><?php echo _(' for Windows, macOS or Linux. '); ?>
+        <?php echo _("On Linux"); ?>, <a href="<?php echo _('https://wiki.freecad.org/Snap'); ?>" class="badge text-bg-light text-decoration-none"><?php echo ('Snap'); ?></a>
+        <?php echo _("and"); ?> <a href="<?php echo _('https://wiki.freecad.org/Flatpak'); ?>" class="badge text-bg-light text-decoration-none"><?php echo ('Flatpak'); ?></a>
+        <?php echo _("also provide developement channels"); ?>.
         <br /><br />
       </p>
     </div>
@@ -131,7 +131,7 @@ function thankyou(e) {
       <p>
         <?php echo _('The FreeCAD community provides a wealth of additional modules and macros. They can
         now easily be installed directly from within FreeCAD using the '); ?>
-        <a href="<?php echo _('https://wiki.freecad.org/Std_AddonMgr'); ?>" class="badge badge-light"><?php echo _('Addon manager.'); ?></a>
+        <a href="<?php echo _('https://wiki.freecad.org/Std_AddonMgr'); ?>" class="badge text-bg-light text-decoration-none"><?php echo _('Addon manager.'); ?></a>
       </p>
     </div>
 
@@ -144,12 +144,12 @@ function thankyou(e) {
       <h2 class="downloads-notes-title"><?php echo _('Source code'); ?></h2>
       <p>
         <?php echo _('The source code of FreeCAD is hosted primarily on '); ?>
-        <a href="https://github.com/FreeCAD/FreeCAD" class="badge badge-light">GitHub</a>
+        <a href="https://github.com/FreeCAD/FreeCAD" class="badge text-bg-light text-decoration-none">GitHub</a>
         <?php echo _('and mirrored on '); ?>
-        <a href="https://gitlab.com/FreeCAD/FreeCAD" class="badge badge-light">GitLab</a>,
-        <a href="https://codeberg.org/FreeCAD/FreeCAD" class="badge badge-light">Codeberg</a>
+        <a href="https://gitlab.com/FreeCAD/FreeCAD" class="badge text-bg-light text-decoration-none">GitLab</a>,
+        <a href="https://codeberg.org/FreeCAD/FreeCAD" class="badge text-bg-light text-decoration-none">Codeberg</a>
         <?php echo _('and '); ?>
-        <a href="https://sourceforge.net/projects/free-cad/" class="badge badge-light">Sourceforge</a>
+        <a href="https://sourceforge.net/projects/free-cad/" class="badge text-bg-light text-decoration-none">Sourceforge</a>
       </p>
     </div>
 

events.php

@@ -19,14 +19,14 @@
           </iframe>
           -->
           <iframe id="open-web-calendar" 
-                  style="background:url('https://raw.githubusercontent.com/niccokunzmann/open-web-calendar/master/static/img/loaders/circular-loader.gif') center center no-repeat;"
-                  src="https://open-web-calendar.hosted.quelltext.eu/calendar.html?url=https%3A%2F%2Fcalendar.google.com%2Fcalendar%2Fical%2F6e6cc81260051a3c49fdf915c472f2d62576820129f0e0b2cacb7025ed62f960%2540group.calendar.google.com%2Fpublic%2Fbasic.ics"
+                  style="background:url('images/loader-freecad-small.gif') center center no-repeat;"
+                  src="https://open-web-calendar.hosted.quelltext.eu/calendar.html?url=https%3A%2F%2Fcalendar.google.com%2Fcalendar%2Fical%2F6e6cc81260051a3c49fdf915c472f2d62576820129f0e0b2cacb7025ed62f960%2540group.calendar.google.com%2Fpublic%2Fbasic.ics?prefer_browser_language=true"
                   sandbox="allow-scripts allow-same-origin allow-top-navigation"
                   allowTransparency="true" scrolling="no" 
                   frameborder="0" height="600px" width="100%">
           </iframe>
           <p>
-            <?php echo _('Subscribe to this calendar using this'); ?> <a href="https://calendar.google.com/calendar/embed?src=6e6cc81260051a3c49fdf915c472f2d62576820129f0e0b2cacb7025ed62f960%40group.calendar.google.com" class="badge badge-light"><?php echo _('ICS link'); ?></a>.
+            <?php echo _('Subscribe to this calendar using this'); ?> <a href="https://calendar.google.com/calendar/embed?src=6e6cc81260051a3c49fdf915c472f2d62576820129f0e0b2cacb7025ed62f960%40group.calendar.google.com" class="badge text-bg-light text-decoration-none"><?php echo _('ICS link'); ?></a>.
           </p>
         </div>