Merge pull request #1 from grahambancroft/migration

Initial template setup
canonical · Apr 28, 2015 · fe6d6d0 · fe6d6d0
2 parents 87dd813 + d055d79
commit fe6d6d0
Show file tree

Hide file tree

Showing 1,347 changed files with 44,402 additions and 25,267 deletions.
diff --git a/django-error.log b/django-error.log
diff --git a/etc/mirrors.rss b/etc/mirrors.rss
diff --git a/redirects.txt b/redirects.txt
diff --git a/static/css/_scratch.scss b/static/css/_scratch.scss
diff --git a/static/css/_core-constants.scss → static/css/core-constants.scss b/static/css/_core-constants.scss → static/css/core-constants.scss
diff --git a/static/css/_core-mixins.scss → static/css/core-mixins.scss b/static/css/_core-mixins.scss → static/css/core-mixins.scss
diff --git a/static/css/ie/ie6.scss b/static/css/ie/ie6.scss
@@ -1,5 +1,3 @@
-@import "../core-constants";
-
 html.lt-ie7 {
 	.row-box { overflow: hidden; }
 	font-size: 16px;

diff --git a/static/css/ie/ie7.scss b/static/css/ie/ie7.scss
@@ -1,5 +1,3 @@
-@import "../core-constants";
-
 html.lt-ie8 {
 	* { zoom: 1; }
 

diff --git a/static/css/scratch.scss b/static/css/scratch.scss
@@ -0,0 +1,81 @@
+/*
+ * This stylesheet is used to override the core styles until the monthly merge.
+ *
+ * Please comment your changes to help documentation.
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+
+*/
+
+// additional helper class for shouty text
+.caps {
+	text-transform: uppercase;
+}
+
+@media only screen and (max-width : 768px) {
+	// helper class for small
+	.small-align-center {
+		text-align: center;
+	}
+}
+
+/* Chinese Social links */
+
+.list--social__item {
+	height: 37px;
+	margin-right: 20px;
+	padding: 0;
+	text-indent: -999em;
+	width: 37px;
+	float: left;
+	display: inline-block;
+
+	&:after { 
+		content: " " !important; 
+	}
+
+	a {
+		display: block;
+		height: 37px;
+		width: 37px;
+		margin: 0;
+		overflow: hidden;
+	}
+
+	&.active a {
+		background-image: 
+			url('../img/icons/icon-wechat.svg'),
+			url('../img/homepage/kylin/qr-code-wechat.png');
+		background-repeat: no-repeat;
+		background-position: left top, right top;
+		background-size: 37px 37px, auto;
+		width: 140px;
+		height: 116px;
+	}
+} // &__item
+
+.list--social__item--wechat a {
+    background: url('../img/icons/icon-wechat.svg') no-repeat;
+}
+
+.list--social__item--weibo a {
+    background: url('../img/icons/icon-weibo.svg') no-repeat;
+}
+
+main section .strip-inner-wrapper {
+
+}
+
+main .list--social {
+	display: inline;
+}
+
+.china-mobile {
+	float: left;
+	margin-right: 40px;
+}
+
+.homepage footer .list--social {
+	display: none;
+}