diff --git a/app/web/app.css b/app/web/app.css index 4476900..f365a74 100644 --- a/app/web/app.css +++ b/app/web/app.css @@ -185,11 +185,11 @@ a.header { color: white; text-decoration: none; } -a.footer, a.adInfo { +a.footer { color: #BFBFBF; text-decoration: none; } -a.footer:hover, a.adInfo:hover { +a.footer:hover { color: red; text-decoration: underline; } diff --git a/app/web/app.js b/app/web/app.js index f02ab1b..db54650 100644 --- a/app/web/app.js +++ b/app/web/app.js @@ -26,7 +26,7 @@ * Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org * * @author Jos de Jong, - * @date 2013-02-20 + * @date 2013-02-21 */ @@ -291,11 +291,11 @@ app.clearFile = function () { }; app.resize = function() { + var domMenu = document.getElementById('menu'); var domEditor = document.getElementById('jsoneditor'); var domFormatter = document.getElementById('jsonformatter'); var domSplitter = document.getElementById('splitter'); var domAd = document.getElementById('ad'); - var domAdInfo = document.getElementById('adInfo'); var width = window.innerWidth || document.body.offsetWidth || document.documentElement.offsetWidth; var height = window.innerHeight || document.body.offsetHeight || document.documentElement.offsetHeight; @@ -318,9 +318,13 @@ app.resize = function() { domEditor.style.width = Math.round(width - splitterLeft - splitterWidth - 1) + 'px'; } - // resize ad text - if (domAdInfo && domAd) { - var infoHeight = domAdInfo.clientHeight; - domAd.style.paddingTop = infoHeight + 'px'; + // align main menu with ads + if (domMenu) { + if (adWidth) { + domMenu.style.right = (15 + (adWidth + 15)) + 'px'; + } + else { + domMenu.style.right = 15 + 'px'; + } } }; diff --git a/app/web/index.html b/app/web/index.html index 1b840d0..7368dea 100644 --- a/app/web/index.html +++ b/app/web/index.html @@ -37,7 +37,7 @@ Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org @author Jos de Jong, - @date 2013-02-20 + @date 2013-02-21 --> diff --git a/changelog.txt b/changelog.txt index 4569763..ab6ece6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,7 @@ http://jsoneditoronline.org -## 2013-02-20, version 2.0.1 +## 2013-02-21, version 2.0.1 - Fixed undefined variable in the redo method. - Removed the "hide ads" button. Not allowed by Google AdSense, sorry. diff --git a/jsoneditor/js/module.js b/jsoneditor/js/module.js index 3a26b17..34a5a45 100644 --- a/jsoneditor/js/module.js +++ b/jsoneditor/js/module.js @@ -27,7 +27,7 @@ * Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org * * @author Jos de Jong, - * @date 2013-02-20 + * @date 2013-02-21 */ (function () {