diff --git a/EpisodesCommunity/settings.py b/EpisodesCommunity/settings.py
index f4926d8..8b9743e 100644
--- a/EpisodesCommunity/settings.py
+++ b/EpisodesCommunity/settings.py
@@ -46,7 +46,6 @@ INSTALLED_APPS = [
'LandingPage.apps.LandingpageConfig',
'Show.apps.ShowConfig',
'Discussions.apps.DiscussionsConfig',
- 'pipeline',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -136,30 +135,9 @@ MEDIA_ROOT = 'media/'
STATIC_URL = '/static/'
STATIC_ROOT = 'static/'
-PIPELINE = {
- 'PIPELINE_ENABLED': not DEBUG,
- 'STYLESHEETS': {
- 'style': {
- 'source_filenames': (
- 'css/style.styl',
- 'css/footer.styl',
- ),
- 'output_filename': 'css/style.css',
- },
- },
- 'COMPILERS': [
- 'pipeline.compilers.stylus.StylusCompiler'
- ],
- 'CSS_COMPRESSOR': 'pipeline.compressors.NoopCompressor',
- 'JS_COMPRESSOR': 'pipeline.compressors.NoopCompressor',
-}
-
-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
- 'pipeline.finders.PipelineFinder',
)
AUTH_TOKEN_ENDPOINT = oauth_options.get('token_endpoint','https://icynet.eu/oauth2/')
diff --git a/LandingPage/static/css/footer.css b/LandingPage/static/css/footer.css
new file mode 100644
index 0000000..e50612e
--- /dev/null
+++ b/LandingPage/static/css/footer.css
@@ -0,0 +1,91 @@
+footer {
+ padding: 20px;
+ background: #e9f6fd;
+ background: -moz-linear-gradient(top, #e9f6fd 0%, #d3eefb 100%);
+ background: -webkit-linear-gradient(top, #e9f6fd 0%, #d3eefb 100%);
+ background: linear-gradient(to bottom, #e9f6fd 0%, #d3eefb 100%);
+ border-top: 1px solid #ddd;
+ text-align: center;
+}
+footer .copyright {
+ display: inline-block;
+ text-align: center;
+ font-size: 90%;
+ vertical-align: top;
+ margin-top: 35px;
+ padding: 15px;
+ margin-left: 5vw;
+}
+footer .squeebot {
+ width: 200px;
+}
+footer .logo {
+ font-family: "Open Sans";
+ font-weight: bold;
+ text-transform: uppercase;
+ text-shadow: 2px 2px 1px #007104;
+ color: #00b300;
+ letter-spacing: 5px;
+ user-select: none;
+ font-size: 30px;
+ text-align: inherit;
+ cursor: pointer;
+ display: inline-block;
+}
+footer .logo .part1,
+footer .logo .part2 {
+ display: inline-block;
+}
+footer .logo .part1 {
+ color: #03a9f4;
+ text-shadow: 2px 2px 1px #0059a0;
+ margin-right: 5px;
+}
+footer .socialbtn {
+ width: 28px;
+ height: 28px;
+ display: inline-block;
+ line-height: 28px;
+ color: #fff;
+ font-size: 160%;
+ border-radius: 100px;
+ padding: 2px;
+ margin: 5px;
+}
+footer .socialbtn#github {
+ background-color: #000;
+}
+footer .socialbtn#twitter {
+ background-color: #03a9f4;
+}
+footer .socialbtn#discord {
+ background-color: #2c2f33;
+}
+footer .socialbtn#discord .discordlogo {
+ position: relative;
+ top: 3px;
+ background: url("https://icynet.eu/static/image/Discord-Logo-White.svg");
+ width: 22px;
+ height: 22px;
+ display: inline-block;
+}
+footer .socialbtn i {
+ position: relative;
+ right: 1px;
+}
+footer span.divider {
+ color: #ddd;
+ margin: 0 5px;
+ cursor: default;
+}
+@media all and (max-width: 800px) {
+ footer .squeebot {
+ margin: 0;
+ width: 150px;
+ margin: auto;
+ display: block;
+ }
+ footer .copyright {
+ margin-left: 0;
+ }
+}
diff --git a/LandingPage/static/css/footer.styl b/LandingPage/static/css/footer.styl
deleted file mode 100644
index 8898fc5..0000000
--- a/LandingPage/static/css/footer.styl
+++ /dev/null
@@ -1,76 +0,0 @@
-footer
- padding: 20px
- background: #e9f6fd
- background: -moz-linear-gradient(top, #e9f6fd 0%, #d3eefb 100%)
- background: -webkit-linear-gradient(top, #e9f6fd 0%,#d3eefb 100%)
- background: linear-gradient(to bottom, #e9f6fd 0%,#d3eefb 100%)
- border-top: 1px solid #ddd
- text-align: center
- .copyright
- display: inline-block
- text-align: center
- font-size: 90%
- vertical-align: top
- margin-top: 35px
- padding: 15px
- margin-left: 5vw
- .squeebot
- width: 200px
- .logo
- font-family: "Open Sans"
- font-weight: bold
- text-transform: uppercase
- text-shadow: 2px 2px 1px #007104
- color: #00b300
- letter-spacing: 5px
- user-select: none
- font-size: 30px
- text-align: inherit
- cursor: pointer
- display: inline-block
- .part1, .part2
- display: inline-block
- .part1
- color: #03A9F4
- text-shadow: 2px 2px 1px #0059a0
- margin-right: 5px
- .socialbtn
- width: 28px
- height: 28px
- display: inline-block
- line-height: 28px
- color: #fff
- font-size: 160%
- border-radius: 100px
- padding: 2px
- margin: 5px
- &#github
- background-color: #000
- &#twitter
- background-color: #03a9f4
- &#discord
- background-color: #2C2F33
- .discordlogo
- position: relative
- top: 3px
- background: url(https://icynet.eu/static/image/Discord-Logo-White.svg)
- width: 22px
- height: 22px
- display: inline-block
- i
- position: relative
- right: 1px
- span.divider
- color: #ddd
- margin: 0 5px
- cursor: default
-
-@media all and (max-width: 800px)
- footer
- .squeebot
- margin: 0
- width: 150px
- margin: auto
- display: block
- .copyright
- margin-left: 0
diff --git a/LandingPage/static/css/style.css b/LandingPage/static/css/style.css
new file mode 100644
index 0000000..af1df3c
--- /dev/null
+++ b/LandingPage/static/css/style.css
@@ -0,0 +1,91 @@
+body {
+ background-color: #fff;
+ font-family: "Open Sans", Helvetica;
+ margin: 0;
+ padding: 0;
+}
+.unibar {
+ padding: 20px;
+ border-bottom: 1px solid #ddd;
+ box-shadow: 2px 2px 5px #9c9c9c;
+}
+.unibar .logo {
+ font-size: 200%;
+}
+.unibar .userdata {
+ display: inline-block;
+ float: right;
+ padding: 12px;
+}
+.wrapper {
+ min-height: 100vh;
+}
+.show-promo {
+ display: inline-block;
+ width: 200px;
+ text-align: center;
+ margin: 5px;
+ vertical-align: text-top;
+}
+.show-promo .artwork {
+ max-width: 180px;
+ max-height: 260px;
+}
+.blocklayout .block {
+ margin: 15px;
+ box-shadow: 2px 2px 5px #9c9c9c;
+}
+.blocklayout .block h1 {
+ background-color: #f5f5f5;
+ border: 2px solid #d0d0d0;
+ border-bottom: 0;
+ padding: 8px;
+ margin: 0;
+ word-wrap: break-word;
+}
+.blocklayout .block .content {
+ overflow: hidden;
+ border: 2px solid #d0d0d0;
+ padding: 10px;
+}
+.blocklayout.columns {
+ position: relative;
+ overflow: hidden;
+}
+.blocklayout.columns .column.primary {
+ width: 80%;
+}
+.blocklayout.columns .column.smaller {
+ width: 20%;
+ float: right;
+}
+@media all and (max-width: 800px) {
+ .logo {
+ font-size: 5vw !important;
+ }
+ .blocklayout.columns .column {
+ position: initial;
+ display: block;
+ }
+ .blocklayout.columns .column.primary {
+ width: initial;
+ }
+ .blocklayout.columns .column.smaller {
+ display: none;
+ }
+ .blocklayout .block {
+ margin: 0;
+ margin-bottom: 10px;
+ border: none;
+ box-shadow: none;
+ }
+ .blocklayout .block .content,
+ .blocklayout .block h1 {
+ border: none;
+ }
+ .blocklayout .block .content .show-promo,
+ .blocklayout .block h1 .show-promo {
+ display: block;
+ margin: 5px auto;
+ }
+}
diff --git a/LandingPage/static/css/style.styl b/LandingPage/static/css/style.styl
deleted file mode 100644
index cf5649d..0000000
--- a/LandingPage/static/css/style.styl
+++ /dev/null
@@ -1,77 +0,0 @@
-body
- background-color: #fff
- font-family: "Open Sans", Helvetica
- margin: 0
- padding: 0
-
-.unibar
- padding: 20px
- border-bottom: 1px solid #ddd
- box-shadow: 2px 2px 5px #9c9c9c
- .logo
- font-size: 200%
- .userdata
- display: inline-block
- float: right
- padding: 12px
-
-.wrapper
- min-height: 100vh
-
-.show-promo
- display: inline-block
- width: 200px
- text-align: center
- margin: 5px
- vertical-align: text-top
- .artwork
- max-width: 180px
- max-height: 260px
-
-.blocklayout
- .block
- margin: 15px
- box-shadow: 2px 2px 5px #9c9c9c
- h1
- background-color: #f5f5f5
- border: 2px solid #d0d0d0
- border-bottom: 0
- padding: 8px
- margin: 0
- word-wrap: break-word
- .content
- overflow: hidden
- border: 2px solid #d0d0d0
- padding: 10px
- &.columns
- position: relative
- overflow: hidden
- .column
- &.primary
- width: 80%
- &.smaller
- width: 20%
- float: right
-
-@media all and (max-width: 800px)
- .logo
- font-size: 5vw !important
- .blocklayout
- &.columns
- .column
- position: initial
- display: block
- &.primary
- width: initial
- &.smaller
- display: none
- .block
- margin: 0
- margin-bottom: 10px
- border: none
- box-shadow: none
- .content, h1
- border: none
- .show-promo
- display: block
- margin: 5px auto
diff --git a/LandingPage/templates/base.html b/LandingPage/templates/base.html
index e3bf880..9d3499a 100644
--- a/LandingPage/templates/base.html
+++ b/LandingPage/templates/base.html
@@ -1,10 +1,11 @@
-{% load pipeline %}
+{% load static %}
- {% stylesheet 'style' %}
+
+
{% block meta %}
diff --git a/requirements.txt b/requirements.txt
index 8371028..c7d77b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
Django==1.11.4
Pillow==4.2.1
dj-database-url==0.4.2
-django-pipeline==1.6.13