From d2cc3d2d7a38ad80e706ccf627c4e0a0dda6eae4 Mon Sep 17 00:00:00 2001 From: printempw Date: Fri, 5 Feb 2016 18:53:17 +0800 Subject: [PATCH] fixed 2d skin preview overflow --- assets/css/user.style.css | 10 ++++++++-- assets/js/user.utils.js | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/assets/css/user.style.css b/assets/css/user.style.css index 69b86e89..1b4bfc9a 100644 --- a/assets/css/user.style.css +++ b/assets/css/user.style.css @@ -2,7 +2,7 @@ * @Author: prpr * @Date: 2016-01-21 19:12:06 * @Last Modified by: prpr -* @Last Modified time: 2016-02-05 15:13:00 +* @Last Modified time: 2016-02-05 18:50:36 */ .home-menu-blur { @@ -101,5 +101,11 @@ input[type=radio] { position: initial !important; } #skinpreview > p { - margin: 20px 0; + height: 64px; + line-height: 64px; +} +.skin2d { + float: right; + max-height: 64px; + width: 64px; } diff --git a/assets/js/user.utils.js b/assets/js/user.utils.js index 9f4aff0e..91c3a3e6 100644 --- a/assets/js/user.utils.js +++ b/assets/js/user.utils.js @@ -2,7 +2,7 @@ * @Author: prpr * @Date: 2016-01-21 13:56:40 * @Last Modified by: prpr -* @Last Modified time: 2016-02-05 18:34:01 +* @Last Modified time: 2016-02-05 18:46:35 */ 'use strict'; @@ -70,9 +70,9 @@ $("[title='Rotation']").click(function(){ function show2dPreview() { $('#canvas3d').remove(); - $("#skinpreview").html($('

Skin for Steve model:

').append($('').css('float', 'right').attr('src', '../skin/'+docCookies.getItem('uname')+'-steve.png'))); - $("#skinpreview").append($('

Skin for Alex model:

').append($('').css('float', 'right').attr('src', '../skin/'+docCookies.getItem('uname')+'-alex.png'))); - $("#skinpreview").append($('

Cape:

').append($('').css('float', 'right').attr('src', '../cape/'+docCookies.getItem('uname')+'.png'))); + $("#skinpreview").html($('

Skin for Steve model:

').append($('').addClass('skin2d').attr('src', '../skin/'+docCookies.getItem('uname')+'-steve.png?v='+Math.random()))); + $("#skinpreview").append($('

Skin for Alex model:

').append($('').addClass('skin2d').attr('src', '../skin/'+docCookies.getItem('uname')+'-alex.png?v='+Math.random()))); + $("#skinpreview").append($('

Cape:

').append($('').addClass('skin2d').attr('src', '../cape/'+docCookies.getItem('uname')+'.png?v='+Math.random()))); $('#preview').html('3D Preview').attr('href', 'javascript:show3dPreview();'); }