Skip to content

Commit

Permalink
Merge pull request #138 from 2022-Winter-Bootcamp-Team-K/feat/#134-Ro…
Browse files Browse the repository at this point in the history
…llingpaperCountImg

Feat/#134 rollingpaper count img
  • Loading branch information
junvhui authored Jan 31, 2023
2 parents 996399e + dd65acd commit 74845c3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
Binary file added src/Image/userbackimg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Image/usericon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Page/MyPageItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function MyPageItem({ dataColumn }) {
document.body.removeChild($textarea);
alert('복사 성공!');
} catch (error) {
alert('복사 실패!');
alert('복사 실패! (지원하지 않는 환경입니다)');
}
};
// console.log(dataColumn.title);
Expand Down
23 changes: 16 additions & 7 deletions src/Page/Rolling.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import usericon from '../Image/usericon.png';
import StickerModal from './StickerModal';
import 'react-toastify/dist/ReactToastify.css';

import userback from '../Image/userbackimg.png';

import './snow.css';

import KakaoShare from './KakaoShare';
Expand Down Expand Up @@ -84,22 +86,29 @@ const Text = styled.div`
const UserWrap = styled.div`
padding-right: 5rem;
margin-top: 1rem;
height: 2rem;
height: 10rem;
display: flex;
align-items: center;
align-items: right;
justify-content: flex-end;
margin-right: 1rem;
margin-right: 5rem;
background-image: url(${userback});
background-size: 17rem;
background-repeat: no-repeat;
background-position-x: 74.5rem;
background-position-y: -6.8rem;
/* z-index: 100; */
`;
const UserIcon = styled.img`
width: 2rem;
height: 2rem;
width: 1.8rem;
height: 1.8rem;
margin-top: 1.1rem;
`;
const UserNum = styled.div`
font-style: normal;
font-weight: 700;
font-size: 20px;
line-height: 24px;
line-height: 4rem;
margin-left: 1rem;
text-align: center;
color: #ffffff;
Expand Down Expand Up @@ -549,7 +558,7 @@ function Rolling() {
)}

<Text>TO. {items.title}</Text>
<UserWrap>
<UserWrap bgimage={userback}>
<UserIcon src={usericon} alt="" />
<UserNum>{length}</UserNum>
</UserWrap>
Expand Down

0 comments on commit 74845c3

Please sign in to comment.