ascribe/wp-theme
1
0
Fork 0
mirror of https://github.com/ascribe/wp-theme synced 2024-12-23 01:30:09 +01:00
Code Issues Releases Wiki Activity

Merge pull request #15 from ascribe/fix/6

Browse Source 
Show Team title
This commit is contained in:
Matthias Kretschmann 2015-12-17 15:16:49 +01:00
commit d708ed09d5
4 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
assets/css/ascribe.css
View File

@ -468,7 +468,7 @@ h5,
.blog-features h2, .blog-features h2,
.blog-features h1, .blog-features h1,
.team, .team,
.team h2, .team-member h2,
.faq, .faq,
.values .value, .values .value,
.careers a, .careers a,
@ -514,7 +514,7 @@ h6,
.button, .button,
.case-studies .description, .case-studies .description,
.blue-box h1, .blue-box h1,
.team h1, .team-member h1,
.faq .featured-faqs dt, .faq .featured-faqs dt,
.faq .regular-faqs dt, .faq .regular-faqs dt,
.values .value h1, .values .value h1,
@ -2298,35 +2298,6 @@ header + .chevron-divider {
.team p { .team p {
margin: 0; margin: 0;
} }
.team .team-member {
display: inline-block;
vertical-align: top;
padding-right: 30px;
font-size: 15px;
width: 33.33333333%;
text-align: center;
margin-bottom: 40px;
}
@media screen and (max-width: 570px) {
.team .team-member {
width: 100%;
}
}
.team img {
border-radius: 100%;
}
.team h1 {
color: #000;
font-size: 19px;
margin-top: 20px;
margin-bottom: 0;
}
.team h2 {
color: #121417;
font-size: 18px;
line-height: 22px;
margin-top: 2px;
}
.team.tour-page { .team.tour-page {
padding: 70px 0; padding: 70px 0;
background-color: #fbfbfb; background-color: #fbfbfb;
@ -2336,8 +2307,37 @@ header + .chevron-divider {
text-align: center; text-align: center;
} }
} }
.team-member {
display: inline-block;
vertical-align: top;
padding-right: 30px;
font-size: 15px;
width: 33.33333333%;
text-align: center;
margin-bottom: 40px;
}
@media screen and (max-width: 570px) {
.team-member {
width: 100%;
}
}
.team-member img {
border-radius: 100%;
}
.team-member h1 {
color: #000;
font-size: 19px;
margin-top: 20px;
margin-bottom: 0;
}
.team-member h2 {
color: #121417;
font-size: 18px;
line-height: 22px;
margin-top: 2px;
}
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.team .team-member { .team-member {
width: 50%; width: 50%;
} }
} }

2
assets/css/ascribe.min.css vendored
View File

File diff suppressed because one or more lines are too long

49
assets/css/less/ascribe.less
View File

@ -990,24 +990,6 @@ header + .chevron-divider {
p { p {
margin:0; margin:0;
} }
.team-member {
.ttl-columns.column-3;
text-align: center;
margin-bottom: 40px;
}
img {
border-radius: 100%;
}
h1 {
.teamName;
margin-top: 20px;
margin-bottom:0;
}
h2 {
.copyText;
margin-top:2px;
}
&.tour-page { &.tour-page {
padding: 70px 0; padding: 70px 0;
background-color: @greyBg; background-color: @greyBg;
@ -1017,12 +999,35 @@ header + .chevron-divider {
text-align: center; text-align: center;
} }
} }
@media screen and (max-width: @phoneWidth) { }
.team-member {
width: 50%;
} //
// Component: Team Member
//
.team-member {
.ttl-columns.column-3;
text-align: center;
margin-bottom: 40px;
img {
border-radius: 100%;
}
h1 {
.teamName;
margin-top: 20px;
margin-bottom:0;
}
h2 {
.copyText;
margin-top:2px;
}
@media screen and (max-width: @phoneWidth) {
width: 50%;
} }
} }
.page-template-template-companywhite .team { .page-template-template-companywhite .team {
@media screen and (max-width: @tabletWidth) { @media screen and (max-width: @tabletWidth) {
.intro { .intro {

2
controller/classes/Subtemplate.php
View File

@ -518,6 +518,7 @@ class Subtemplate {
$result = "<section class='subtemplate team tour-page'> $result = "<section class='subtemplate team tour-page'>
<div class='centered-content'> <div class='centered-content'>
<h1>{$subtemplateTitle}</h1>
<div class='intro'>{$content}</div> <div class='intro'>{$content}</div>
<div class='column-container'>{$teamMemberMarkup}</div> <div class='column-container'>{$teamMemberMarkup}</div>
<a href='{$meetTeamLink}' class='button white-blue'>Meet the Team</a> <a href='{$meetTeamLink}' class='button white-blue'>Meet the Team</a>
@ -587,6 +588,7 @@ class Subtemplate {
$result = "<section class='subtemplate team'> $result = "<section class='subtemplate team'>
<div class='centered-content-padding'> <div class='centered-content-padding'>
<div class='centered-content'> <div class='centered-content'>
<h1>{$subtemplateTitle}</h1>
<div class='intro'>{$content}</div> <div class='intro'>{$content}</div>
<div class='column-container'>{$teamMemberMarkup}</div> <div class='column-container'>{$teamMemberMarkup}</div>
</div> </div>