Skip to content
Snippets Groups Projects
Commit aa093f23 authored by Matija Čupić's avatar Matija Čupić
Browse files

Merge branch 'redesign-speakers-page' into 'master'

Speaker page redesign review

See merge request gitlab-com/www-gitlab-com!8186
parents 401fa06c 82c99811
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -38,14 +38,10 @@ extra_css:
.text-center
.speaker-header
%h3
%strong
= speaker.name
= link_to speaker.location, "https://maps.google.com/?q=#{escape_html(speaker.location)}"
%br
= speaker.specialty
%br
= link_to speaker.email, "mailto:#{speaker.email}"
%br
= speaker.name
%p= link_to speaker.location, "https://maps.google.com/?q=#{escape_html(speaker.location)}"
%p= speaker.specialty
%p= link_to speaker.email, "mailto:#{speaker.email}"
- if speaker.presentations.present?
.speaker-presentations
%h4
Loading
Loading
Loading
Loading
@@ -5,12 +5,16 @@
background-color: $color-primary;
padding-bottom: 80px;
padding-top: 80px;
border-bottom: 1px solid $border-color;
color: $color-white;
 
h1 {
margin-bottom: 20px;
}
@media(max-width: $screen-xs-max) {
padding-bottom: 40px;
padding-top: 40px;
}
}
 
.speakers {
Loading
Loading
@@ -31,6 +35,7 @@
.speaker-container {
padding: 25px 20px;
border: 1px solid $border-color;
border-radius: 5px;
min-height: 380px;
overflow-wrap: break-word;
display: flex;
Loading
Loading
@@ -43,11 +48,12 @@
 
h3 {
margin-bottom: 0;
font-weight: 600;
}
}
 
.speaker-presentations {
margin-top: 10px;
margin-top: 20px;
}
 
ul {
Loading
Loading
@@ -58,6 +64,11 @@
hyphens: auto;
}
}
p {
display: block;
margin: 3px 0;
}
}
 
.contact-us {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment