Merge branch 'main' of github.com:geigi/Tartan into main

geigi · Jun 24, 2015 · 7a1f669 · 7a1f669
2 parents d5e1c81 + 32b82d4
commit 7a1f669
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/Tartan/static/css/carousel.css b/Tartan/static/css/carousel.css
@@ -96,10 +96,6 @@ img {
 	right: 0px;
 }
 
-.fa-pause {
-	display: none;
-}
-
 .picker {
 	position: absolute;
 	top: 50px;

diff --git a/Tartan/templates/Tartan/album.thtm b/Tartan/templates/Tartan/album.thtm
@@ -8,9 +8,9 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<script type="text/javascript" src="{% static 'js/main.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/album.js' %}"></script>
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 
-	<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
 	<link rel="stylesheet" href="{% static 'lib/dropdown/css/style.css' %}" />
 	<link rel="stylesheet" type="text/css" href="{% static 'css/theme.css' %}" />
 	<link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}" />

diff --git a/Tartan/templates/Tartan/carousel.thtm b/Tartan/templates/Tartan/carousel.thtm
@@ -10,12 +10,12 @@
     {% endif %}
 
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<link rel="stylesheet" href="http://code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css" />
+	<link rel="stylesheet" href="https://code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css" />
 
-	<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
 	<link type="text/css" href="{% static "lib/scrollPane/style/jquery.jscrollpane.css" %}" rel="stylesheet" media="all" />
 	<link type="text/css" href="{% static "lib/scrollPane/themes/lozenge/style/jquery.jscrollpane.lozenge.css" %}" rel="stylesheet" media="all" />
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <script type="text/javascript" src="{% static 'lib/scrollPane/script/jquery.mousewheel.js' %}"></script>
     <script type="text/javascript" src="{% static 'lib/scrollPane/script/jquery.jscrollpane.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/main.js' %}"></script>

diff --git a/Tartan/templates/Tartan/gallery.thtm b/Tartan/templates/Tartan/gallery.thtm
@@ -9,9 +9,9 @@
 	<script type="text/javascript" src="{% static 'js/main.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/gallery.js' %}"></script>
 
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 
-	<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
 	<link rel="stylesheet" href="{% static 'lib/dropdown/css/style.css' %}" />
   <link rel="stylesheet" type="text/css" href="{% static 'css/theme.css' %}" />