Skip to content

Commit

Permalink
Merge pull request #610 from eventoL/security-updates
Browse files Browse the repository at this point in the history
Security updates
  • Loading branch information
FedeG committed Nov 25, 2019
2 parents 92cf3cf + 74dca22 commit af4b9d2
Show file tree
Hide file tree
Showing 12 changed files with 266 additions and 156 deletions.
4 changes: 2 additions & 2 deletions eventol/eventol/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# pylint: disable=C0103

import os
import socket

from configurations import Configuration
from django.utils.translation import ugettext_lazy as _
Expand Down Expand Up @@ -67,7 +68,7 @@ class Base(Configuration):
'forms_builder.forms',
)

MIDDLEWARE_CLASSES = (
MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
Expand Down Expand Up @@ -291,7 +292,6 @@ class Base(Configuration):


class Staging(Base):
import socket
DEBUG = str_to_bool(os.getenv('DEBUG', 'True'))
SECRET_KEY = os.getenv(
'SECRET_KEY',
Expand Down
2 changes: 1 addition & 1 deletion eventol/front/src/components/Header/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
width: 100vw;

.nav-right {
z-index: 7;
margin-left: auto;
z-index: 7;

button {
background-color: transparent;
Expand Down
8 changes: 4 additions & 4 deletions eventol/front/src/components/Hero/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
width: 100%;

.btn-create-event {
line-height: 1.4;
border-radius: 15px;
font-weight: bold;
line-height: 1.4;
padding: 10px 15px;
border-radius: 15px;
}

.content {
Expand All @@ -25,9 +25,9 @@
z-index: 5;

.logo {
z-index: 4;
max-width: 250px;
max-height: 50vh;
max-width: 250px;
z-index: 4;
}

h2 {
Expand Down
2 changes: 1 addition & 1 deletion eventol/front/src/components/Search/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
font-size: 14px;
font-weight: 300;
height: 37px;
min-width: 150px;
outline: none;
padding: 0 10px;
pointer-events: all;
transition: border .25s ease, width .125s ease .125s;
width: 35vw;
min-width: 150px;
}

input:focus {
Expand Down
2 changes: 1 addition & 1 deletion eventol/front/src/containers/Home/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ body {
}

h2 {
margin-top: 5px;
font-size: 24px;
font-weight: 600;
line-height: 1.4;
margin-bottom: .5em;
margin-top: 5px;
}

p {
Expand Down
Loading

0 comments on commit af4b9d2

Please sign in to comment.