Skip to content

Commit

Permalink
maythirty
Browse files Browse the repository at this point in the history
  • Loading branch information
@kotran88
kotran88 committed May 30, 2017
2 parents 37537a5 + 9a948a6 commit 29fb501
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 87 deletions.
188 changes: 102 additions & 86 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,105 +1,121 @@
<!DOCTYPE html>
<html>

<head>

<meta name="viewport" content="width=device-width, initial-scale1=1.0">
<link rel="stylesheet" href="./css/timeline-css.css">
<link rel="stylesheet" href="./css/base.css">
<link rel="stylesheet" href="./css/feature-list.css">
<meta charset="utf-8">
<meta name="viewport" content="user-scalable=no,width=device-width"/>
<title>test</title>
<script type="text/javascript" src="https://openapi.map.naver.com/openapi/v3/maps.js?clientId=uDg8DaCVRq5KnivRwm3z"></script>
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="./css/common.css">
<link rel="stylesheet" type="text/css" media="screen and (max-width:799px)" href="./css/mobile.css">
<link rel="stylesheet" type="text/css" media="screen and (min-width:800px)" href="./css/desktop.css">
</head>
<title>title</title>
<script>
window.fbAsyncInit = function() {
FB.init({
appId : '454315694916758',
autoLogAppEvents : true,
xfbml : true,
version : 'v2.9'
});
FB.AppEvents.logPageView();
};
<script src="//developers.kakao.com/sdk/js/kakao.min.js"></script>

(function(d, s, id){
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
<body>

<div class="timeline-cover">
<div class="cover-photo">
<img src="./images/foto.jpg" alt="" height="180px" width="100%">
</div>
<div class="profile-photo-down">
<div class="profile-inner">
<a href="">
<div class="profile-frame">
<img src="./images/profile.jpg" width="116px;" height="116px;" alt="">
</div>
</a>
</div>
</div>
</div>
<div class="feature-list">
<div class="feature-list-inner">
<div class="feature-item">
<a class="feature-item-link" href="">
<i class="feature-item-icon post"> </i>
<span class="feature-item-name">
Post
</span>

</a>
</div>
</div>

<div>
<div>
<a href="">
<i>
<span>

hello hello world im pd
<div class="pg">
<header class="head">
<h1>media art design</h1>
</header>
<a id="kakao-login-btn"></a>
<a href="http://developers.kakao.com/logout"></a>
<script type='text/javascript'>
//<![CDATA[
// 사용할 앱의 JavaScript 키를 설정해 주세요.
Kakao.init('61b64f0d22f150715ff1e73b874515d3');
// 카카오 로그인 버튼을 생성합니다.
Kakao.Auth.createLoginButton({
container: '#kakao-login-btn',
success: function(authObj) {
alert(JSON.stringify(authObj));
},
fail: function(err) {
alert(JSON.stringify(err));
}
});
//]]>
</script>
<article class="pg-main">
<section class="entries">
<h2>브라우저의 너비를 800px 미만으로 줄여보세요</h2>
<p class="pcview_only"> 이 문장은 pc화면에서만 보입니다...이 문장은 pc화면에서만 보입니다... 이 문장은 pc화면에서만 보입니다...
</p>
<p>이 문장은 모든 디바이스에서 보입니다...이 문장은 모든 디바이스에서 보입니다...이 문장은 모든 디바이스에서 보입니다...
</p>
<hr/>
<h2>반대로 브라우저의 너비를 800px 이상으로 늘려보세요</h2>
<p class="pcview_only">이 문장은 모든 디바이스 화면에서...</p>
<p class="pcview_only"> 이 문장은 모든 디바이스 화면에서...</p>
</section>
<nav class="sidebar">
<h3>SNS registration</h3>
<ul>
<li><a href="#">facebook</a></li>
<li><a href="#">twitter</a></li>
</ul>
<h3>카테고리</h3>
<ul>
<li><a href="#">digital art</a></li>
<li><a href="#">sound art</a></li>
<li><a href="#">information visualize art</a></li>
<li><a href="#">new media art</a></li>
</ul>
</nav>
</article>
<div id="map" style="width:100%;height:400px;"></div>

</span>
</i>
</a>
</div>
</div>
<script>
var mapOptions = {
center: new naver.maps.LatLng(37.3595704, 127.105399),
zoom: 5,
mapTypeId: naver.maps.MapTypeId.NORMAL
};

<div>
<div>
<a href="">
<i>
<span>
var map = new naver.maps.Map('map', mapOptions);
var infowindow = new naver.maps.InfoWindow();

</span>
</i>
</a>
</div>
</div>
function onSuccessGeolocation(position) {
var location = new naver.maps.LatLng(position.coords.latitude,
position.coords.longitude);
map.setCenter(location); // 얻은 좌표를 지도의 중심으로 설정합니다.
map.setZoom(10); // 지도의 줌 레벨을 변경합니다.
infowindow.setContent('<div style="padding:20px;"><p style="margin-bottom:5px;color:#f00;"> '+position.coords.latitude+' long'+position.coords.longitude+'</p></div>');
infowindow.open(map, location);
}

<div>
<div>
<a href="">
<i>
<span>
function onErrorGeolocation() {
var center = map.getCenter();

</span>
</i>
</a>
</div>
</div>
infowindow.setContent('<div style="padding:20px;">' +
'<h5 style="margin-bottom:5px;color:#f00;">Geolocation failed!</h5>'+ "latitude: "+ center.lat() +"<br /><h5>longitude: "+ center.lng() +'</h5></div>');

</div>
<div class="profile-description">
infowindow.open(map, center);

infowindow.setContent('<p>issssssssssssssng...</p>');
infowindow.open(map, location);
}

</div>
<div class="timeline-body">
<div class="fb-share-button" data-href="https://developers.facebook.com/docs/plugins/" data-layout="button" data-size="large" data-mobile-iframe="true"><a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fdevelopers.facebook.com%2Fdocs%2Fplugins%2F&amp;src=sdkpreparse">Share</a></div>
$(window).on("load", function() {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(onSuccessGeolocation, onErrorGeolocation);
} else {
var center = map.getCenter();

infowindow.setContent('<div style="padding:20px;"><h5 style="margin-bottom:5px;color:#f00;">Geolocation not supported</h5>'+ "latitude: "+ center.lat() +"<br />longitude: "+ center.lng() +'</div>');
infowindow.open(map, center);
}
});
</script>
<footer class="foot">
<p>Copyright</p>
</footer>
</div>
</body>
</html>
1 change: 1 addition & 0 deletions t2.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wwww
41 changes: 40 additions & 1 deletion test.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1,40 @@
hello
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>test</title>
</head>
<style>
@@font-face {
font-family: SeoulNamsanFont;
src:url('SeoulNamsanL.ttf');
}
@@font-face {
font-family: SeoulNamsanFont;
src:url('SeoulNamsanEB.ttf');
font-weight: bold;
}
p{
font-family: SeoulNamsanFont;
}

@media (max-width:799px){
body{background-color: #ffffff}
#title:after{content:" :smartphone"}

}
@media only screen and (min-width:800px) and (max-width:1023px){
body{background-color: #CACACA}
#title:after{content:":tablet PC"}
}
@media only screen and (min-width:1024px){
body{background-color: #606060}
#title:after{content:":desktop PC"}
h1{color:#FFFFFF}
}
</style>
<body>
<p>이 문장은 웨폰트로 <b>"서울 남산체"</b>를 사용하였습니다.</p>
<h1 id="title"> 접속 기기 </h1>
</body>
</html>
4 changes: 4 additions & 0 deletions test88.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<<<<<<< HEAD
test88
=======
test2
>>>>>>> 9a948a6b2232621eb9995eccdd307d9d0319105e

0 comments on commit 29fb501

Please sign in to comment.