Skip to content

Commit

Permalink
Merge pull request #197 from activebridge/fix/expertise_titles_descri…
Browse files Browse the repository at this point in the history 
…ptions

Fix Expertise titles and descriptions
  • Loading branch information
@katatsu12
katatsu12 authored Apr 21, 2024
2 parents 74a30ff + a5cda18 commit 0558e75
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 114 deletions.
101 changes: 4 additions & 97 deletions _sass/expertise.scss
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,29 @@
.expertise {
.header-3 { margin-top: 2vh; }

.header-2 {
max-width: 85%;
margin: 5vh auto;
font-size: 22px;
line-height: 1.5;
}

.description {
margin-bottom: 10vh;
font-size: 16px;
}

&__main {
.description {
margin-top: 5vh;
margin-bottom: 5vh;
}

.wrapper {
h1 { margin-bottom: 0;}
h2 { margin-top: 10px; }
}
}

&__technologies {
background: center/cover no-repeat url('/assets/images/expertise/technologies-bg.webp');
box-shadow: 0px 0px 20px -3px grey;;

.header-3 { font-size: 1.3em; }

.header-2 { margin-top: 1vh; }

img { margin: 5vh 0; }

.description { margin-bottom: 3vh; }
}

&__industries {
padding: 80px 0;

.header-3:first-child { font-size: 1.8em; }

.header-3 { font-size: 1.3em; }
}

&__main,
&__solutions,
&__testimonials {
.header-2 { max-width: 100%; }
}
&__industries { padding: 80px 0; }

&__solutions {
&.wrap {
padding-top: 5vh;
padding-bottom: 5vh;
}

.header-2 {
margin-top: 0;
margin-bottom: 0;
}

.button { margin-top: 30px; }
}

&__testimonials {
background: center/cover no-repeat url('/assets/images/about/about-bg.webp');
padding-bottom: 60px;

.wrapper {
padding-top: 8vh;

.header-2 { margin-top: 0; }
}
.wrapper { padding-top: 8vh; }
}

&__tell-us {
min-height: 85vh;
background: center/cover no-repeat url('/assets/images/expertise/tell-us.webp');
background-color: $dark-violet;

.header-2 {
font-family: 'Cera Regular', serif;
font-size: 1.8em;
letter-spacing: 0.5em;
line-height: 1.6;
text-transform: uppercase;
}
}
}

Expand All @@ -108,9 +43,7 @@
font-size: 1.3em;
box-shadow: inset -7px -7px 11px -6px #8f8f8f;
font-family: 'Cera-Bold', serif;

&:first-child { border-radius: 1.2em 0 0 1.2em; }

&:last-child { border-radius: 0 1.2em 1.2em 0; }
}
}
Expand Down Expand Up @@ -157,7 +90,6 @@
&:nth-child(2n) { justify-content: flex-end; }
}
}

.button { margin-top: 6vh; }

.pie-chart {
Expand Down Expand Up @@ -220,7 +152,6 @@
text-overflow: ellipsis;
}
}

.card__description { line-height: 1.6em; }
}

Expand All @@ -233,16 +164,13 @@
.chart__item {
width: 100%;
justify-content: space-around;

&:nth-child(2n) { justify-content: space-around; }

&-color {
width: 35px;
height: 35px;
}

&-title { font-size: 1em; }

&-description { font-size: .9em; }
}
}
Expand All @@ -256,7 +184,6 @@
height: auto;
margin: 0 10vw;
padding: 4vh 2vw;

&:not(:last-child) { margin-bottom: 5vh; }

&__title-2 {
Expand All @@ -272,31 +199,11 @@
}
}

.header-2 { font-size: 1em; }

.description { font-size: .8em; }

&__main .description { margin-bottom: 0; }

&__technologies img {
margin-right: -15px;
margin-left: -15px;
}

&__industries {
padding: 60px 0;

.header-3:first-child { font-size: 1.5em; }
}

&__solutions .header-2 { margin: 0 auto;}

&__testimonials .header-2 { margin-top: 0; }

&__tell-us {
min-height: 50vh;

.header-2 { margin: 0 auto; }
}
&__industries { padding: 60px 0; }
&__tell-us { min-height: 50vh; }
}
}
13 changes: 11 additions & 2 deletions assets/css/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,15 @@ ul, ol { margin-left: 0; }
margin-bottom: 40px;
}

.block-sub-title {
font-family: "Cera Regular", serif;
font-size: 22px;
letter-spacing: 0.4em;
text-align: center;
text-transform: uppercase;
margin-bottom: 40px;
}

.message {
font-size: 22px;
line-height: 35px;
Expand Down Expand Up @@ -370,8 +379,8 @@ b { font-family: "Cera-Bold", serif; }
}
.block-cera-title,.block-cera-title,.message { margin-bottom: 25px; }

.message {
font-size: 18px;
.message, .block-sub-title{
font-size: 15px;
line-height: 25px;
}
}
29 changes: 14 additions & 15 deletions expertise.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
permalink: /expertise
layout: default
relative_css_url: /assets/css/expertise.css
title: RoR App Development & Cloud Software Expertise | Active Bridge
date-modified: "2024-04-01"
description: Enhancing Ruby on Rails with cutting edge technologies, for 10+ years
Expand All @@ -16,30 +15,30 @@
<div class="container expertise">
<div class="alabaster expertise__main wrap">
<div class="wrapper" style="view-transition-name: expertise;">
<div class="header-3">{{ site.data.expertise.main.title }}</div>
<h1 class="header-2">{{ site.data.expertise.main.first_title }}</h1>
<h2 class="header-2">{{ site.data.expertise.main.subtitle }}</h2>
<div class="description text-justify">{{ site.data.expertise.main.description_1 }}</div>
<p class="page-title">{{ site.data.expertise.main.title }}</p>
<h1 class="block-inria-title">{{ site.data.expertise.main.first_title }}</h1>
<h2 class="message inria-regular">{{ site.data.expertise.main.subtitle }}</h2>
<p class="description text-justify">{{ site.data.expertise.main.description_1 }}</p>
<div class="chart-container">{% include expertise_chart.html %}</div>
<div class="description text-justify">{{ site.data.expertise.main.description_2 }}</div>
<p class="description text-justify">{{ site.data.expertise.main.description_2 }}</p>
</div>
</div>

<div class="expertise__technologies wrap">
<div class="wrapper">
<h2 class="header-2">{{ site.data.expertise.technologies.subtitle }}</h2>
<div class="header-3">{{ site.data.expertise.technologies.title }}</div>
<h2 class="message inria-bold">{{ site.data.expertise.technologies.subtitle }}</h2>
<p class="block-sub-title mb-0">{{ site.data.expertise.technologies.title }}</p>
<img class="desktop-only" src="/assets/images/web_development_services/technologies_d_table.svg" alt="Technologies">
<img class="mobile-only" src="/assets/images/web_development_services/technologies_m_table.svg" alt="Technologies">
<div class="description text-justify">{{ site.data.expertise.technologies.description }}</div>
<p class="description text-justify">{{ site.data.expertise.technologies.description }}</p>
</div>
</div>

<div class="alabaster expertise__industries">
<div class="wrapper">
<div class="header-3">{{ site.data.expertise.industries.projects }}</div>
<div class="header-2">{{ site.data.expertise.industries.subtitle }}</div>
<div class="header-3">{{ site.data.expertise.industries.title }}</div>
<p class="block-cera-title">{{ site.data.expertise.industries.projects }}</p>
<p class="message inria-bold">{{ site.data.expertise.industries.subtitle }}</p>
<p class="block-sub-title">{{ site.data.expertise.industries.title }}</p>
</div>
<div class="carousel-scroll" >
<div class="carousel-scroll__scroller" data-scroll="scroller">
Expand Down Expand Up @@ -72,7 +71,7 @@ <h2 class="animate-visibility__title">{{ element.title }}</h2>

<div class="expertise__solutions info-container wrap">
<div class="wrapper">
<div class="header-2 white-text">{{ site.data.expertise.solutions.title }}</div>
<p class="message inria-bold white-text">{{ site.data.expertise.solutions.title }}</p>
<a href="/solutions" id="expertise-all-solutions" class="button white-text" data-link="transition">
{{ site.data.expertise.solutions.button }}
</a>
Expand All @@ -81,7 +80,7 @@ <h2 class="animate-visibility__title">{{ element.title }}</h2>

<div class="expertise__testimonials">
<div class="wrapper">
<div class="header-2">{{ site.data.expertise.testimonials.title }}</div>
<p class="message inria-bold">{{ site.data.expertise.testimonials.title }}</p>
</div>
{% include testimonials_carousel.html %}
<a id="about-read-testimonials" class="button" href="/reviews" data-link="transition">
Expand All @@ -91,7 +90,7 @@ <h2 class="animate-visibility__title">{{ element.title }}</h2>

<div class="expertise__tell-us wrap">
<div class="wrapper">
<div class="header-2 white-text">{{ site.data.expertise.tell-us.title }}</div>
<p class="block-cera-title white-text">{{ site.data.expertise.tell-us.title }}</p>
<a id="expertise-tell-us" class="button white-text" href="/contacts" data-link="transition">
{{ site.data.expertise.tell-us.button }}
</a>
Expand Down

0 comments on commit 0558e75

Please sign in to comment.