Discource-C
/
discourse-adplugin
mirror of https://github.com/discourse/discourse-adplugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run Prettier

This commit is contained in:
Penar Musaraj 2019-06-14 13:24:55 -04:00
parent 203e14b639
commit 574500ba08
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse/components/carbonads-ad.js.es6
View File

@ -1,7 +1,5 @@
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
import { import { default as computed } from "ember-addons/ember-computed-decorators";
default as computed
} from "ember-addons/ember-computed-decorators";
const serve_id = Discourse.SiteSettings.carbonads_serve_id, const serve_id = Discourse.SiteSettings.carbonads_serve_id,
placement = Discourse.SiteSettings.carbonads_placement; placement = Discourse.SiteSettings.carbonads_placement;

8
assets/javascripts/discourse/components/google-dfp-ad.js.es6
View File

@ -44,10 +44,7 @@ function keyParse(word) {
function custom_targeting(key_array, value_array, adSlot) { function custom_targeting(key_array, value_array, adSlot) {
for (var i = 0; i < key_array.length; i++) { for (var i = 0; i < key_array.length; i++) {
if (key_array[i]) { if (key_array[i]) {
adSlot.setTargeting( adSlot.setTargeting(key_array[i], valueParse(value_array[i]));
key_array[i],
valueParse(value_array[i])
);
} }
} }
} }
@ -139,8 +136,7 @@ function defineSlot(divId, placement, settings, isMobile, categoryTarget) {
config = DESKTOP_SETTINGS[placement]; config = DESKTOP_SETTINGS[placement];
} }
ad = window.googletag ad = window.googletag.defineSlot(
.defineSlot(
"/" + settings.dfp_publisher_id + "/" + settings[config.code], "/" + settings.dfp_publisher_id + "/" + settings[config.code],
[size.width, size.height], [size.width, size.height],
divId divId

17
assets/stylesheets/adplugin.scss
View File

@ -41,7 +41,7 @@
color: #858a8c; color: #858a8c;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal; font-weight: normal;
} }
@ -54,8 +54,7 @@
padding: 0 11px; padding: 0 11px;
} }
@media all @media all and (max-width: 775px) {
and (max-width : 775px) {
.google-adsense.adsense-post-bottom { .google-adsense.adsense-post-bottom {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
@ -82,7 +81,7 @@ and (max-width : 775px) {
color: #858a8c; color: #858a8c;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal; font-weight: normal;
} }
@ -96,12 +95,13 @@ and (max-width : 775px) {
color: #858a8c; color: #858a8c;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal; font-weight: normal;
} }
.google-dfp-ad.dfp-ad-post-bottom { .google-dfp-ad.dfp-ad-post-bottom {
.google-dfp-ad-label, .dfp-ad-unit { .google-dfp-ad-label,
.dfp-ad-unit {
margin: 0 0 0 52px; margin: 0 0 0 52px;
} }
} }
@ -225,7 +225,7 @@ and (max-width : 775px) {
right: 0; // You can also set the position to the "left" with the value of calc(130px + carbon-text’s font size). If the font-size is 12px, you’ll want to set the left value as 142px. It’ll align the .carbon-text with .carbon-poweredby right: 0; // You can also set the position to the "left" with the value of calc(130px + carbon-text’s font size). If the font-size is 12px, you’ll want to set the left value as 142px. It’ll align the .carbon-text with .carbon-poweredby
bottom: 0; bottom: 0;
display: block; display: block;
font-size: .8em; font-size: 0.8em;
text-transform: uppercase; text-transform: uppercase;
line-height: 1; line-height: 1;
letter-spacing: 1px; letter-spacing: 1px;
@ -252,7 +252,8 @@ and (max-width : 775px) {
font-size: $font-down-1; font-size: $font-down-1;
clear: both; clear: both;
} }
.house-ads-chooser, .house-ads-text-input { .house-ads-chooser,
.house-ads-text-input {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }