Skip to content

Instantly share code, notes, and snippets.

@cedricdekimpe

cedricdekimpe/gist:688ef8c32e4a9fc28a2e8e5e7e527b3b

Created February 21, 2019 15:14
Show Gist options
  • Save cedricdekimpe/688ef8c32e4a9fc28a2e8e5e7e527b3b to your computer and use it in GitHub Desktop.
Save cedricdekimpe/688ef8c32e4a9fc28a2e8e5e7e527b3b to your computer and use it in GitHub Desktop.
Download ZIP
Fix roboto usage
Raw
gistfile1.txt
diff --git a/app/assets/javascripts/backbone/views/keywords/keywords_position_chart.js.coffee b/app/assets/javascripts/backbone/views/keywords/keywords_position_chart.js.coffee
index 46c4132f6..c13f62ae4 100644
--- a/app/assets/javascripts/backbone/views/keywords/keywords_position_chart.js.coffee
+++ b/app/assets/javascripts/backbone/views/keywords/keywords_position_chart.js.coffee
@@ -127,7 +127,7 @@ class Apptweak.Views.Keywords.KeywordsPositionChart extends Backbone.View
marginBottom: 70
backgroundColor: "#fff"
style:
- fontFamily: 'Robotolight, sans-serif'
+ fontFamily: 'Roboto, sans-serif'
events:
load: (event) ->
return false
diff --git a/app/assets/stylesheets/_override.scss b/app/assets/stylesheets/_override.scss
index 43402c4fa..b0c3ad4de 100644
--- a/app/assets/stylesheets/_override.scss
+++ b/app/assets/stylesheets/_override.scss
@@ -1,13 +1,13 @@
body {
background: $aptwk-bkg;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
@include fontsmoothing();
}
h1, h2, h3, h4, h5, h6 {
color: $aptwk-typo-dark;
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
&.subline{
- font-family: 'robotobold';
+ font-family: 'Roboto';
padding-bottom: 8px;
margin-bottom: 32px;
position: relative;
@@ -45,7 +45,7 @@ a {
}
}
label {
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
font-weight: normal;
}
.big-title{
@@ -303,7 +303,7 @@ body.home {
// Reset Bootstrap list groups
.list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus {
color: #333;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
}
.list-group-item {
// padding: 5px 10px;
@@ -791,7 +791,7 @@ body.home.modal-open{
}
.text-inverse {
color: #fff;
- font-family: robotoregular;
+ font-family: Roboto;
}
.text-uppercase {
text-transform: uppercase;
@@ -842,7 +842,7 @@ a.no-decoration {
}
}
.btn-xs {
- font-family: 'robotoregular';
+ font-family: 'Roboto';
-webkit-font-smoothing:subpixel-antialiased;
}
.btn-default {
@@ -1097,11 +1097,11 @@ input:checked + .slider:before {
span:last-child{
color: #333;
display: block;
- font-family: 'RobotoLight';
+ font-family: 'Roboto', sans-serif;
font-size: 14px;
}
span.score{
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
font-size: 90px;
line-height: 100px;
}
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index e730b1743..a4d9d15c0 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -107,10 +107,10 @@ $radius-card: 8px;
// TYPO
-$typo-light: "Robotolight", sans-serif;
-$typo-regular: "RobotoRegular", sans-serif;
-$typo-medium: "RobotoMedium", sans-serif;
-$typo-bold: "RobotoBold", sans-serif;
+$typo-light: "Roboto", sans-serif;
+$typo-regular: "Roboto", sans-serif;
+$typo-medium: "Roboto", sans-serif;
+$typo-bold: "Roboto", sans-serif;
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index ad2bae1cf..f9ed0f079 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -72,7 +72,7 @@ Wells
li {
a {
color: $typo-blue-grey-light;
- // font-family: 'RobotoLight';
+ // font-family: 'Roboto', sans-serif;
// font-size: 13px;
// text-transform: none;
padding: 8px 12px !important;
@@ -380,7 +380,7 @@ Wells
.aptwk-sorting-table {
border: 1px solid $aptwk-border-box-dark;
// border-top: 0 !important;
- font-family: 'RobotoLight';
+ font-family: 'Roboto', sans-serif;
// margin-top: -1px;
tr {
border:0 !important;
diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss
index caf587358..961c544de 100644
--- a/app/assets/stylesheets/pages.scss
+++ b/app/assets/stylesheets/pages.scss
@@ -163,7 +163,7 @@
h3 {
color: #666;
- font-family: 'robotobold';
+ font-family: 'Roboto';
@include fontsize(18);
@include lineheight(24);
}
@@ -1557,7 +1557,7 @@ body.dashboard-externalaccounts.setup {
color: $score-good;
}
#right-box {
- font-family:'robotolight';
+ font-family:'Roboto', sans-serif;
padding: 0 !important;
text-align: left;
ul {
@@ -1603,12 +1603,12 @@ body.dashboard-externalaccounts.setup {
}
h4 {
color:'#666';
- font-family:'robotolight';
+ font-family:'Roboto', sans-serif;
font-weight: normal;
font-size: 18px;
span, p {
color: $typo-blue-grey-light;
- font-family:'robotoregular';
+ font-family:'Roboto';
}
}
@media screen and (max-width: $sm-break) {
@@ -1706,7 +1706,7 @@ body.dashboard-externalaccounts.setup {
padding: 25px 0;
h4 {
color: $typo-blue-grey-light;
- font-family:'robotoregular';
+ font-family:'Roboto';
font-size: 16px;
font-weight: normal;
line-height: normal;
@@ -1775,7 +1775,7 @@ body.offboarding, body.offboardingcoupons {
.contentpanel {
background: #f8f8f8;
border: 0;
- // font-family: 'robotoregular';
+ // font-family: 'Roboto';
padding-top: 40px;
}
h4 {
@@ -1947,7 +1947,7 @@ body.offboarding, body.offboardingcoupons {
bottom: -25px;
.btn-info {
border: 0;
- font-family: 'robotolight' !important;
+ font-family: 'Roboto', sans-serif !important;
padding: 10px 15px;
opacity: 1 !important;
}
@@ -2055,7 +2055,7 @@ body.pricing {
position: absolute;
right: 15px;
z-index: 3;
- // font-family: 'robotolight' !important;
+ // font-family: 'Roboto', sans-serif !important;
&:hover {
background: darken($score-good, 5%) !important;
}
@@ -2159,7 +2159,7 @@ body.pricing {
border-bottom: 1px solid $border-grey-light;
}
& > div {
- // font-family: 'robotolight';
+ // font-family: 'Roboto', sans-serif;
font-size: 14px;
padding: 16px;
h2{
@@ -2207,7 +2207,7 @@ body.pricing {
}
strong {
color: $typo-grey-darker;
- font-family: 'robotoregular' !important;
+ font-family: 'Roboto' !important;
font-weight: 200 !important;
}
}
@@ -2486,7 +2486,7 @@ body.dashboard-plansubscriptions, body.pricing.private {
position: absolute;
right: 15px;
z-index: 3;
- // font-family: 'robotolight' !important;
+ // font-family: 'Roboto', sans-serif !important;
&:hover {
background: $smashed_strawberry !important;
color: #fff !important;
@@ -2513,7 +2513,7 @@ body.pricing.private {
}
}
#charge_now_modal {
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
h2 {
font-size: 20px;
margin-bottom: 0;
@@ -2551,7 +2551,7 @@ body.pricing {
position: absolute;
right: 15px;
z-index: 3;
- // font-family: 'robotolight' !important;
+ // font-family: 'Roboto', sans-serif !important;
&:hover {
background: darken($score-good, 5%) !important;
}
@@ -2651,7 +2651,7 @@ body.pricing {
border-bottom: 1px solid $border-grey-light;
}
& > div {
- // font-family: 'robotolight';
+ // font-family: 'Roboto', sans-serif;
font-size: 13px;
padding: 16px;
h2{
@@ -2700,7 +2700,7 @@ body.pricing {
}
strong {
color: $typo-grey-darker;
- font-family: 'robotoregular' !important;
+ font-family: 'Roboto' !important;
font-weight: 200 !important;
}
}
@@ -2964,7 +2964,7 @@ body.dashboard-plansubscriptions, body.pricing.private {
position: absolute;
right: 15px;
z-index: 3;
- // font-family: 'robotolight' !important;
+ // font-family: 'Roboto', sans-serif !important;
&:hover {
background: $smashed_strawberry !important;
color: #fff !important;
@@ -2991,7 +2991,7 @@ body.pricing.private {
}
}
#charge_now_modal {
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
h2 {
font-size: 20px;
margin-bottom: 0;
@@ -3394,7 +3394,7 @@ body.frameless.subscriptions{
border: 1px solid $border-grey-light;
}
#selected-plan-recap-name {
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-size: 20px;
}
#due-today{
@@ -3405,7 +3405,7 @@ body.frameless.subscriptions{
font-size: 1.3em;
// padding: 18px 12px;
& > span{
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-size: 20px;
}
small {
@@ -3495,7 +3495,7 @@ body.frameless.subscriptions{
margin: auto;
}
.list-group-item {
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif;
&.active {
background: #f8f8f8;
padding: 12px 12px;
diff --git a/app/assets/stylesheets/react-components.scss b/app/assets/stylesheets/react-components.scss
index 9a2ea7be5..59f2cb7c1 100644
--- a/app/assets/stylesheets/react-components.scss
+++ b/app/assets/stylesheets/react-components.scss
@@ -326,7 +326,7 @@
.aptwk_checkbox_hint {
margin: 0 5px;
font-size: 12px;
- font-family: "robotobold";
+ font-family: "Roboto";
background: #adbbd4;
color: white;
padding: 5px 8px;
@@ -382,7 +382,7 @@
padding-left: 15px;
text-transform: uppercase;
font-size: 12px;
- font-family: "robotobold";
+ font-family: "Roboto";
display: none;
}
@@ -418,7 +418,7 @@
padding: 10px 0px;
width: 35px;
text-align: center;
- font-family: "robotolight";
+ font-family: 'Roboto', sans-serif;
}
.aptwk_tl_tc_grid_header--month{
@@ -434,7 +434,7 @@
font-size: 12px;
padding-left: 15px;
margin: 0;
- font-family: "robotobold";
+ font-family: "Roboto";
}
}
}
@@ -578,18 +578,18 @@
text-transform: uppercase;
font-size: 12px;
margin-bottom: 5px;
- font-family: "robotobold";
+ font-family: "Roboto";
& + h4 {
font-size: 18px;
font-weight: 300;
- font-family: "robotolight";
+ font-family: 'Roboto', sans-serif;
}
& + p {
font-size: 16px;
line-height: 1.4;
- font-family: "robotolight";
+ font-family: 'Roboto', sans-serif;
}
}
}
@@ -687,7 +687,7 @@ div[id^="aptwk_tl_popover"]{
display: flex;
align-items: center;
border-bottom: 1px solid $aptwk-border-box;
- font-family: "robotobold";
+ font-family: "Roboto";
.aptwk_tl_history_header_left, .aptwk_tl_history_header_right {
padding: 15px;
@@ -713,7 +713,7 @@ div[id^="aptwk_tl_popover"]{
text-transform: uppercase;
font-size: 12px;
margin-bottom: 5px;
- font-family: "robotobold";
+ font-family: "Roboto";
padding-left: 15px;
padding-bottom: 0;
margin-bottom: 0;
@@ -776,7 +776,7 @@ div[id^="aptwk_tl_popover"]{
text-transform: uppercase;
font-size: 12px;
margin-bottom: 15px;
- font-family: "robotobold";
+ font-family: "Roboto";
font-weight: 400;
}
@@ -810,7 +810,7 @@ div[id^="aptwk_tl_popover"]{
border-radius: 50px;
width: 125px;
overflow: hidden;
- font-family: "robotobold";
+ font-family: "Roboto";
& input ~ span{
color: white;
@@ -860,7 +860,7 @@ div[id^="aptwk_tl_popover"]{
font-size: 12px;
padding-left: 20px;
margin: 0;
- font-family: "robotobold";
+ font-family: "Roboto";
}
li{
diff --git a/app/assets/stylesheets/report.scss b/app/assets/stylesheets/report.scss
index 055c19d9f..905a66760 100644
--- a/app/assets/stylesheets/report.scss
+++ b/app/assets/stylesheets/report.scss
@@ -170,7 +170,7 @@ img {
}
.profile-meta {
color: #333;
- font-family: 'RobotoLight';
+ font-family: 'Roboto', sans-serif';
font-size: 15px;
.fa {
font-size: 16px;
@@ -257,7 +257,7 @@ img {
padding: 0;
}
h3 {
- font-family: "RobotoLight";
+ font-family: 'Roboto', sans-serif";
font-size: 14px;
margin: 0;
overflow:hidden;
@@ -271,7 +271,7 @@ img {
background: grey;
border: 1px solid grey;
color: #fff;
- font-family: "RobotoLight";
+ font-family: 'Roboto', sans-serif";
font-size: 12px;
height: 20px;
padding: 0 8px 0 6px;
@@ -540,13 +540,13 @@ body.itunes-reports, body.google-reports {
th, td {
background: #fff;
padding: 6px 16px;
- font-family: 'robotolight';
+ font-family: 'Roboto', sans-serif';
font-size: 14px;
}
th {
background: #f3f3f3;
border-bottom: 1px solid #ddd;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-size: 13px;
}
diff --git a/app/assets/stylesheets/roboto.css b/app/assets/stylesheets/roboto.css
index f23dcb241..1fc70d1a0 100755
--- a/app/assets/stylesheets/roboto.css
+++ b/app/assets/stylesheets/roboto.css
@@ -1,36 +1 @@
-@font-face {
- font-family: 'RobotoRegular';
- src: url('roboto-regular.eot');
- src: url('roboto-regular.eot?#iefix') format('embedded-opentype'),
- url('roboto-regular.woff') format('woff'),
- url('roboto-regular.ttf') format('truetype'),
- url('roboto-regular.svg#RobotoRegular') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-@font-face {
- font-family: 'RobotoBold';
- src: url('roboto-bold.eot');
- src: url('roboto-bold.eot?#iefix') format('embedded-opentype'),
- url('roboto-bold.woff') format('woff'),
- url('roboto-bold.ttf') format('truetype'),
- url('roboto-bold.svg#RobotoBold') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-
-@font-face {
- font-family: 'RobotoLight';
- src: url('roboto-light.eot');
- src: url('roboto-light.eot?#iefix') format('embedded-opentype'),
- url('roboto-light.woff') format('woff'),
- url('roboto-light.ttf') format('truetype'),
- url('roboto-light.svg#RobotoLight') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
\ No newline at end of file
+@import url('https://fonts.googleapis.com/css?family=Roboto');
diff --git a/app/assets/stylesheets/sections.scss b/app/assets/stylesheets/sections.scss
index 3f88b5d77..9010cdab0 100644
--- a/app/assets/stylesheets/sections.scss
+++ b/app/assets/stylesheets/sections.scss
@@ -163,7 +163,7 @@ img {
}
.profile-meta {
color: #333;
- font-family: 'RobotoLight';
+ font-family: 'Roboto';
font-size: 15px;
.fa {
font-size: 16px;
@@ -250,7 +250,7 @@ img {
padding: 0;
}
h3 {
- font-family: "RobotoLight";
+ font-family: "Roboto";
font-size: 14px;
margin: 0;
overflow:hidden;
@@ -264,7 +264,7 @@ img {
background: grey;
border: 1px solid grey;
color: #fff;
- font-family: "RobotoLight";
+ font-family: "Roboto";
font-size: 12px;
height: 20px;
padding: 0 8px 0 6px;
@@ -516,13 +516,13 @@ body.itunes-reports, body.google-reports {
th, td {
background: #fff;
padding: 6px 16px;
- font-family: 'robotolight';
+ font-family: 'Roboto';
font-size: 14px;
}
th {
background: #f3f3f3;
border-bottom: 1px solid #ddd;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-size: 13px;
}
@@ -940,7 +940,7 @@ div.data-placeholder{
padding-left:0 !important;
a {
border-radius: 4px;
- font-family: 'robotoregular' !important;
+ font-family: 'Roboto' !important;
font-style: 13px;
padding: 2px 12px;
@include transition(background .4s ease);
@@ -999,7 +999,7 @@ div.data-placeholder{
height: 24px;
border-radius: 0 4px 4px 0;
background: inherit;
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
line-height: 24px;
font-size: 13px;
position: absolute;
@@ -1037,7 +1037,7 @@ div.data-placeholder{
padding: 0 16px;
margin: 0 3px 6px 0;
position: relative;
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
font-size: 13px;
line-height: 24px;
}
@@ -1143,7 +1143,7 @@ div.data-placeholder{
width: 34px;
height: 24px;
border-radius: 0 4px 4px 0;
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
line-height: 24px;
text-align: center;
font-size: 12px;
@@ -1174,7 +1174,7 @@ div.data-placeholder{
width: 49px;
height: 24px;
border-radius: 0 4px 4px 0;
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
line-height: 24px;
text-align: center;
font-size: 12px;
@@ -1215,7 +1215,7 @@ div.data-placeholder{
.alert {
background: #f8f8f8;
color: #777;
- font-family: 'Robotolight';
+ font-family: 'Roboto';
font-size: 16px;
border: 1px solid #dedede;
margin: 0;
@@ -1328,7 +1328,7 @@ div.data-placeholder{
a.label{
background-color: $aptwk-keyword;
display:inline-block;
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
font-size: 13px;
margin: 0 5px 5px 0;
padding: 6px 8px;
@@ -1399,7 +1399,7 @@ div.data-placeholder{
position: relative;
text-align: left;
.delta {
- font-family:'robotolight';
+ font-family:'Roboto';
font-size: 10px;
width: 22px;
height: 22px;
@@ -1492,7 +1492,7 @@ div.data-placeholder{
padding: 2px 8px;
margin-right: 5px;
margin-top: 3px;
- font-family: 'robotolight';
+ font-family: 'Roboto';
font-size: 10px;
background: #8ec7fc;
}
@@ -1854,13 +1854,13 @@ table {
.bidding-kw-count {
color: #42A1FF;
cursor: pointer;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-weight: normal;
}
.bidding-kw {
color: #56C0DD;
cursor: none;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-weight: normal;
display: inline-block;
overflow: hidden;
@@ -1920,7 +1920,7 @@ table {
text-overflow: ellipsis;
max-width: 90%;
span {
- font-family: 'robotobold';
+ font-family: 'Roboto';
}
}
}
@@ -2253,7 +2253,7 @@ $primary-color-red-dark: #E14F41;
top: 0;
width: 2.6em;
line-height: 2.6em;
- font-family: 'robotolight';
+ font-family: 'Roboto';
font-size: 0.4em;
font-weight: 200;
color: #333;
@@ -2549,7 +2549,7 @@ body.itunes-searchadsintelligence {
font-size: 18px;
// margin: 10px 0;
display: inline-block;
- // font-family: 'RobotoLight';
+ // font-family: 'Roboto';
color: #333;
}
.progression-icon:before {
@@ -2870,7 +2870,7 @@ body.itunes-searchadsintelligence {
}
th {
// color: #666 !important;
- // font-family: 'robotolight' !important;
+ // font-family: 'Roboto' !important;
// font-size: 12px !important;
// padding: 10px 30px 10px 20px !important;
position: relative;
@@ -2914,7 +2914,7 @@ body.itunes-searchadsintelligence {
&.sov, &.other_sov {
color: #6e727b;
font-size: 85%;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
img {
border: 1px solid #ddd;
border-radius: 2px;
@@ -2923,12 +2923,12 @@ body.itunes-searchadsintelligence {
}
.application_sov {
display: inline-block;
- // font-family: 'robotoregular';
+ // font-family: 'Roboto';
width: 30px;
}
.badge {
color: #fff;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
background: #59c1de;
font-size: 12px;
height: 30px;
@@ -2965,7 +2965,7 @@ body.itunes-searchadsintelligence {
}
a {
color: #56C0DD;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
}
}
.campaign_analysis_pagination {
@@ -2998,7 +2998,7 @@ body.itunes-searchadsintelligence {
border: 1px solid #ddd;
border-bottom: 0;
color: #333;
- font-family: 'robotoregular';
+ font-family: 'Roboto';
font-size: 14px;
margin: 0;
padding: 8px 0 8px 15px;
@@ -3034,7 +3034,7 @@ body.itunes-searchadsintelligence {
// transition: all 300ms ease;
span, a {
display: none;
- font-family: 'robotolight';
+ font-family: 'Roboto';
font-size: 13px;
}
img {
@@ -3123,7 +3123,7 @@ body.itunes-searchadsintelligence {
.keyword-label {
padding: 0;
a {
- font-family: 'Robotolight', sans-serif;
+ font-family: 'Roboto', sans-serif;
font-size: 13px;
line-height: 24px;
background: rgba(126,198,223,.8);
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 56b05e4f1..0fd4fd658 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -6,7 +6,7 @@
}
// Main toast
.jq-toast-resume{
- font-family: "robotoregular";
+ font-family: "Roboto";
background: #fff;
position: fixed;
bottom: 10px;
@@ -93,7 +93,7 @@
// Single Toasts
.jq-toast-single{
- font-family: "robotoregular";
+ font-family: "Roboto";
background: #fff;
color: #333 !important;
border: 1px solid #e2e7ec;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment