Skip to content

Commit

Permalink
Merge branch 'release/5.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@woneob
woneob committed Apr 7, 2015
2 parents 008889e + 0dbd9ea commit 257e04f
Show file tree
Hide file tree
Showing 10 changed files with 123 additions and 103 deletions.
2 changes: 1 addition & 1 deletion css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ td.D11 font {position:relative;margin-right:5px;}
td.D11 img {vertical-align:middle;}
font[color="666666"] {position:relative;}
/* user information */
div[id^="nik_"] {top:0;width:60px !important;background:#fff;margin:20px 0 0 !important;padding:5px 8px;font:normal 11px Dotum, '돋움', sans-serif;letter-spacing:-1px;color:#666;border-width:1px !important;box-shadow:1px 1px 1px rgba(0,0,0,.1);border-radius:3px;}
div[id^="nik_"] {top:0;left:0;width:60px !important;background:#fff;margin:20px 0 0 !important;padding:5px 8px;font:normal 11px Dotum, '돋움', sans-serif;letter-spacing:-1px;color:#666;border-width:1px !important;box-shadow:1px 1px 1px rgba(0,0,0,.1);border-radius:3px;}
div[id^="nik_"] ul {margin:0;padding:0;}
div[id^="nik_"] li {list-style:none;padding:2px 0 !important;cursor:pointer;}
div[id^="nik_"] li:hover {color:#111;}
Expand Down
15 changes: 7 additions & 8 deletions css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/* headline --------------------- */
.heardline {box-sizing:border-box;width:100% !important;height:auto !important;margin-bottom:10px;overflow:hidden;border-color:#cdcdcd;}
.heardline .tit_photo .txt {border:0 !important;}
.heardline .tit_photo .txt span {display:-webkit-box !important;height:auto !important;-webkit-line-clamp:2;-webkit-box-orient:vertical;text-overflow:ellipsis;}
.heardline ul {padding-left:416px !important;}
.heardline ul li {width:100% !important;}
.heardline ul li:last-child {margin-bottom:0 !important;}
Expand All @@ -16,11 +17,11 @@
.heardline ul li .txt {display:block !important;width:auto !important;padding:3px 0 0 103px !important;vertical-align:middle;}

.heardline ul li .txt strong {display:block !important;}
.heardline ul li .txt strong a {white-space:nowrap;text-overflow:ellipsis;font-size:14px;color:#555;}
.heardline ul li .txt strong a {display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:14px;color:#555;}
.heardline ul li .txt .s_font {display: -webkit-box;width:auto !important;white-space:normal !important;text-overflow:clip !important;-webkit-line-clamp:3;word-wrap:break-word;-webkit-box-orient: vertical;color:#888;}

/* article box --------------------- */
.article_box {position:relative;height:306px;box-sizing:border-box;width:560px !important;float:right;border-width:1px !important;margin-bottom:10px;}
.article_box {position:relative;height:328px;box-sizing:border-box;width:560px !important;float:right;border-width:1px !important;margin-bottom:10px;}
.article_box .highlight_poll {box-sizing:border-box;float:none !important;width:auto !important;border:none !important;background:transparent !important;}
.article_box .highlight_poll h3 {padding:12px 0 8px 16px !important;}
.article_box .highlight_poll .video {margin-bottom:10px;padding:0 15px;}
Expand All @@ -35,11 +36,10 @@
.article_box .highlight_poll iframe {display:none;}
.article_box .news_cont {box-sizing:border-box;position:relative;width:auto !important;padding: 0 0 0 10px !important;}
/* news list */
.article_box .news_cont .news_list {position:absolute !important;width:310px !important;height:155px !important;top:150px;border-bottom:none !important;}
.article_box .news_cont .news_list {position:absolute !important;width:310px !important;height:155px !important;top:156px;border-bottom:none !important;}
.article_box .news_cont .news_list h3 {padding:12px 0 6px !important;border-bottom:1px solid #e3e3e3;margin-bottom:8px;}
.article_box .news_cont .news_list .view {top:13px !important;right:0;font-family:Dotum, '돋움', sans-serif;}
.article_box .news_cont .news_list ul li {margin-bottom:3px !important;background:none !important;padding-left:0 !important;}
.article_box .news_cont .news_list ul li:nth-child(n+6) {display:none;}
.article_box .news_cont .news_list ul li a {display:inline !important;width:auto !important;}
.article_box .news_cont .news_list ul li:first-child a {font-weight:bold !important;}
.article_box .news_cont .news_list .id,
Expand All @@ -50,9 +50,8 @@
.article_box .news_cont .notice ul li {background:none !important;margin-bottom:4px !important;padding-left:0 !important;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
.article_box .news_cont .notice ul li a, .article_box .news_cont .notice ul li a b {font-weight:normal !important;}
.article_box .news_cont .notice ul li:first-child a, .article_box .news_cont .notice ul li:first-child a b {font-weight:bold !important;}
.article_box .news_cont .notice ul li:nth-child(n+6) {display:none;}
/* sidebar --------------------- */
#main_content .right_cont {box-sizing:border-box;width:230px !important;height:306px;position:absolute;top:330px;right:0;border-left:1px solid #e3e3e3;border-right:1px solid #e3e3e3;}
#main_content .right_cont {box-sizing:border-box;width:230px !important;height:328px;position:absolute;top:330px;right:0;border-left:1px solid #e3e3e3;border-right:1px solid #e3e3e3;}
/* login box */
.login_box {width:100% !important;height:auto !important;background:none !important;margin-bottom:15px;padding:0 !important;border:none !important;}
.login_box h3 {background:none !important;padding:13px 0 7px 10px !important;}
Expand All @@ -79,7 +78,7 @@
#score_tab li.tab2 a {top:0;right:0;}
#score_tab li a.selected {z-index:2;background:#fff;border-bottom:none;color:#4a4a4a;font-weight:bold;}
#score_tab li a:hover {text-decoration:none;}
#score_rank {height:268px;padding-top:5px;border:1px solid #ddd;border-top:none;}
#score_rank {height:290px;padding-top:5px;border:1px solid #ddd;border-top:none;}
#score_rank table, #score_result table {width:100% !important;font:11px Dotum, '돋움', sans-serif;cursor:default;}
#score_rank table td, #score_result td {color:#666;}
#score_rank td[width="15"] {width:8px !important;}
Expand All @@ -98,7 +97,7 @@
#score_rank table[width="100%"] tr[height='4'] {display:none;}
#score_rank table[width="100%"] tr.redText td {color:#e60e1f;}
#score_rank table[width="100%"] td[width="20"] {width:26px !important;}
#score_result {height:268px;padding-top:5px;border:1px solid #ddd;border-top:none;}
#score_result {height:290px;padding-top:5px;border:1px solid #ddd;border-top:none;}
#score_result td[width="15"] {width:10px !important;}
#score_result td[width="9"] {width:10px !important;}
#score_result .resultBoard table[width="100%"] {border-bottom:1px solid #ddd;}
Expand Down
3 changes: 2 additions & 1 deletion css/mbs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ form[name="writeForm"] td[width="56"] a[href^="javascript:startRequest"] {displa
.blockTitle:before {display:none !important;}

/* team */
#team_show .G12read {padding-left:54px;}
.team_show .G12read {padding-left:54px;}
.G12read .teamIcon {position:absolute;display:inline-block;margin:1px 0 0 -54px;width:48px;height:17px;overflow:hidden;background:url('chrome-extension://__MSG_@@extension_id__/images/team.png') no-repeat;cursor:pointer;}
.G12read .teamIcon:hover {opacity:.8;}
.teamIcon[data-team="nexen"] {background-position:0 -17px !important;}
Expand All @@ -171,6 +171,7 @@ form[name="writeForm"] td[width="56"] a[href^="javascript:startRequest"] {displa
.teamIcon[data-team="lg"] {background-position:0 -102px !important;}
.teamIcon[data-team="hanwha"] {background-position:0 -119px !important;}
.teamIcon[data-team="nc"] {background-position:0 -136px !important;}
.teamIcon[data-team="kt"] {background-position:0 -153px !important;}

/* extra */
.warnBtn {position:relative;top:-20px;display:inline-block;background:#fff;padding:6px 10px 5px;color:#555;font:12px 'Gulim';cursor:pointer;border-width:1px;border-style:solid;border-color:#e7e7e7 #c3c3c3 #bfbfbf #d8d8d8;box-shadow:1px 1px 1px rgba(0,0,0,.1);border-radius:5px;}
Expand Down
Binary file modified images/team.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 19 additions & 22 deletions javascripts/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,24 @@ chrome.extension.sendMessage({action:'width'}, function(response) {
}
});

(function($, doc) {
//user toolbox remove
doc.onclick = function(){
var userMenu = doc.querySelectorAll('div[id^="nik_"]');
for (var i = 0, userMenuLen = userMenu.length; i < userMenuLen; i++){
userMenu[i].style.display = 'none';
}
};
//user toolbox remove
doc.addEventListener('click', function(){
var userMenu = doc.querySelectorAll('div[id^="nik_"]');
for (var i = 0, userMenuLen = userMenu.length; i < userMenuLen; i++){
userMenu[i].style.display = 'none';
}
}, false);

$(doc).ready(function() {
// Remove AD-Wrapper
var adContainer = doc.querySelectorAll('.ad_left_w,.ad_left_w2,.ad_right_w');
for (var i = 0, adContainerLen = adContainer.length; i < adContainerLen; i++){
adContainer[i].innerHTML = '';
}
doc.addEventListener('DOMContentLoaded', function(){
// Remove AD-Wrapper
var adContainer = doc.querySelectorAll('.ad_left_w,.ad_left_w2,.ad_right_w');
for (var i = 0, adContainerLen = adContainer.length; i < adContainerLen; i++){
adContainer[i].innerHTML = '';
}

// Remove Ad-Frame
var adFrame = doc.querySelectorAll('iframe[src*="donga.com"], #ADhead1');
for (var i = 0, adFrameLen = adFrame.length; i < adFrameLen; i++){
var t = adFrame[i];
t.parentNode.removeChild(t);
}
});
})(jQuery, document);
// Remove Ad-Frame
var adFrame = doc.querySelectorAll('iframe[src*="donga.com"], #ADhead1');
for (var i = 0, adFrameLen = adFrame.length; i < adFrameLen; i++){
adFrame[i].remove();
}
}, false);
26 changes: 17 additions & 9 deletions javascripts/common_idle.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
(function($, win, doc) {
function getCookie(name) {
var nameOfCookie = name + "=";
var nameOfCookie = name + '=';
var x = 0;

while ( x <= doc.cookie.length ) {
while (x <= doc.cookie.length) {
var y = (x+nameOfCookie.length);
if ( doc.cookie.substring( x, y ) == nameOfCookie ) {
if ( (endOfCookie=doc.cookie.indexOf( ";", y )) == -1 )
if (doc.cookie.substring(x, y) == nameOfCookie) {
if ((endOfCookie=doc.cookie.indexOf(';', y)) == -1) {
endOfCookie = doc.cookie.length;
return unescape( doc.cookie.substring( y, endOfCookie ) );
}

return unescape(doc.cookie.substring(y, endOfCookie));
}

x = doc.cookie.indexOf(' ', x) + 1;

if (x == 0) {
break;
}
x = doc.cookie.indexOf( " ", x ) + 1;
if ( x == 0 ) break;
}
return "";

return '';
}

if (win.location.pathname !== '/mbs/commentV.php') {
var loginArea = doc.getElementById('loginArea');
var loginStatus = loginArea.firstElementChild.textContent;

if (loginStatus === '로그아웃'){
var userId = getCookie('dongauserid');
$.ajax({
Expand All @@ -27,7 +35,7 @@
dataType: 'html',
cache: false,
success: function(response) {
if (!(response.indexOf('정상적인 접근이 아닙니다') >= 0)){
if (!(response.indexOf('정상적인 접근이 아닙니다') >= 0)) {
var responseWrapper = $('<div />').append(response.replace(/<script(.|\s)*?\/script>/g, ''));
from = responseWrapper.find('tr:first-child td[height="25"] strong').text();
text = responseWrapper.find('textarea').text();
Expand Down
Loading

0 comments on commit 257e04f

Please sign in to comment.