Merge branch 'master' of github.com:FreeCAD/FreeCAD

FreeCAD · Feb 7, 2017 · 0a6b382 · 0a6b382
2 parents f2467d7 + c0b29a4
commit 0a6b382
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Doc/templates/header.html b/src/Doc/templates/header.html
@@ -9,7 +9,7 @@
         <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
         <meta name="generator" content="Doxygen $doxygenversion"/>
 
-        <script type="text/javascript" src="http://www.freecadweb.org/js/jquery-2.1.4.min.js"></script>
+        <script type="text/javascript" src="//www.freecadweb.org/js/jquery-2.1.4.min.js"></script>
 
         <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
         <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
@@ -20,13 +20,13 @@
         $mathjax
         <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
         $extrastylesheet
-        <link href='https://fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>
-        <link rel="stylesheet" href="http://www.freecadweb.org/css/bootstrap-3.3.5.min.css">
-        <link rel="stylesheet" href="http://www.freecadweb.org/css/font-awesome-4.4.0.min.css">
-        <link rel="stylesheet" href="http://www.freecadweb.org/css/freecad.css">
-        <script src="http://www.freecadweb.org/js/bootstrap-3.3.5.min.js"></script>
+        <link href='//fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>
+        <link rel="stylesheet" href="//www.freecadweb.org/css/bootstrap-3.3.5.min.css">
+        <link rel="stylesheet" href="//www.freecadweb.org/css/font-awesome-4.4.0.min.css">
+        <link rel="stylesheet" href="//www.freecadweb.org/css/freecad.css">
+        <script src="//www.freecadweb.org/js/bootstrap-3.3.5.min.js"></script>
         <script type="text/javascript" src="$relpath^doxy-boot.js"></script>
-        <link rel="shortcut icon" href="http://www.freecadweb.org/images/favicon.ico">
+        <link rel="shortcut icon" href="//www.freecadweb.org/images/favicon.ico">
     </head>
     <body>        
         <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@@ -38,7 +38,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="/"><img alt="FreeCAD-logo" src="http://www.freecadweb.org/images/logo.png"/> FreeCAD</a>
+                    <a class="navbar-brand" href="/"><img alt="FreeCAD-logo" src="//www.freecadweb.org/images/logo.png"/> FreeCAD</a>
                 </div>
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav">
@@ -58,7 +58,7 @@
                         <li><a href="https://github.com/FreeCAD/FreeCAD" title="Browse the source code on GitHub">Source code</a></li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
-                        <form class="navbar-search navbar-form" action="http://duckduckgo.com/" id="searchform" role="search" method="get">
+                        <form class="navbar-search navbar-form" action="//duckduckgo.com/" id="searchform" role="search" method="get">
                             <div>
                                 <input type="hidden" name="sites" value="freecadweb.org"/>
                                 <input type="text" name="q" class="form-control" placeholder="Search" title="Search FreeCAD documentation, forum and bugs" maxlength=300>