Commit bbed46a2 authored by Agami4's avatar Agami4
Browse files

Merge branch '1.3.x' of https://git.drupalcode.org/project/socialblue into...

Merge branch '1.3.x' of https://git.drupalcode.org/project/socialblue into bugfix/3228273-region-content-position-group-translate-page
parents 7522ad98 9dd33c20
@font-face {
font-family: 'montserrat';
src: url("../font/montserrat/montserrat-light.eot") format('embedded-opentype'),
url("../font/montserrat/montserrat-light.woff2") format('woff2'),
url("../font/montserrat/montserrat-light.woff") format('woff'),
url("../font/montserrat/montserrat-light.ttf") format('truetype'),
url("../font/montserrat/montserrat-light.svg") format('svg');
src: url("../font/montserrat/montserrat-light.eot");
src: url("../font/montserrat/montserrat-light.eot") format("embedded-opentype"), url("../font/montserrat/montserrat-light.woff2") format("woff2"), url("../font/montserrat/montserrat-light.woff") format("woff"), url("../font/montserrat/montserrat-light.ttf") format("truetype"), url("../font/montserrat/montserrat-light.svg#montserrat-light") format("svg");
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'montserrat';
src: url("../font/montserrat/montserrat-normal.eot") format('embedded-opentype'),
url("../font/montserrat/montserrat-normal.woff2") format('woff2'),
url("../font/montserrat/montserrat-normal.woff") format('woff'),
url("../font/montserrat/montserrat-normal.ttf") format('truetype'),
url("../font/montserrat/montserrat-normal.svg") format('svg');
src: url("../font/montserrat/montserrat-normal.eot");
src: url("../font/montserrat/montserrat-normal.eot") format("embedded-opentype"), url("../font/montserrat/montserrat-normal.woff2") format("woff2"), url("../font/montserrat/montserrat-normal.woff") format("woff"), url("../font/montserrat/montserrat-normal.ttf") format("truetype"), url("../font/montserrat/montserrat-normal.svg#montserrat-normal") format("svg");
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'montserrat';
src: url("../font/montserrat/montserrat-medium.eot");
src: url("../font/montserrat/montserrat-medium.eot") format("embedded-opentype"), url("../font/montserrat/montserrat-medium.woff2") format("woff2"), url("../font/montserrat/montserrat-medium.woff") format("woff"), url("../font/montserrat/montserrat-medium.ttf") format("truetype"), url("../font/montserrat/montserrat-medium.svg#montserrat-medium") format("svg");
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'montserrat';
src: url("../font/montserrat/montserrat-bold.eot") format('embedded-opentype'),
url("../font/montserrat/montserrat-bold.woff2") format('woff2'),
url("../font/montserrat/montserrat-bold.woff") format('woff'),
url("../font/montserrat/montserrat-bold.ttf") format('truetype'),
url("../font/montserrat/montserrat-bold.svg") format('svg');
src: url("../font/montserrat/montserrat-bold.eot");
src: url("../font/montserrat/montserrat-bold.eot") format("embedded-opentype"), url("../font/montserrat/montserrat-bold.woff2") format("woff2"), url("../font/montserrat/montserrat-bold.woff") format("woff"), url("../font/montserrat/montserrat-bold.ttf") format("truetype"), url("../font/montserrat/montserrat-bold.svg#montserrat-bold") format("svg");
font-weight: 700;
font-style: normal;
}
......@@ -48,7 +47,8 @@ kbd {
color: #fff;
background-color: #333;
border-radius: 3px;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
}
pre {
......
......@@ -7,9 +7,9 @@ Created by FontForge 20190801 at Tue Oct 31 14:58:16 2017
Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
</metadata>
<defs>
<font id="montserratbold" horiz-adv-x="0" >
<font id="MontserratBold" horiz-adv-x="0" >
<font-face
font-family="montserratbold"
font-family="MontserratBold"
font-weight="700"
font-stretch="normal"
units-per-em="1000"
......@@ -7,9 +7,9 @@ Created by FontForge 20190801 at Tue Oct 31 14:58:11 2017
Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
</metadata>
<defs>
<font id="montserratlight" horiz-adv-x="0" >
<font id="MontserratLight" horiz-adv-x="0" >
<font-face
font-family="montserratlight"
font-family="MontserratLight"
font-weight="300"
font-stretch="normal"
units-per-em="1000"
This diff is collapsed.
......@@ -7,9 +7,9 @@ Created by FontForge 20190801 at Tue Oct 31 14:58:12 2017
Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
</metadata>
<defs>
<font id="montserratnormal" horiz-adv-x="0" >
<font id="MontserratRegular" horiz-adv-x="0" >
<font-face
font-family="montserratnormal"
font-family="MontserratRegular"
font-weight="400"
font-stretch="normal"
units-per-em="1000"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment