diff --git a/memopol/settings.py b/memopol/settings.py index 80f15fdf6eb28d6686b8e8d977669fbc6ec681c0..cfb51c4c4a7812bf170b36c7bd3c90e9da4ed384 100644 --- a/memopol/settings.py +++ b/memopol/settings.py @@ -238,7 +238,7 @@ if os.environ.get('OPENSHIFT_LOG_DIR', None): COMPRESS_PRECOMPILERS = ( # ('text/coffeescript', 'coffee --compile --stdio'), # ('text/less', 'lesscpy {infile}'), - ('text/x-scss', 'django_libsass.SassCompiler'), + # ('text/x-scss', 'django_libsass.SassCompiler'), # ('text/x-sass', 'sass {infile} {outfile}'), # ('text/x-scss', 'sass --scss {infile} {outfile}'), # ('text/stylus', 'stylus < {infile} > {outfile}'), @@ -246,9 +246,6 @@ COMPRESS_PRECOMPILERS = ( ) -LIBSASS_SOURCE_COMMENTS = False - - LOGGING = { 'version': 1, 'disable_existing_loggers': False, diff --git a/setup.py b/setup.py index 62c044561e1c4ab4390a52b81973ddf130819da5..433104748a93ef9da72a617da2f0a34813ba9c3b 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ setup(name='political-memory', 'django-compressor>=1,<2', 'django-datetime-widget>=0.9,<1.0', 'django-filter>=0.13,<0.14', - 'django-libsass>=0.7,<0.8', 'django-representatives-votes==0.0.24', 'django-representatives==0.0.34', 'django-rql-filter>=0.1.3,<0.2', diff --git a/static/scss/base.scss b/static/scss/base.scss deleted file mode 100644 index f6d87193b51457d21aa99042480ef79e9280dabe..0000000000000000000000000000000000000000 --- a/static/scss/base.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import 'font'; -@import 'header'; -@import 'footer'; -@import 'navigation'; -@import 'table'; -@import 'legislature'; -@import 'positions'; -@import 'chambers'; -@import 'groups'; -@import 'filter'; -@import 'external'; - -body { - background: #E5E5E5; -} - -.container, .container-fluid { - background: white; -} - -.main-container { - padding-top: 15px; -} - -.label a { - color: white; -} - -.label { - margin: 0 1px; -} \ No newline at end of file diff --git a/static/scss/chambers.scss b/static/scss/chambers.scss deleted file mode 100644 index acb08232b0c8fc9b7bdb91ec44965c1cd4c042b6..0000000000000000000000000000000000000000 --- a/static/scss/chambers.scss +++ /dev/null @@ -1,8 +0,0 @@ -.chamber-icon { - display: inline-block; - width: 1.5em; - height: 1.5em; - - vertical-align: bottom; - background-size: 100%; -} diff --git a/static/scss/external.scss b/static/scss/external.scss deleted file mode 100644 index 7e27fd5b8f2392e6d5269bd39d486d95ea108133..0000000000000000000000000000000000000000 --- a/static/scss/external.scss +++ /dev/null @@ -1,24 +0,0 @@ -a.twitter-link:before, -a.facebook-link:before { - content: ' '; - overflow: hidden; - - display: inline-block; - width: 1.5em; - height: 1.5em; - - vertical-align: bottom; -} - -a.twitter-link:before { - background-size: 110%; - background-position: center; - background-image: url(../images/twitter.png); -} - -a.facebook-link:before { - background-size: 75%; - background-repeat: no-repeat; - background-position: center; - background-image: url(../images/facebook.png); -} \ No newline at end of file diff --git a/static/scss/filter.scss b/static/scss/filter.scss deleted file mode 100644 index 7d0209fe829ec59d4dd7ae0545bbacbc382e5fc1..0000000000000000000000000000000000000000 --- a/static/scss/filter.scss +++ /dev/null @@ -1,70 +0,0 @@ -@mixin bootstrap-shadow($color:#66afe9) { - border-color: #66afe9; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 6px $color; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 6px $color; -} - -.filter-form { - display: flex; - flex-flow: row wrap; - justify-content: flex-start; - align-items: flex-end; - - .form-group { - display: flex; - flex-flow: column nowrap; - - margin: 0 .5em 0 0; - - .help-block { - display: none; - } - - .btn { - margin-top: .5em; - } - - /* Override bootstrap has-success color */ - - .control-label { - color: #555; - } - - .form-control { - border-color: #ccc; - - &:focus { - @include bootstrap-shadow(); - } - } - - /* Override select2 */ - .select2-container { - .select2-selection { - border-color: #ccc !important; - height: 34px; - - .select2-selection__rendered { - line-height: 34px; - } - - .select2-selection__arrow { - height: 32px; - } - } - - &.select2-container--focus, - &.select2-container--open { - @include bootstrap-shadow(); - } - } - } -} - -.no-results { - margin-top: 1em; - font-size: larger; - font-weight: bold; - color: #555; - margin: 2em 0; -} \ No newline at end of file diff --git a/static/scss/font.scss b/static/scss/font.scss deleted file mode 100644 index 787b2b062310db91f96c74eee856fe1bfebda938..0000000000000000000000000000000000000000 --- a/static/scss/font.scss +++ /dev/null @@ -1,21 +0,0 @@ -@font-face { - font-family: 'propagandaregular'; - src: url('../fonts/propagan-webfont.eot'); - src: url('../fonts/propagan-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/propagan-webfont.woff') format('woff'), url('../fonts/propagan-webfont.ttf') format('truetype'), url('../fonts/propagan-webfont.svg#propagandaregular') format('svg'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'sansus_webissimoitalic'; - src: url('../fonts/sansus_webissimo-italic-webfont-webfont.eot'); - src: url('../fonts/sansus_webissimo-italic-webfont-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/sansus_webissimo-italic-webfont-webfont.woff') format('woff'), url('../fonts/sansus_webissimo-italic-webfont-webfont.ttf') format('truetype'), url('../fonts/sansus_webissimo-italic-webfont-webfont.svg#sansus_webissimoitalic') format('svg'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'sansus_webissimoregular'; - src: url('../fonts/sansus_webissimo-regular-webfont-webfont.eot'); - src: url('../fonts/sansus_webissimo-regular-webfont-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/sansus_webissimo-regular-webfont-webfont.woff') format('woff'), url('../fonts/sansus_webissimo-regular-webfont-webfont.ttf') format('truetype'), url('../fonts/sansus_webissimo-regular-webfont-webfont.svg#sansus_webissimoregular') format('svg'); - font-weight: normal; - font-style: normal; -} diff --git a/static/scss/footer.scss b/static/scss/footer.scss deleted file mode 100644 index b1989f307daa13cc8b84cab142247550d8e67e94..0000000000000000000000000000000000000000 --- a/static/scss/footer.scss +++ /dev/null @@ -1,26 +0,0 @@ -#footer { - background: #5B8EDC; - color: white; - text-align: center; - padding: 20px; - - a { - color: white; - text-decoration: underline; - } - - .license-links, - .footer-link { - display: inline; - - & + .footer-link:before { - content: '•'; - padding: 0 .5em; - } - } - - .footer-separator { - height: 1em; - } -} - diff --git a/static/scss/groups.scss b/static/scss/groups.scss deleted file mode 100644 index a4f3bf8f2c7ec52138d1bdfa78ed0a86cd0bcadb..0000000000000000000000000000000000000000 --- a/static/scss/groups.scss +++ /dev/null @@ -1,10 +0,0 @@ -.group-icon { - display: inline-block; - width: 1.5em; - height: 1.5em; - - vertical-align: bottom; - background-size: 100%; - background-repeat: no-repeat; - background-position: center center; -} diff --git a/static/scss/header.scss b/static/scss/header.scss deleted file mode 100644 index 53d840355451b4235a99e334f296f7f9c73efdf2..0000000000000000000000000000000000000000 --- a/static/scss/header.scss +++ /dev/null @@ -1,34 +0,0 @@ -#header { - background: #5B8EDC; - color: white; - h1 { - font-family: 'propagandaregular'; - margin: 0; - padding-top:20px; - } - a { - color: white; - text-decoration:none; - } - .organization { - font-style: italic; - } -} - -#nav { - padding: 0; - ul.nav { - clear: both; - display: flex; - font-weight: bold; - - border-bottom: #eee 1px solid; - } -} - -#logo { - float: left; - img { - width: 100px; - } -} \ No newline at end of file diff --git a/static/scss/legislature.scss b/static/scss/legislature.scss deleted file mode 100644 index 8ea30ef42da743cba53dc9dde419b2b718de3510..0000000000000000000000000000000000000000 --- a/static/scss/legislature.scss +++ /dev/null @@ -1,81 +0,0 @@ -.representative { - h1 { - text-align: center; - } - p.photo { - text-align: center; - } - tr.score { - th { - vertical-align: bottom; - } - - td { - font-size: 1.4em; - .label { - padding: 2px; - } - } - } -} - -.positions form { - width: 50%; - margin: auto; -} - -.vote_negative { - color: red; -} - -.vote_positive { - color: green; -} - -.vote_abstain { - color: #333; -} - -.date-cell { - white-space: nowrap; -} - -.representative_grid { - display: flex; - flex-wrap: wrap; - justify-content: center; - - .representative_item { - width: 300px; - margin: 2px; - padding: 10px; - // border: 1px solid black; - background: #f5f5f5; - - .photo { - float: left; - } - - .name { - font-weight: bold; - } - - ul { - list-style-type: none; - text-indent: 10px; - } - } -} - -.representative_item.inactive, -.representative.inactive { - .photo img { - -webkit-filter: greyscale(1); - -moz-filter: grayscale(1); - -ms-filter: grayscale(1); - -o-filter: grayscale(1); - filter: grayscale(1); - - opacity: 0.5; - } -} \ No newline at end of file diff --git a/static/scss/navigation.scss b/static/scss/navigation.scss deleted file mode 100644 index 83a52ecb45946df7f8ba800f7d20b5eccf93e623..0000000000000000000000000000000000000000 --- a/static/scss/navigation.scss +++ /dev/null @@ -1,13 +0,0 @@ -.pagination-block { - margin-bottom: 10px; - - color: #999; - font-size: 0.9em; - - nav { - text-align: center; - } - .count { - text-align: left; - } -} \ No newline at end of file diff --git a/static/scss/positions.scss b/static/scss/positions.scss deleted file mode 100644 index 50a36693f04a11a4734db415fbc13c5efafed9a4..0000000000000000000000000000000000000000 --- a/static/scss/positions.scss +++ /dev/null @@ -1,27 +0,0 @@ -$quote-size: 1em; - -.quote { - width: 70%; - margin: auto; - -} - -.quote-header { - font-style: italic; -} - -.long-quote { - - p:first-child:before { - content: '« '; - font-style: italic; - font-size: $quote-size; - } - - p:last-child:after { - content: ' »'; - font-style: italic; - font-size: $quote-size; - text-align: right; - } -} \ No newline at end of file diff --git a/static/scss/table.scss b/static/scss/table.scss deleted file mode 100644 index 106ae2490e52ab00e7f0de058a0a92ce1ac77b70..0000000000000000000000000000000000000000 --- a/static/scss/table.scss +++ /dev/null @@ -1,25 +0,0 @@ -table.detail-view > tbody > tr > td, table.detail-view > tbody > tr > th { - border-top: 0; -} - -table.detail-view { - th { - text-align: right; - } - th:after{ - content: ' :'; - } -} - -.icon-cell { - text-align: center; -} - -.grid-list-selector { - // text-align: right; -} - -.no-recommendation { - font-style: italic; - text-align: center; -} \ No newline at end of file