diff --git a/app/javascript/fonts/witchesAwesome/witchesAwesome.eot?c15 b/app/javascript/fonts/witchesAwesome/witchesAwesome.eot?c15 new file mode 100644 index 000000000..b56aa18f2 Binary files /dev/null and b/app/javascript/fonts/witchesAwesome/witchesAwesome.eot?c15 differ diff --git a/app/javascript/fonts/witchesAwesome/witchesAwesome.svg?c15 b/app/javascript/fonts/witchesAwesome/witchesAwesome.svg?c15 new file mode 100644 index 000000000..59395cbfe --- /dev/null +++ b/app/javascript/fonts/witchesAwesome/witchesAwesome.svg?c15 @@ -0,0 +1,17 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/javascript/fonts/witchesAwesome/witchesAwesome.ttf?c15 b/app/javascript/fonts/witchesAwesome/witchesAwesome.ttf?c15 new file mode 100644 index 000000000..f8dff8775 Binary files /dev/null and b/app/javascript/fonts/witchesAwesome/witchesAwesome.ttf?c15 differ diff --git a/app/javascript/fonts/witchesAwesome/witchesAwesome.woff?c15 b/app/javascript/fonts/witchesAwesome/witchesAwesome.woff?c15 new file mode 100644 index 000000000..d1f69451d Binary files /dev/null and b/app/javascript/fonts/witchesAwesome/witchesAwesome.woff?c15 differ diff --git a/app/javascript/images/neoncity/header-cybre-colour.jpg b/app/javascript/images/neoncity/header-cybre-colour.jpg new file mode 100644 index 000000000..2d1b5b4f0 Binary files /dev/null and b/app/javascript/images/neoncity/header-cybre-colour.jpg differ diff --git a/app/javascript/images/neoncity/neon-city.jpg b/app/javascript/images/neoncity/neon-city.jpg new file mode 100644 index 000000000..1bfb082c8 Binary files /dev/null and b/app/javascript/images/neoncity/neon-city.jpg differ diff --git a/app/javascript/images/swan-lake.jpg b/app/javascript/images/swan-lake.jpg new file mode 100644 index 000000000..03917cf94 Binary files /dev/null and b/app/javascript/images/swan-lake.jpg differ diff --git a/app/javascript/styles/neon-city.scss b/app/javascript/styles/neon-city.scss index 1f56c4e32..5fc0ffcda 100644 --- a/app/javascript/styles/neon-city.scss +++ b/app/javascript/styles/neon-city.scss @@ -68,7 +68,7 @@ $about-page-text: lighten($ui-base-color, 50%); } .landing-page.alternative .header { - background-image:url('../themes/neoncity/images/header-cybre-colour.jpg'); + background-image:url('../images/neoncity/header-cybre-colour.jpg'); background-repeat: repeat-x; background-size:contain; height:45vh; @@ -272,7 +272,7 @@ $about-page-text: lighten($ui-base-color, 50%); } body, .landing-page, .public-layout { - background-image: url("../themes/neoncity/images/neon-city.jpg"); + background-image: url("../images/neoncity/neon-city.jpg"); background-size: cover; background-repeat: no-repeat; background-position: center; @@ -319,4 +319,4 @@ body, .landing-page, .public-layout { .account__section-headline { background-color: rgba(17,17,17,0.9); -} \ No newline at end of file +} diff --git a/app/javascript/styles/swan-lake.scss b/app/javascript/styles/swan-lake.scss index 68c9e7e6f..9008969a6 100644 --- a/app/javascript/styles/swan-lake.scss +++ b/app/javascript/styles/swan-lake.scss @@ -72,7 +72,7 @@ $about-page-text: lighten($ui-base-color, 50%); } .landing-page.alternative .header { - background-image:url('../themes/neoncity/images/header-cybre-colour.jpg'); + background-image:url('../images/neoncity/header-cybre-colour.jpg'); background-repeat: repeat-x; background-size:contain; height:45vh; @@ -276,7 +276,7 @@ $about-page-text: lighten($ui-base-color, 50%); } body, .landing-page, .public-layout { - background-image: url("../themes/swan-lake.jpg"); + background-image: url("../images/swan-lake.jpg"); background-size: cover; background-repeat: no-repeat; background-position: center; @@ -338,4 +338,4 @@ body, .landing-page, .public-layout { .status__content__read-more-button:hover { text-shadow: 0 0 8px #A59BD6 !important; -} \ No newline at end of file +} diff --git a/app/javascript/styles/witches-town.scss b/app/javascript/styles/witches-town.scss index 1c14abadb..5b9d949eb 100644 --- a/app/javascript/styles/witches-town.scss +++ b/app/javascript/styles/witches-town.scss @@ -16,11 +16,11 @@ $ui-highlight-color: #A288BD; // Fonts @font-face { font-family: 'witchesAwesome'; - src: url('/witchesAwesome/witchesAwesome.eot?c15'); - src: url('/witchesAwesome/witchesAwesome.eot?c15#iefix') format('embedded-opentype'), - url('/witchesAwesome/witchesAwesome.ttf?c15') format('truetype'), - url('/witchesAwesome/witchesAwesome.woff?c15') format('woff'), - url('/witchesAwesome/witchesAwesome.svg?c15#witchesAwesome') format('svg'); + src: url('../fonts/witchesAwesome/witchesAwesome.eot?c15'); + src: url('../fonts/witchesAwesome/witchesAwesome.eot?c15#iefix') format('embedded-opentype'), + url('../fonts/witchesAwesome/witchesAwesome.ttf?c15') format('truetype'), + url('../fonts/witchesAwesome/witchesAwesome.woff?c15') format('woff'), + url('../fonts/witchesAwesome/witchesAwesome.svg?c15#witchesAwesome') format('svg'); font-weight: normal; font-style: normal; }