Skip to content

Commit aed624d

Browse files
committed
Fixed modals' background.
1 parent 5a3217e commit aed624d

10 files changed

+27
-16
lines changed

_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Plugins
22
gems:
33
- jekyll-sitemap
4-
safe: true
4+
safe: false
55

66
# Build Settings
77
markdown: kramdown

_data/sessions.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
title: "Coffee Break"
44
place: "Hall"
55
service: true
6+
description: "The best time to talk with speakers and attendees"
67
-
78
id: 503
89
title: "Lunch Break"

_includes/navigation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{% endfor %}
2424
</ul>
2525
{% for rightNavigationButton in site.rightNavigationButtons %}
26-
<a href="{% if rightNavigationButton.permalink != null %} {{ rightNavigationButton.permalink | prepend: site.baseurl }} {% else %} {{ rightNavigationButton.link }} {% endif %}" class="{% if forloop.index == 1 %}right-nav-button-rightest {% endif %}right-nav-button right-nav-button-hidden btn btn-primary waves-effect waves-button waves-light waves-float pull-right hidden-xs hidden-sm" {% if rightNavigationButton.link != null %}target="_blank"{% endif %}>
26+
<a href="{% if rightNavigationButton.permalink != null %} {{ rightNavigationButton.permalink | prepend: site.baseurl }} {% else %} {{ rightNavigationButton.link }} {% endif %}" class="right-nav-button right-nav-button-hidden btn btn-primary waves-effect waves-button waves-light waves-float pull-right hidden-xs hidden-sm" {% if rightNavigationButton.link != null %}target="_blank"{% endif %}>
2727
{{ rightNavigationButton.text }}
2828
</a>
2929
{% endfor %}

_includes/schedule.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h5 class="slot-title" itemprop="name">{{ session.title }}</h5>
6363
<div class="slot-content">
6464
<h5 class="slot-title" itemprop="name">{{ session.title }}</h5>
6565
{% if session.description != null %}
66-
<p class="theme-description"><br>{{ session.description }}</p>
66+
<p class="service-description">{{ session.description }}</p>
6767
{% endif %}
6868
</div>
6969
</div>

_sass/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@import "vendor/animate";
77
@import "vendor/waves";
88

9-
// Partialsas
9+
// Partials
1010
@import "partials/global";
1111
@import "partials/buttons";
1212
@import "partials/helper";

_sass/partials/_modal.scss

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
$modal-color: #757575;
22
$modal-highlight-color: #212121;
33
.modal {
4+
z-index: 1050;
45
.icon-cross {
56
width: 19px;
67
height: 19px;
@@ -22,6 +23,14 @@ $modal-highlight-color: #212121;
2223
}
2324
}
2425
}
26+
.modal-backdrop {
27+
position: fixed;
28+
top: 0;
29+
bottom: 0;
30+
right: 0;
31+
left: 0;
32+
z-index: 1040;
33+
}
2534
.modal-content {
2635
border-radius: 4px;
2736
box-shadow: 0 5px 15px rgba(0, 0, 0, .3);
@@ -49,10 +58,10 @@ $modal-highlight-color: #212121;
4958
}
5059
.theme-description {
5160
margin: 12px 0 20px;
52-
}
61+
}
5362
.theme-presentation {
5463
font-size: 15px;
55-
}
64+
}
5665
.people-details {
5766
.row {
5867
margin-top: 20px;
@@ -70,7 +79,7 @@ $modal-highlight-color: #212121;
7079
.details {
7180
padding-left: 30px;
7281
@media (max-width: 767px) {
73-
padding: 0;
82+
padding: 0;
7483
}
7584
}
7685
.name {
@@ -87,13 +96,13 @@ $modal-highlight-color: #212121;
8796
padding: 0;
8897
list-style: none;
8998
@media (max-width: 767px) {
90-
text-align: center;
99+
text-align: center;
91100
}
92101
li {
93102
display: inline-block;
94103
padding-right: 3px;
95104
}
96-
}
105+
}
97106
}
98107
}
99108
.modal-ribbon-wrapper {
@@ -102,4 +111,4 @@ $modal-highlight-color: #212121;
102111
margin-right: 7px;
103112
font-size: 14px;
104113
}
105-
}
114+
}

_sass/partials/_navigation.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ nav {
143143
transition: $base-transition;
144144
opacity: 1;
145145
display: block;
146+
&:nth-of-type(1) {
147+
margin-right: 65px;
148+
}
146149
a {
147150
font-size: $base-font-size * 90 / 100;
148151
}
@@ -151,9 +154,6 @@ nav {
151154
transform: translateY(-50px);
152155
}
153156
}
154-
.right-nav-button-rightest {
155-
margin: 11px 65px 0 0;
156-
}
157157
.icon-menu {
158158
width: 20px;
159159
height: 20px;

_sass/partials/_schedule.scss

+3
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,6 @@ $small-label-width: 80px;
185185
right: 15px;
186186
top: 20px;
187187
}
188+
.service-description {
189+
margin-top: 15px;
190+
}

css/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/main.min.css

-2
This file was deleted.

0 commit comments

Comments
 (0)