diff --git a/DynamicBibleIonic/src/app/app.scss b/DynamicBibleIonic/src/app/app.scss index a2615463..720707ca 100644 --- a/DynamicBibleIonic/src/app/app.scss +++ b/DynamicBibleIonic/src/app/app.scss @@ -15,33 +15,6 @@ // automatically applied to the element in the app. @import "../../node_modules/ionic2-auto-complete/auto-complete"; - -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - src: url('../assets/fonts/merriweather-v19-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('Merriweather Regular'), local('Merriweather-Regular'), - url('../assets/fonts/merriweather-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../assets/fonts/merriweather-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../assets/fonts/merriweather-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('../assets/fonts/merriweather-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../assets/fonts/merriweather-v19-latin-regular.svg#Merriweather') format('svg'); /* Legacy iOS */ - } - - @font-face { - font-family: 'PT Serif'; - font-style: normal; - font-weight: 400; - src: url('../assets/fonts/pt-serif-v9-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('PT Serif'), local('PTSerif-Regular'), - url('../assets/fonts/pt-serif-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../assets/fonts/pt-serif-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../assets/fonts/pt-serif-v9-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('../assets/fonts/pt-serif-v9-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../assets/fonts/pt-serif-v9-latin-regular.svg#PTSerif') format('svg'); /* Legacy iOS */ - } - .item { padding: 0px !important; padding-left: 16px !important; @@ -59,11 +32,172 @@ ion-menu { } ion-card .title { - .button-wp, .button-md, .button-ios { + + .button-wp, + .button-md, + .button-ios { margin-right: -6px; } } html { --card-font: Roboto, Helvetica, Arial, sans-serif; -} \ No newline at end of file +} + +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/merriweather-v19-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('Merriweather Regular'), local('Merriweather-Regular'), + url('../assets/fonts/merriweather-v19-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/merriweather-v19-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/merriweather-v19-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/merriweather-v19-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/merriweather-v19-latin-regular.svg#Merriweather') format('svg'); + /* Legacy iOS */ +} + +/* pt-sans-regular - latin */ +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/pt-sans-v9-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('PT Sans'), local('PTSans-Regular'), + url('../assets/fonts/pt-sans-v9-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/pt-sans-v9-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/pt-sans-v9-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/pt-sans-v9-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/pt-sans-v9-latin-regular.svg#PTSans') format('svg'); + /* Legacy iOS */ +} + +@font-face { + font-family: 'PT Serif'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/pt-serif-v9-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('PT Serif'), local('PTSerif-Regular'), + url('../assets/fonts/pt-serif-v9-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/pt-serif-v9-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/pt-serif-v9-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/pt-serif-v9-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/pt-serif-v9-latin-regular.svg#PTSerif') format('svg'); + /* Legacy iOS */ +} + +/* open-sans-regular - latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/open-sans-v15-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('../assets/fonts/open-sans-v15-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/open-sans-v15-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/open-sans-v15-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/open-sans-v15-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/open-sans-v15-latin-regular.svg#OpenSans') format('svg'); + /* Legacy iOS */ +} + +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/roboto-v18-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('Roboto'), local('Roboto-Regular'), + url('../assets/fonts/roboto-v18-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/roboto-v18-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/roboto-v18-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/roboto-v18-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/roboto-v18-latin-regular.svg#Roboto') format('svg'); + /* Legacy iOS */ +} + +/* roboto-500 - latin */ +@font-face { + font-family: 'Roboto Bold'; + font-style: normal; + font-weight: 500; + src: url('../assets/fonts/roboto-v18-latin-500.eot'); + /* IE9 Compat Modes */ + src: local('Roboto Medium'), local('Roboto-Medium'), + url('../assets/fonts/roboto-v18-latin-500.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/roboto-v18-latin-500.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/roboto-v18-latin-500.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/roboto-v18-latin-500.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/roboto-v18-latin-500.svg#Roboto') format('svg'); + /* Legacy iOS */ +} + +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/roboto-condensed-v16-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), + url('../assets/fonts/roboto-condensed-v16-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/roboto-condensed-v16-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/roboto-condensed-v16-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/roboto-condensed-v16-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/roboto-condensed-v16-latin-regular.svg#RobotoCondensed') format('svg'); + /* Legacy iOS */ +} + +/* inconsolata-regular - latin */ +@font-face { + font-family: 'Inconsolata'; + font-style: normal; + font-weight: 400; + src: url('../assets/fonts/inconsolata-v16-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local('Inconsolata Regular'), local('Inconsolata-Regular'), + url('../assets/fonts/inconsolata-v16-latin-regular.eot?#iefix') format('embedded-opentype'), + /* IE6-IE8 */ + url('../assets/fonts/inconsolata-v16-latin-regular.woff2') format('woff2'), + /* Super Modern Browsers */ + url('../assets/fonts/inconsolata-v16-latin-regular.woff') format('woff'), + /* Modern Browsers */ + url('../assets/fonts/inconsolata-v16-latin-regular.ttf') format('truetype'), + /* Safari, Android, iOS */ + url('../assets/fonts/inconsolata-v16-latin-regular.svg#Inconsolata') format('svg'); + /* Legacy iOS */ +} diff --git a/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.eot new file mode 100644 index 00000000..5732127f Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.svg b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.svg new file mode 100644 index 00000000..da8c9777 --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.svg @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.ttf new file mode 100644 index 00000000..bdfb1f64 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff new file mode 100644 index 00000000..091aa4e4 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff2 new file mode 100644 index 00000000..f71f0104 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/inconsolata-v16-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.eot new file mode 100644 index 00000000..46a1ff34 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.ttf new file mode 100644 index 00000000..a02216a1 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff new file mode 100644 index 00000000..941d8a89 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff2 new file mode 100644 index 00000000..e834d422 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/merriweather-v19-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.eot b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.eot new file mode 100644 index 00000000..d9a56d18 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.svg b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.svg new file mode 100644 index 00000000..1b5291f6 --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.ttf b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.ttf new file mode 100644 index 00000000..7c2d0785 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff new file mode 100644 index 00000000..246319e3 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff2 b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff2 new file mode 100644 index 00000000..056b8e6c Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-condensed-v12-latin-700.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.eot new file mode 100644 index 00000000..1a8b1160 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.svg b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.svg new file mode 100644 index 00000000..78eb653a --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.ttf new file mode 100644 index 00000000..9d4e8e52 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff new file mode 100644 index 00000000..e495e6f0 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff2 new file mode 100644 index 00000000..c8050c25 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/open-sans-v15-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.eot new file mode 100644 index 00000000..3251ea0b Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.svg b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.svg new file mode 100644 index 00000000..c700cc10 --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.svg @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.ttf new file mode 100644 index 00000000..bb7d45a8 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff new file mode 100644 index 00000000..930b2173 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff2 new file mode 100644 index 00000000..56df030f Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-sans-v9-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.eot new file mode 100644 index 00000000..d9efe180 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.ttf new file mode 100644 index 00000000..d2ac6df5 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff new file mode 100644 index 00000000..34183e7d Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff2 new file mode 100644 index 00000000..a3422d5f Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/pt-serif-v9-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.eot new file mode 100644 index 00000000..ce6c273b Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.svg b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.svg new file mode 100644 index 00000000..803c3b8a --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.ttf new file mode 100644 index 00000000..053201b1 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff new file mode 100644 index 00000000..613f5de2 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff2 new file mode 100644 index 00000000..e90965be Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-condensed-v16-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.eot b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.eot new file mode 100644 index 00000000..849f4a50 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.svg b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.svg new file mode 100644 index 00000000..67eecf44 --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.svg @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.ttf b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.ttf new file mode 100644 index 00000000..55b559f6 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff new file mode 100644 index 00000000..2633e152 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff2 b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff2 new file mode 100644 index 00000000..8dceabcf Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-500.woff2 differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.eot b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.eot new file mode 100644 index 00000000..a0780d6e Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.eot differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.svg b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.svg new file mode 100644 index 00000000..627f5a36 --- /dev/null +++ b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.ttf b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.ttf new file mode 100644 index 00000000..b91bf3f7 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.ttf differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff new file mode 100644 index 00000000..92dfacc6 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff differ diff --git a/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff2 b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff2 new file mode 100644 index 00000000..7e854e66 Binary files /dev/null and b/DynamicBibleIonic/src/assets/fonts/roboto-v18-latin-regular.woff2 differ diff --git a/DynamicBibleIonic/src/components/passage/passage.html b/DynamicBibleIonic/src/components/passage/passage.html index e8e1eee8..c4b76b8a 100644 --- a/DynamicBibleIonic/src/components/passage/passage.html +++ b/DynamicBibleIonic/src/components/passage/passage.html @@ -8,7 +8,7 @@

- Chapter {{ch.ch}} + Chapter {{ch.ch}}

{{para.p.h}}

@@ -24,7 +24,7 @@

- Chapter {{ch.ch}} + Chapter {{ch.ch}}

{{vs.v}}. diff --git a/DynamicBibleIonic/src/components/passage/passage.scss b/DynamicBibleIonic/src/components/passage/passage.scss index 97ba7656..2ec8c716 100644 --- a/DynamicBibleIonic/src/components/passage/passage.scss +++ b/DynamicBibleIonic/src/components/passage/passage.scss @@ -18,34 +18,10 @@ passage .button { passage .passage-text { padding-bottom: 12px; - - h3 { - font-size: 1.6rem; - font-weight: bold; - } - max-width: 600px; margin: auto; } .passage-text+.passage-text { - border-top: 1px dotted #808080; padding-top: 12px; -} - -// @media screen and (min-width: 600px) { -// passage .passage-text { -// -webkit-column-count: 2; /* Chrome, Safari, Opera */ -// -moz-column-count: 2; /* Firefox */ -// column-count: 2; -// -webkit-column-gap: 30px; /* Chrome, Safari, Opera */ -// -moz-column-gap: 30px; /* Firefox */ -// column-gap: 30px; -// -webkit-column-rule-style: dotted; /* Chrome, Safari, Opera */ -// -moz-column-rule-style: dotted; /* Firefox */ -// column-rule-style: dotted; -// -webkit-column-rule-width: 1px; /* Chrome, Safari, Opera */ -// -moz-column-rule-width: 1px; /* Firefox */ -// column-rule-width: 1px; -// } -// } +} \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/settings/settings.html b/DynamicBibleIonic/src/components/settings/settings.html index 50270699..57b3533e 100644 --- a/DynamicBibleIonic/src/components/settings/settings.html +++ b/DynamicBibleIonic/src/components/settings/settings.html @@ -60,14 +60,15 @@ - Font Family + Text Font - Sans Serif - Times - Georgia - Merriweather - Monospaced - PT Serif + Roboto (sans) + Open Sans (sans) + PT Sans (sans) + Georgia (serif) + Merriweather (serif) + PT Serif (serif) + Inconsolata (mono) diff --git a/DynamicBibleIonic/src/pages/search/search.scss b/DynamicBibleIonic/src/pages/search/search.scss index 7edeb81f..0d54ec96 100644 --- a/DynamicBibleIonic/src/pages/search/search.scss +++ b/DynamicBibleIonic/src/pages/search/search.scss @@ -5,6 +5,10 @@ .toolbar-content { margin-right: .5em; } +ion-header, ion-list-header { + font-family: $heading; +} + ion-auto-complete ul { top: 4.2em; left: 3.5em; @@ -30,8 +34,7 @@ ion-auto-complete { } .title { font-size: 1.3em; - font-family: 'Roboto', Helvetica, Arial, sans-serif; - font-weight: 400; + font-family: $cardTitle; } a { color: black; @@ -48,9 +51,13 @@ body { } .card { - h2 { - font-size: 1.2em; - font-weight: bold; + h2 { // chapter heading + font-size: 2rem; + font-family: $chapterHeadingFontFamily; + } + h3 { // paragraph heading + font-size: 1.6rem; + font-family: $paragraphHeadingFontFamily; } max-width: 800px; margin: 12px auto; diff --git a/DynamicBibleIonic/src/theme/variables.scss b/DynamicBibleIonic/src/theme/variables.scss index 2fbcb249..a922aa39 100644 --- a/DynamicBibleIonic/src/theme/variables.scss +++ b/DynamicBibleIonic/src/theme/variables.scss @@ -31,26 +31,10 @@ $colors: ( ); -// App iOS Variables -// -------------------------------------------------- -// iOS only Sass variables can go here - - - - -// App Material Design Variables -// -------------------------------------------------- -// Material Design only Sass variables can go here - - - - -// App Windows Variables -// -------------------------------------------------- -// Windows only Sass variables can go here - - - +$heading: "Roboto"; +$cardTitle: "Roboto Condensed"; +$chapterHeadingFontFamily: "Roboto Bold"; +$paragraphHeadingFontFamily: "Roboto Bold"; // App Theme // --------------------------------------------------