infrastructure/conference-website
1
1
Fork 1
Code Issues 14 Pull Requests Releases Activity

UI: Conference website web-assets v2 upgrade #103970

Merged
Márton Lente merged 50 commits from ui/web-assets-v2-update into main 2024-09-23 12:34:43 +02:00
Conversation 20 Commits 50 Files Changed 47 +18 -21
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d0d4b5f43 - Show all commits

7
conference_main/static/conference_main/styles/_homepage.sass
View File

@ -1,4 +1,5 @@
$bcon-accent: #1291bd \:root
--color-bcon-accent: #1291bd
.bcon-logo .bcon-logo
text-shadow: none text-shadow: none
@ -12,10 +13,10 @@ $bcon-accent: #1291bd
.bcon-date, .bcon-date,
background-color: $white background-color: $white
color: $bcon-accent color: var(--color-bcon-accent)
.bcon-place .bcon-place
background-color: $bcon-accent background-color: var(--color-bcon-accent)
color: $white color: $white
.location-map .location-map

4
conference_main/static/conference_main/styles/main.sass
View File

@ -18,8 +18,8 @@ $font-path: '/static/assets/fonts'
@import "_utils.sass" @import "_utils.sass"
\:root \:root
--body-bg: #e9ecef --body-color-bg: #e9ecef
--color-bg: var(--body-bg) --color-bg: var(--body-color-bg)
--navbar-bg: #1e1e1e --navbar-bg: #1e1e1e
--navbar-primary-height: 45px --navbar-primary-height: 45px

7
conference_main/templates/conference_main/2020la/la_base_with_sidebar.pug
View File

@ -23,8 +23,7 @@
| {% endblock sidebar %} | {% endblock sidebar %}
.col-md-9 .col-md-9
.card .box
.card-body | {% block content_main %}
| {% block content_main %} | {% endblock content_main %}
| {% endblock content_main %}
| {% endblock content %} | {% endblock content %}

7
conference_main/templates/conference_main/base.pug
View File

@ -34,10 +34,9 @@
.container .container
.row .row
.col .col
.card .box
.card-body | {% block content_main %}
| {% block content_main %} | {% endblock content_main %}
| {% endblock content_main %}
| {% endblock content %} | {% endblock content %}
| {% block javascript-extra %} | {% block javascript-extra %}

7
conference_main/templates/conference_main/base_simple.pug
View File

@ -10,8 +10,7 @@
.container.mt-3 .container.mt-3
.row .row
.col .col
.card.p-3 .box.p-3
.card-body | {% block content_main %}
| {% block content_main %} | {% endblock content_main %}
| {% endblock content_main %}
| {% endblock content %} | {% endblock content %}

7
conference_main/templates/conference_main/base_with_sidebar.pug
View File

@ -24,8 +24,7 @@
| {% endblock sidebar %} | {% endblock sidebar %}
.col-md-9 .col-md-9
.card.p-3 .box.p-3
.card-body | {% block content_main %}
| {% block content_main %} | {% endblock content_main %}
| {% endblock content_main %}
| {% endblock content %} | {% endblock content %}