Swap Elk Glen and de Young themes so de Young theme more befitting art museum

KyleAMathews · KyleAMathews · commit 5657e0bd4845 · 2016-08-01T19:14:08.000-06:00
diff --git a/packages/typography-theme-de-young/README.md b/packages/typography-theme-de-young/README.md
@@ -1,18 +1,18 @@
-# De Young — a <a href='https://github.com/kyleamathews/typography.js'>Typography.js</a> theme
+# Elk Glen — a <a href='https://github.com/kyleamathews/typography.js'>Typography.js</a> theme
 
 A theme for Typography.js
 
 ## Install
 ```bash
-npm install --save typography typography-theme-de-young
+npm install --save typography typography-theme-elk-glen
 ```
 ## Usage
 ```javascript
 import Typography from 'typography'
-import deYoungTheme from 'typography-theme-de-young'
+import elkGlenTheme from 'typography-theme-elk-glen'
 
-const typography = new Typography(deYoungTheme)
+const typography = new Typography(elkGlenTheme)
 ```
 ## More on theme
 
-De Young uses "<a href='https://fonts.google.com/specimen/Oswald'>Oswald</a>" for headers and "<a href='https://fonts.google.com/specimen/PT+Sans'>PT Sans</a>" for body text
+Elk Glen uses "<a href='https://fonts.google.com/specimen/Alegreya+Sans'>Alegreya Sans</a>" for headers and "<a href='https://fonts.google.com/specimen/Alegreya'>Alegreya</a>" for body text
diff --git a/packages/typography-theme-de-young/package.json b/packages/typography-theme-de-young/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typography-theme-de-young",
   "description": "A theme for Typography.js",
-  "version": "0.11.12",
+  "version": "0.11.7",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "dependencies": {
     "compass-vertical-rhythm": "^1.2.1",
diff --git a/packages/typography-theme-de-young/src/index.js b/packages/typography-theme-de-young/src/index.js
@@ -7,67 +7,59 @@ import verticalRhythm from 'compass-vertical-rhythm'
 const theme: OptionsType = {
   title: 'de Young',
   baseFontSize: '20px',
-  baseLineHeight: '30px',
+  baseLineHeight: '33px',
   googleFonts: [
     {
-      name: 'Oswald',
+      name: 'Alegreya Sans',
       styles: [
-        '700',
+        '500',
       ],
     },
     {
-      name: 'PT Sans',
+      name: 'Alegreya',
       styles: [
         '400',
         '400i',
         '700',
+        '700i',
       ],
     },
   ],
-  headerFontFamily: ['Oswald', 'sans-serif'],
-  bodyFontFamily: ['PT Sans', 'sans-serif'],
+  headerFontFamily: ['Alegreya Sans', 'sans-serif'],
+  bodyFontFamily: ['Alegreya', 'sans-serif'],
   headerGray: 10,
   bodyGray: 20,
-  headerWeight: '700',
+  headerWeight: 500,
   bodyWeight: 400,
   boldWeight: 700,
   overrideStyles: ({ adjustFontSizeTo, adjustFontSizeToMSValue, rhythm }, options) => {
-    const linkColor = '#292d35'
     const vr = verticalRhythm({
-      baseFontSize: '17px',
-      baseLineHeight: '24.65px',
+      baseFontSize: '18px',
+      baseLineHeight: '29.7px',
     })
+
     return {
       a: {
-        color: linkColor,
+        color: 'hsl(230,55%,58%)',
         textDecoration: 'none',
-        textShadow: '.03em 0 #fff,-.03em 0 #fff,0 .03em #fff,0 -.03em #fff,.06em 0 #fff,-.06em 0 #fff,.09em 0 #fff,-.09em 0 #fff,.12em 0 #fff,-.12em 0 #fff,.15em 0 #fff,-.15em 0 #fff', // eslint-disable-line
-        backgroundImage: `linear-gradient(to top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0) 1px, ${linkColor} 1px, ${linkColor} 2px, rgba(0, 0, 0, 0) 2px)`, // eslint-disable-line
       },
       'a:hover,a:active': {
-        textShadow: 'none',
-        backgroundImage: 'none',
-      },
-      'h1,h2,h3,h4,h5,h6': {
-        marginTop: rhythm(2),
+        boxShadow: '0 1px 0 0 currentColor',
       },
-      // Blockquote styles.
       blockquote: {
         ...adjustFontSizeToMSValue(1/5),
-        borderLeft: `${rhythm(6/16)} solid ${linkColor}`,
         color: gray(35),
-        paddingLeft: rhythm(10/16),
         fontStyle: 'italic',
+        paddingLeft: rhythm(11/16),
         marginLeft: 0,
-        marginRight: 0,
+        borderLeft: `${rhythm(5/16)} solid ${gray(80)}`,
       },
       'blockquote > :last-child': {
         marginBottom: 0,
       },
       'blockquote cite': {
         ...adjustFontSizeTo(options.baseFontSize),
         color: gray(options.bodyGray),
-        fontStyle: 'normal',
         fontWeight: options.bodyWeight,
       },
       'blockquote cite:before': {
@@ -78,12 +70,10 @@ const theme: OptionsType = {
           ...vr.establishBaseline(),
         },
         blockquote: {
-          borderLeft: `${rhythm(3/16)} solid ${linkColor}`,
-          color: gray(41),
-          paddingLeft: rhythm(9/16),
-          fontStyle: 'italic',
+          borderLeft: `${rhythm(3/16)} solid ${gray(80)}`,
           marginLeft: rhythm(-3/4),
           marginRight: 0,
+          paddingLeft: rhythm(9/16),
         },
       },
     }
diff --git a/packages/typography-theme-elk-glen/README.md b/packages/typography-theme-elk-glen/README.md
@@ -1,18 +1,18 @@
-# Elk Glen — a <a href='https://github.com/kyleamathews/typography.js'>Typography.js</a> theme
+# De Young — a <a href='https://github.com/kyleamathews/typography.js'>Typography.js</a> theme
 
 A theme for Typography.js
 
 ## Install
 ```bash
-npm install --save typography typography-theme-elk-glen
+npm install --save typography typography-theme-de-young
 ```
 ## Usage
 ```javascript
 import Typography from 'typography'
-import elkGlenTheme from 'typography-theme-elk-glen'
+import deYoungTheme from 'typography-theme-de-young'
 
-const typography = new Typography(elkGlenTheme)
+const typography = new Typography(deYoungTheme)
 ```
 ## More on theme
 
-Elk Glen uses "<a href='https://fonts.google.com/specimen/Alegreya+Sans'>Alegreya Sans</a>" for headers and "<a href='https://fonts.google.com/specimen/Alegreya'>Alegreya</a>" for body text
+De Young uses "<a href='https://fonts.google.com/specimen/Oswald'>Oswald</a>" for headers and "<a href='https://fonts.google.com/specimen/PT+Sans'>PT Sans</a>" for body text
diff --git a/packages/typography-theme-elk-glen/package.json b/packages/typography-theme-elk-glen/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typography-theme-elk-glen",
   "description": "A theme for Typography.js",
-  "version": "0.11.7",
+  "version": "0.11.12",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "dependencies": {
     "compass-vertical-rhythm": "^1.2.1",
diff --git a/packages/typography-theme-elk-glen/screenshot.png b/packages/typography-theme-elk-glen/screenshot.png
diff --git a/packages/typography-theme-elk-glen/src/index.js b/packages/typography-theme-elk-glen/src/index.js
@@ -7,59 +7,67 @@ import verticalRhythm from 'compass-vertical-rhythm'
 const theme: OptionsType = {
   title: 'Elk Glen',
   baseFontSize: '20px',
-  baseLineHeight: '33px',
+  baseLineHeight: '30px',
   googleFonts: [
     {
-      name: 'Alegreya Sans',
+      name: 'Oswald',
       styles: [
-        '500',
+        '700',
       ],
     },
     {
-      name: 'Alegreya',
+      name: 'PT Sans',
       styles: [
         '400',
         '400i',
         '700',
-        '700i',
       ],
     },
   ],
-  headerFontFamily: ['Alegreya Sans', 'sans-serif'],
-  bodyFontFamily: ['Alegreya', 'sans-serif'],
+  headerFontFamily: ['Oswald', 'sans-serif'],
+  bodyFontFamily: ['PT Sans', 'sans-serif'],
   headerGray: 10,
   bodyGray: 20,
-  headerWeight: 500,
+  headerWeight: '700',
   bodyWeight: 400,
   boldWeight: 700,
   overrideStyles: ({ adjustFontSizeTo, adjustFontSizeToMSValue, rhythm }, options) => {
+    const linkColor = '#292d35'
     const vr = verticalRhythm({
-      baseFontSize: '18px',
-      baseLineHeight: '29.7px',
+      baseFontSize: '17px',
+      baseLineHeight: '24.65px',
     })
-
     return {
       a: {
-        color: 'hsl(230,55%,58%)',
+        color: linkColor,
         textDecoration: 'none',
+        textShadow: '.03em 0 #fff,-.03em 0 #fff,0 .03em #fff,0 -.03em #fff,.06em 0 #fff,-.06em 0 #fff,.09em 0 #fff,-.09em 0 #fff,.12em 0 #fff,-.12em 0 #fff,.15em 0 #fff,-.15em 0 #fff', // eslint-disable-line
+        backgroundImage: `linear-gradient(to top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0) 1px, ${linkColor} 1px, ${linkColor} 2px, rgba(0, 0, 0, 0) 2px)`, // eslint-disable-line
       },
       'a:hover,a:active': {
-        boxShadow: '0 1px 0 0 currentColor',
+        textShadow: 'none',
+        backgroundImage: 'none',
+      },
+      'h1,h2,h3,h4,h5,h6': {
+        marginTop: rhythm(2),
       },
+      // Blockquote styles.
       blockquote: {
         ...adjustFontSizeToMSValue(1/5),
+        borderLeft: `${rhythm(6/16)} solid ${linkColor}`,
         color: gray(35),
+        paddingLeft: rhythm(10/16),
         fontStyle: 'italic',
-        paddingLeft: rhythm(11/16),
         marginLeft: 0,
-        borderLeft: `${rhythm(5/16)} solid ${gray(80)}`,
+        marginRight: 0,
       },
       'blockquote > :last-child': {
         marginBottom: 0,
       },
       'blockquote cite': {
         ...adjustFontSizeTo(options.baseFontSize),
         color: gray(options.bodyGray),
+        fontStyle: 'normal',
         fontWeight: options.bodyWeight,
       },
       'blockquote cite:before': {
@@ -70,10 +78,12 @@ const theme: OptionsType = {
           ...vr.establishBaseline(),
         },
         blockquote: {
-          borderLeft: `${rhythm(3/16)} solid ${gray(80)}`,
+          borderLeft: `${rhythm(3/16)} solid ${linkColor}`,
+          color: gray(41),
+          paddingLeft: rhythm(9/16),
+          fontStyle: 'italic',
           marginLeft: rhythm(-3/4),
           marginRight: 0,
-          paddingLeft: rhythm(9/16),
         },
       },
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typography-theme-de-young",`
`3`	`3`	`"description": "A theme for Typography.js",`
`4`		`- "version": "0.11.12",`
	`4`	`+ "version": "0.11.7",`
`5`	`5`	`"author": "Kyle Mathews <mathews.kyle@gmail.com>",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"compass-vertical-rhythm": "^1.2.1",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typography-theme-elk-glen",`
`3`	`3`	`"description": "A theme for Typography.js",`
`4`		`- "version": "0.11.7",`
	`4`	`+ "version": "0.11.12",`
`5`	`5`	`"author": "Kyle Mathews <mathews.kyle@gmail.com>",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"compass-vertical-rhythm": "^1.2.1",`