Browse code

Merge branch 'minify'

hiromipaw authored on 03/07/2017 09:43:29
Showing 6 changed files
... ...
@@ -1,5 +1,7 @@
1 1
 RewriteEngine On
2 2
 
3
+#ErrorDocument 404 /404
4
+
3 5
 # moved to /docs/
4 6
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 7
 RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
... ...
@@ -81,5 +83,3 @@ RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/priva
81 83
 # some external resources (the donate infrastructure in particular) and
82 84
 # getting it changed there is apparently hard or something.
83 85
 RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]
84
-
85
-
... ...
@@ -12,9 +12,9 @@
12 12
 	<div id="maincol">
13 13
 		<h1>The Tor Project is always looking for more great people to join our team!</h1>
14 14
 
15
-		<p>At the moment, we don't have any official open positions. Please check back
16
-		 soon, though! In the meantime, you may want to glance at our
17
-		<a href="<page getinvolved/volunteer>">volunteers</a> page.</p>
15
+		#<p>At the moment, we don't have any official open positions. Please check back
16
+		# soon, though! In the meantime, you may want to glance at our
17
+		#<a href="<page getinvolved/volunteer>">volunteers</a> page.</p>
18 18
 
19 19
 		<p>Specifically, we're looking for the following people currently:</p>
20 20
 		<ul>
... ...
@@ -1,6 +1,6 @@
1 1
 @charset "UTF-8";
2
-@import "reset.css";
3
-@import "layout.css";
2
+@import "reset.min.css";
3
+@import "layout.min.css";
4 4
 @import "layout-rtl.css";
5
-@import "typography.css";
5
+@import "typography.min.css";
6 6
 @import "typography-rtl.css";
... ...
@@ -1 +1 @@
1
-@charset "UTF-8";@import "reset.css";@import "layout.css";@import "layout-rtl.css";@import "typography.css";@import "typography-rtl.css";
2 1
\ No newline at end of file
2
+@charset "UTF-8";@import "reset.min.css";@import "layout.min.css";@import "layout-rtl.css";@import "typography.min.css";@import "typography-rtl.css";
3 3
\ No newline at end of file
... ...
@@ -1,4 +1,4 @@
1 1
 @charset "UTF-8";
2
-@import "reset.css";
3
-@import "layout.css";
4
-@import "typography.css";
2
+@import "reset.min.css";
3
+@import "layout.min.css";
4
+@import "typography.min.css";
... ...
@@ -1 +1 @@
1
-@charset "UTF-8";@import "reset.css";@import "layout.css";@import "typography.css";
2 1
\ No newline at end of file
2
+@charset "UTF-8";@import "reset.min.css";@import "layout.min.css";@import "typography.min.css";