Skip to content

Commit 6772353

Browse files
committed
Drop use of SCSS
1 parent 6cbd2e6 commit 6772353

5 files changed

Lines changed: 9 additions & 26 deletions

File tree

pretalx_halfnarp/static/pretalx_halfnarp/frontend.scss renamed to pretalx_halfnarp/static/pretalx_halfnarp/frontend.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$transitionSpeed: 0.5s;
21

32
.submissions .submission {
3+
--transition-speed: 0.5s;
44
display: block;
55

66
margin-bottom: 1rem;
@@ -10,7 +10,7 @@ $transitionSpeed: 0.5s;
1010

1111
cursor: pointer;
1212

13-
transition: margin $transitionSpeed;
13+
transition: margin var(--transition-speed);
1414

1515
&.preferred {
1616
margin-left: 2rem;
@@ -28,10 +28,10 @@ $transitionSpeed: 0.5s;
2828

2929
.preferred-icon {
3030
> i {
31-
transition: transform $transitionSpeed;
31+
transition: transform var(--transition-speed);
3232
}
3333

34-
transition: opacity $transitionSpeed;
34+
transition: opacity var(--transition-speed);
3535
opacity: 0;
3636
color: #e0c840;
3737
}

pretalx_halfnarp/static/pretalx_halfnarp/organiser.scss renamed to pretalx_halfnarp/static/pretalx_halfnarp/organiser.css

File renamed without changes.

pretalx_halfnarp/templates/pretalx_halfnarp/frontend.html

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
{% extends "common/base.html" %}
22
{% load i18n %}
3-
{% load compress %}
43
{% load static %}
54

65
{% block title %}{% translate "Halfnarp" %} ::{% endblock %}
76

87
{% block custom_header %}
9-
{% compress css %}
10-
<link rel="stylesheet" type="text/x-scss" href="{% static "pretalx_halfnarp/frontend.scss" %}"/>
11-
{% endcompress %}
12-
{% compress js %}
13-
<script defer src="{% static "js/jquery.js" %}"></script>
14-
<script defer src="{% static "pretalx_halfnarp/frontend.js" %}"></script>
15-
{% endcompress %}
8+
<link rel="stylesheet" type="text/css" href="{% static "pretalx_halfnarp/frontend.css" %}"/>
9+
<script defer src="{% static "js/jquery.js" %}"></script>
10+
<script defer src="{% static "pretalx_halfnarp/frontend.js" %}"></script>
1611
{% endblock %}
1712

1813
{% block content %}

pretalx_halfnarp/templates/pretalx_halfnarp/organiser.html

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
{% extends "orga/base.html" %}
2-
{% load compress %}
32
{% load i18n %}
43
{% load rules %}
54
{% load static %}
65

76
{% block stylesheets %}
8-
{% compress css %}
9-
<link rel="stylesheet" type="text/x-scss" href="{% static "pretalx_halfnarp/organiser.scss" %}"/>
10-
{% endcompress %}
11-
{% endblock %}
12-
13-
{% block scripts %}
14-
{% compress js %}
15-
<script defer src="{% static "vendored/moment-with-locales.js" %}"></script>
16-
<script defer src="{% static "vendored/moment-timezone-with-data-10-year-range.js" %}"></script>
17-
{% endcompress %}
7+
<link rel="stylesheet" type="text/css" href="{% static "pretalx_halfnarp/organiser.css" %}"/>
188
{% endblock %}
199

2010
{% block content %}

pretalx_halfnarp/templates/pretalx_halfnarp/settings.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% extends "orga/base.html" %}
2-
{% load compress %}
3-
{% load copyable %}
2+
43
{% load i18n %}
5-
{% load static %}
64

75
{% block content %}
86

0 commit comments

Comments
 (0)