Skip to content

Commit

Permalink
Sections layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
AnaSAzevedo committed Nov 20, 2023
1 parent 9ef7053 commit fc190e0
Show file tree
Hide file tree
Showing 27 changed files with 29 additions and 22 deletions.
Binary file modified config/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file modified config/__pycache__/wsgi.cpython-310.pyc
Binary file not shown.
Binary file modified config/settings/__pycache__/base.cpython-310.pyc
Binary file not shown.
Binary file modified config/settings/__pycache__/local.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified djangocon_2024/site/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/site/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/site/__pycache__/views.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified djangocon_2024/site/utils/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file not shown.
43 changes: 25 additions & 18 deletions djangocon_2024/static/css/project.min.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700&display=swap");
@import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700&display=swap");
@import url('https://fonts.googleapis.com/css2?family=Tilt+Neon&display=swap');
@import url('https://fonts.googleapis.com/css?family=Lato:100&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@300&display=swap');

.home-text,.important-dates .dates blockquote blockquote p{
font:normal normal normal 18px/24px Ubuntu,sans-serif;
font:normal normal normal 1.125rem/1.5rem Ubuntu,sans-serif
font:normal normal normal 18px/24px Montserrat,sans-serif;
font:normal normal normal 1.125rem/1.5rem Montserrat,sans-serif
}
.home-sponsors .sponsors-content h5,.home-title,.important-dates .dates h4{
font:normal normal normal 24px/28px Ubuntu,sans-serif;
font:normal normal normal 1.5rem/1.75rem Ubuntu,sans-serif
font:normal normal normal 24px/28px Montserrat,sans-serif;
font:normal normal normal 1.5rem/1.75rem Montserrat,sans-serif
}
@media (max-width:991.98px){
.home-header{
Expand Down Expand Up @@ -410,8 +410,10 @@
padding-bottom:2.5rem;
padding-top:2.5rem
}
.content-container .content-title h1{
color:#863b35
.content-container .content-title h1{
color: #863b35;
font-size: 2.5rem;
text-transform: uppercase !important;
}
.content-container .content-title h1.parent-title{
color:#030507;
Expand All @@ -420,8 +422,8 @@
}
.content-container .simple-content{
color:#030507;
font:18px/24px Ubuntu,sans-serif;
font:1.125rem/1.5rem Ubuntu,sans-serif;
font:18px/24px Montserrat,sans-serif;
font:1.125rem/1.5rem Montserrat,sans-serif;
overflow-x:auto!important;
text-decoration:none
}
Expand All @@ -445,10 +447,17 @@
h1.title,h2.title,h3.title,h4.title,h5.title,h6.title{
font-weight:700
}

.inner-content-width{
max-width:1144px;
max-width:71.5rem
max-width:75rem
}

#pages{
max-width:1144px;
max-width:50rem !important
}

body,html{
height:100%
}
Expand Down Expand Up @@ -481,14 +490,12 @@ body,html{
color:transparent
}
.title-lg{
font:normal normal 700 38px/44px Ubuntu;
font:normal normal 700 2.375rem/2.75rem Ubuntu
}
.bg-grey{
background:#ededeb
font:normal normal 700 38px/44px Montserrat;
font:normal normal 700 2.375rem/2.75rem Montserrat
}
.bg-light-grey{
background:#f2f2f0
.bottom-line{
border-bottom: 1px solid rgba(127,52,46, 0.3);
max-width: 71.5rem;
}
.header-margin{
padding-left:0px;
Expand Down Expand Up @@ -723,7 +730,7 @@ body,html{
overflow-x:hidden
}
body{
font-family:Ubuntu,sans-serif
font-family:Montserrat,sans-serif
}
.alert-debug{
background-color:#fff;
Expand Down
6 changes: 3 additions & 3 deletions djangocon_2024/templates/modules/simple.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="container inner-content-width">
<div class="container inner-content-width" id="pages">
<div class="row {{ content.meta.title.0 | safe |add:'-row' }}">
<div class="col-lg-3 col-12 content-title pb-4">
<div class="content-title pb-4">
<a id="{{ content.meta.title.0 | escape }}">
<h1 class="parent-title title title-lg">{{ content.meta.parent.0 | safe }}</h1>
<h1 class="title title-lg">{{ content.meta.title.0 | safe }}</h1>
</a>
</div>
<div class="col margin-right"></div>
<div class="col-lg-9 col-12 {{ content.meta.title.0|add:'-content' }} simple-content">
<div class="{ content.meta.title.0|add:'-content' }} simple-content">
{{ content.html | safe }}
</div>
<div class="col margin-left"></div>
Expand Down
2 changes: 1 addition & 1 deletion djangocon_2024/templates/pages/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block content %}

{% for file in files %}
<div class="container-fluid content-container {% cycle 'bg-grey' 'bg-light-grey' %}">
<div class="container-fluid content-container {% cycle 'bottom-line' 'bottom-line' %}">
{% include 'modules/default.html' with content=file %}
</div>
{% endfor %}
Expand Down
Binary file modified djangocon_2024/users/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/admin.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/forms.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/models.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file modified djangocon_2024/users/__pycache__/views.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit fc190e0

Please sign in to comment.