From 08b0c4338290e7e0f4d146a322da579a79cf6f85 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 4 Jan 2016 19:57:01 +0900 Subject: [PATCH] fix button tooltip & popup menu style --- browser/main/HomePage/ArticleDetail/index.js | 2 ++ browser/main/HomePage/ArticleNavigator.js | 2 +- browser/styles/main/ArticleDetail.styl | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/browser/main/HomePage/ArticleDetail/index.js b/browser/main/HomePage/ArticleDetail/index.js index 5fdc7814..6c6e52c2 100644 --- a/browser/main/HomePage/ArticleDetail/index.js +++ b/browser/main/HomePage/ArticleDetail/index.js @@ -35,6 +35,7 @@ othersMenu.append(new MenuItem({ })) const BRAND_COLOR = '#18AF90' +const OSX = global.process.platform === 'darwin' const editDeleteTutorialElement = ( @@ -318,6 +319,7 @@ export default class ArticleDetail extends React.Component { disabled={!isUnsaved} >  Save + diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js index e248477b..6346f799 100644 --- a/browser/main/HomePage/ArticleNavigator.js +++ b/browser/main/HomePage/ArticleNavigator.js @@ -186,7 +186,7 @@ export default class ArticleNavigator extends React.Component {
Folders
{status.isTutorialOpen ? newFolderTutorialElement : null} diff --git a/browser/styles/main/ArticleDetail.styl b/browser/styles/main/ArticleDetail.styl index 46ea1f4e..04d89626 100644 --- a/browser/styles/main/ArticleDetail.styl +++ b/browser/styles/main/ArticleDetail.styl @@ -110,6 +110,13 @@ infoButton() &:focus color white background-color lighten(brandColor, 15%) + .tooltip + tooltip() + margin-top 30px + margin-left -90px + &:hover .tooltip + opacity 1 + .ShareButton-open-button .tooltip margin-left -40px .ShareButton-dropdown @@ -121,7 +128,7 @@ infoButton() border-radius 5px right 5px top 95px - box-shadow 0px 0px 10px 1px #c0c0c0 + box-shadow 0px 0px 10px 1px alpha(#bbb, 0.8) border 1px solid #bcbcbc &.hide display none @@ -133,7 +140,7 @@ infoButton() padding-left 20px text-align left font-size 13px - font-family 'Helvetica Neue' + font-family '.HelveticaNeueDeskInterface-Regular' &:hover background-color #4297FE color white