UI: Implement Web Assets' theme system, and add 'dark' theme #103972
@ -69,6 +69,11 @@
|
|||||||
$col-time-width: 8%
|
$col-time-width: 8%
|
||||||
|
|
||||||
.schedule-container
|
.schedule-container
|
||||||
|
&.status-proposed
|
||||||
|
a.event
|
||||||
|
pointer-events: none
|
||||||
|
.event-favorite
|
||||||
|
display: none
|
||||||
.event-speakers
|
.event-speakers
|
||||||
+margin(1, y)
|
+margin(1, y)
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
.col-md-3
|
.col-md-3
|
||||||
| {% block sidebar %}
|
| {% block sidebar %}
|
||||||
.card
|
.card
|
||||||
div(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
|
nav(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
|
||||||
a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
|
a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
|
||||||
i.i-user
|
i.i-user
|
||||||
| Profile
|
| Profile
|
||||||
|
@ -11,7 +11,7 @@ script.
|
|||||||
|
|
||||||
| {% block header %}
|
| {% block header %}
|
||||||
| {% block jumbotron %}
|
| {% block jumbotron %}
|
||||||
| {% include "conference_main/components/hero.pug" with show_logo=True show_date=True show_location=True show_gradient=True show_overlay=True %}
|
| {% include "conference_main/components/hero.pug" with show_logo=True show_date=True show_location=True show_overlay=True %}
|
||||||
| {% endblock jumbotron %}
|
| {% endblock jumbotron %}
|
||||||
| {% endblock header %}
|
| {% endblock header %}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
.row
|
.row
|
||||||
.col-md-3.mb-3
|
.col-md-3.mb-3
|
||||||
| {% block sidebar %}
|
| {% block sidebar %}
|
||||||
div(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
|
nav(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
|
||||||
a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
|
a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
|
||||||
i.i-user
|
i.i-user
|
||||||
| Profile
|
| Profile
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
| {% include "conference_main/components/schedule_header_notice.pug" %}
|
| {% include "conference_main/components/schedule_header_notice.pug" %}
|
||||||
| {% include "conference_main/components/location_style.pug" %}
|
| {% include "conference_main/components/location_style.pug" %}
|
||||||
|
|
||||||
.schedule-container.horizontal
|
.schedule-container.horizontal(class="{% if not user.is_staff %}status-{{ edition.schedule_status }}{% endif %}")
|
||||||
.schedule-filters-container
|
.schedule-filters-container
|
||||||
.btn-row
|
.btn-row
|
||||||
a.btn(href="{% url 'schedule' edition_path=edition.path %}?display=vertical")
|
a.btn(href="{% url 'schedule' edition_path=edition.path %}?display=vertical")
|
||||||
|
@ -134,7 +134,7 @@
|
|||||||
span {{ day.date | date:'l' }}
|
span {{ day.date | date:'l' }}
|
||||||
| {% endfor %}
|
| {% endfor %}
|
||||||
|
|
||||||
.schedule-container
|
.schedule-container(class="{% if not user.is_staff %}status-{{ edition.schedule_status }}{% endif %}")
|
||||||
.schedule
|
.schedule
|
||||||
.empty-time-cell
|
.empty-time-cell
|
||||||
|
|
||||||
|
12
deploy.sh
12
deploy.sh
@ -1,10 +1,11 @@
|
|||||||
#!/bin/sh -ex
|
#!/bin/sh -ex
|
||||||
|
|
||||||
ENVIRONMENT=$1
|
ENVIRONMENT=$1
|
||||||
|
FORCE=$2
|
||||||
|
|
||||||
if [ -z "$ENVIRONMENT" ]
|
if [ -z "$ENVIRONMENT" ]
|
||||||
then
|
then
|
||||||
echo "Usage: ./deploy.sh staging|production"
|
echo "Usage: ./deploy.sh staging|production [--force]"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -13,8 +14,15 @@ if [ "$ENVIRONMENT" = "production" ]; then
|
|||||||
git push origin production
|
git push origin production
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check if the '--force' argument is provided
|
||||||
|
EXTRA_VARS=""
|
||||||
|
if [ "$FORCE" = "--force" ]; then
|
||||||
|
EXTRA_VARS="-e override_lock=true"
|
||||||
|
fi
|
||||||
|
|
||||||
pushd playbooks
|
pushd playbooks
|
||||||
source .venv/bin/activate
|
source .venv/bin/activate
|
||||||
./ansible.sh -i environments/$ENVIRONMENT shared/deploy.yaml
|
# Append $EXTRA_VARS to the ansible command if --force is provided
|
||||||
|
./ansible.sh -i environments/$ENVIRONMENT shared/deploy.yaml $EXTRA_VARS
|
||||||
deactivate
|
deactivate
|
||||||
popd
|
popd
|
||||||
|
Loading…
Reference in New Issue
Block a user