From 45b99d13cd8700adc08530c6fa0c46d039a0b7fe Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Thu, 30 Jul 2015 12:50:12 +0900 Subject: [PATCH] Fix: Design changed --- browser/main/Components/PlanetHeader.jsx | 1 - browser/main/Components/UserNavigator.jsx | 2 +- .../main/containers/PlanetContainer.styl | 30 ++++++++----------- .../styles/main/containers/UserContainer.styl | 16 +++++----- browser/styles/mixins/ui.styl | 3 ++ 5 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 browser/styles/mixins/ui.styl diff --git a/browser/main/Components/PlanetHeader.jsx b/browser/main/Components/PlanetHeader.jsx index c1d78991..1fbc8a2a 100644 --- a/browser/main/Components/PlanetHeader.jsx +++ b/browser/main/Components/PlanetHeader.jsx @@ -36,7 +36,6 @@ var PlanetHeader = React.createClass({ - Download Mac app ) diff --git a/browser/main/Components/UserNavigator.jsx b/browser/main/Components/UserNavigator.jsx index 55ea653d..dc65a758 100644 --- a/browser/main/Components/UserNavigator.jsx +++ b/browser/main/Components/UserNavigator.jsx @@ -74,7 +74,7 @@ module.exports = React.createClass({ return (
    {planets} diff --git a/browser/styles/main/containers/PlanetContainer.styl b/browser/styles/main/containers/PlanetContainer.styl index a9747953..5841ad97 100644 --- a/browser/styles/main/containers/PlanetContainer.styl +++ b/browser/styles/main/containers/PlanetContainer.styl @@ -1,6 +1,6 @@ .PlanetContainer absolute top bottom right - left 50px + left 55px .tags white-space: nowrap; overflow-x: auto; @@ -15,13 +15,14 @@ .PlanetHeader absolute left right top overflow-y hidden - height 65px + height 55px background-color white border-bottom solid 1px borderColor box-sizing border-box padding 5px 15px clearfix() .headerLabel + noSelect() absolute top left bottom overflow hidden display inline-block @@ -29,7 +30,7 @@ .userName position absolute left 15px - top 40px + top 30px width 140px font-size 1em color textColor @@ -42,14 +43,14 @@ width 145px font-size 1.6em color brandColor - overflow-x hidden + overflow hidden text-overflow ellipsis white-space nowrap &:hover color darken(brandBorderColor, 30%) .menuBtn position absolute - top 15px + top 12px right 5px font-size 1em btnDefault() @@ -64,12 +65,13 @@ &:focus, &.focus outline none .headerControl + noSelect() absolute top bottom right left 200px .searchInput display block position absolute - top 16px + top 12px left 0 input padding-left 32px @@ -79,19 +81,11 @@ top 8px left 12px color inactiveTextColor - .downloadButtton - position absolute - right 5px - top 10px - padding 7px 25px - box-sizing border-box - line-height 25px - font-size 1em - border-radius 22px .PlanetNavigator absolute bottom left - top 65px + noSelect() + top 55px width 200px border-right solid 1px highlightenBorderColor padding 10px @@ -149,7 +143,7 @@ .PlanetArticleList absolute bottom right left 200px - top 65px + top 55px width 250px border-right solid 1px highlightenBorderColor @@ -190,7 +184,7 @@ .PlanetArticleDetail absolute right bottom - top 65px + top 55px left 450px &>.viewer-header height 44px diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl index 36c701ec..03948b14 100644 --- a/browser/styles/main/containers/UserContainer.styl +++ b/browser/styles/main/containers/UserContainer.styl @@ -2,13 +2,13 @@ .UserNavigator background-color planetNavBgColor absolute left top bottom - width 50px + width 55px text-align center box-sizing border-box .userButton display block - width 50px - height 50px + width 55px + height 55px background-color black margin 0 padding 0 @@ -22,7 +22,7 @@ img opacity 1 ul.planetList>li - padding 10px 3px + margin 15px 0 .shortCut margin-top 5px color lighten(textColor, 5%) @@ -35,6 +35,7 @@ display block width 44px height 44px + margin 0 auto text-align center background-color planetAnchorBgColor text-decoration none @@ -56,6 +57,7 @@ border-radius 5px margin-top -41px margin-left 52px + white-space nowrap opacity 0 transition 0.1s pointer-events none @@ -63,8 +65,8 @@ opacity 1 img circle() - width 44px - height 44px + width 55px + height 55px button.newPlanet display block margin 0 auto @@ -89,7 +91,7 @@ color white .UserHome absolute top bottom right - left 50px + left 55px box-sizing border-box padding 15px h1 diff --git a/browser/styles/mixins/ui.styl b/browser/styles/mixins/ui.styl new file mode 100644 index 00000000..c99d24d6 --- /dev/null +++ b/browser/styles/mixins/ui.styl @@ -0,0 +1,3 @@ +noSelect() + -webkit-user-select none + -webkit-app-region drag