From caf76068935295a76824f77739b9b84df9f1086b Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Thu, 20 Aug 2015 16:41:05 +0900 Subject: [PATCH] =?UTF-8?q?=E5=AE=9F=E8=A3=85=20-=20PlanetHeader=E3=81=ABP?= =?UTF-8?q?rivate=E9=8D=B5=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/Components/PlanetHeader.jsx | 10 ++++++- .../main/containers/PlanetContainer.styl | 29 +++++++++++++++++++ .../styles/main/containers/UserContainer.styl | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/browser/main/Components/PlanetHeader.jsx b/browser/main/Components/PlanetHeader.jsx index 57753493..5be16adb 100644 --- a/browser/main/Components/PlanetHeader.jsx +++ b/browser/main/Components/PlanetHeader.jsx @@ -37,7 +37,15 @@ module.exports = React.createClass({
{currentUserName}
{currentPlanetName} -
diff --git a/browser/styles/main/containers/PlanetContainer.styl b/browser/styles/main/containers/PlanetContainer.styl index 41715ec2..d98f0c3b 100644 --- a/browser/styles/main/containers/PlanetContainer.styl +++ b/browser/styles/main/containers/PlanetContainer.styl @@ -51,6 +51,35 @@ articleListWidth= 275px white-space nowrap &:hover color darken(brandBorderColor, 30%) + .private + position absolute + top 12px + right 38px + width 33px + height 33px + line-height 33px + text-align center + color inactiveColor + &:hover + color textColor + .privateTooltip + position fixed + z-index popupZIndex + background-color transparentify(invBackgroundColor, 80%) + color invTextColor + padding 10px + font-size 0.9em + line-height 0.9em + border-radius 5px + white-space nowrap + opacity 0 + transition 0.1s + pointer-events none + margin-left -30px + &:hover .privateTooltip + opacity 1 + + .menuBtn position absolute top 12px diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl index db8d12fa..6a076ca0 100644 --- a/browser/styles/main/containers/UserContainer.styl +++ b/browser/styles/main/containers/UserContainer.styl @@ -126,7 +126,7 @@ background-color white .planetTooltip position absolute - z-index 500 + z-index popupZIndex background-color transparentify(invBackgroundColor, 80%) color invTextColor padding 10px