Merge remote-tracking branch 'origin/ticket/10824' into devel

This commit is contained in:
PLESK5 2016-09-07 11:32:26 +02:00
commit 881d320c59
3 changed files with 18 additions and 3 deletions

View File

@ -78,6 +78,21 @@
font-style: normal;
}
@font-face {
font-family: 'Whatever it takes';
src: url('../font/whatever/whatever-it-takes.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Whatever it takes';
src: url('../font/whatever/whatever-it-takes-bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@ -8036,7 +8051,6 @@ padding: 10px 14px;
}
/************************************/
/************************************
#10762
*************************************/
@ -8044,7 +8058,6 @@ padding: 10px 14px;
.current_sales .carrier_discount_ctn {
width: 100%;
height: 38px;
font-size: 18px;
margin: 10px 0 10px 0;
background: rgba(0, 0, 0, 0) url("../img/bg_carrier_discount.png") repeat-x scroll left top
}
@ -8058,10 +8071,12 @@ padding: 10px 14px;
}
.current_sales .carrier_discount_ctn p span {
font-family: Journal;
font-family: "Whatever it takes";
font-size: 22px;
margin-left: 5px;
}
.current_sales .carrier_discount_ctn p {
font-family: BrandonGrotesque;
}
/************************************/

Binary file not shown.

Binary file not shown.