Skip to content

Commit

Permalink
Add small conformative improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzschmid committed Nov 14, 2020
1 parent 9cce9ff commit a6d3910
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 20 deletions.
4 changes: 2 additions & 2 deletions _includes/partials/get_link.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ <h3 class="mb-0 font-weight-light">

{% capture link_tag -%}
{%- if link.disabled -%}
<a class="disabled{% if link_styleclass %} {{ link_styleclass }}{% endif %}">
<a class="disabled{% if link_styleclass %} {{ link_styleclass }}{% endif %}" href="#">

{%- elsif link_iframe -%}
<a class="cursor-pointer{% if link_styleclass %} {{ link_styleclass }}{% endif %}" title="{{ link.name }}" data-toggle="modal" data-target="#link-modal" data-href="{{ link_href }}" {% if modal_header -%}
<a {% if link_styleclass %}class="{{ link_styleclass }}"{% endif %} title="{{ link.name }}" data-toggle="modal" data-target="#link-modal" data-href="{{ link_href }}" href="#" {% if modal_header -%}
data-header="{{ modal_header | strip_newlines | escape }}"
{%- elsif modal_title -%}
data-title="{{ modal_title }}"
Expand Down
1 change: 1 addition & 0 deletions _includes/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<title>
{% unless page.name contains '.' %}{{ page.name }} - {% else %}{% if page.title %}{{ page.title }} - {% endif %}{% endunless %}{{ site.title }}
</title>
<meta name="description" content="{{ site.description }}" />

<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css" />

Expand Down
8 changes: 4 additions & 4 deletions _includes/partials/live_button.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
{% include partials/get_timestamp.html %}

{%- if site.conference.live.streaming -%}
<a title="{{ link.name }}" data-toggle="modal" data-target="#stream-modal" data-room="{{ r.room }}" class="cursor-pointer
<a title="{{ link.name }}" data-toggle="modal" data-target="#stream-modal" data-room="{{ r.room }}" href="#"
{%- else -%}
<span class="
{%- endif %} live-show live-button badge badge-dark font-weight-normal text-left d-none {{ live_button_styleclass }}" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
<object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml"></object>
<span
{%- endif %} class="live-show live-button badge badge-dark font-weight-normal text-left d-none {{ live_button_styleclass }}" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
<object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml">!</object>
{{ site.data.lang[site.conference.lang].live.live | default: "Live" }}
{%- if site.conference.live.streaming -%}
</a>
Expand Down
4 changes: 2 additions & 2 deletions _includes/partials/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<li class="nav-item live-show d-none" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
{% if site.conference.live.streaming %}
<a class="cursor-pointer nav-link" title="{% if link.name %}{{ link.name }}{% else %}{{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}{% endif %}" data-toggle="modal" data-target="#stream-modal" data-room="">
<a class="nav-link" title="{% if link.name %}{{ link.name }}{% else %}{{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}{% endif %}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
{% else %}
{% assign link_styleclass = "nav-link" %}
{% include partials/get_link.html %}
Expand All @@ -50,7 +50,7 @@
{{ link.name | default: "" }}

<span class="live-button badge badge-dark font-weight-normal text-left">
<object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml"></object>
<object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml">!</object>
{{ site.data.lang[site.conference.lang].live.live | default: "Live" }}
</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/talk-overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h3 class="mt-4 mb-3">
{% include partials/get_link.html %}
{% if link_icon %}
{{ link_tag -}}
<i class="fas fa-{{ link_icon }} pr-1"></i></a>
<i class="fas fa-{{ link_icon }} p-1"></i></a>
{% endif %}
{% endfor %}
</span>
Expand Down
5 changes: 0 additions & 5 deletions _sass/conference.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ $fa-font-path: '/assets/webfonts' !default;

// General

// Show pointer cursor on links opening modals
.cursor-pointer {
cursor: pointer;
}

// No bottom margin on info-bar
.alert > p:last-of-type {
margin-bottom: 0;
Expand Down
12 changes: 6 additions & 6 deletions assets/icons/live.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a6d3910

Please sign in to comment.