diff --git a/browser/main/modal/EditedAlert.js b/browser/main/modal/EditedAlert.js
deleted file mode 100644
index 9eb01085..00000000
--- a/browser/main/modal/EditedAlert.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { PropTypes } from 'react'
-import ReactDOM from 'react-dom'
-import store from '../store'
-import { unlockStatus, clearNewArticle } from '../actions'
-
-export default class EditedAlert extends React.Component {
- componentDidMount () {
- ReactDOM.findDOMNode(this.refs.no).focus()
- }
-
- handleNoButtonClick (e) {
- this.props.close()
- }
-
- handleYesButtonClick (e) {
- store.dispatch(unlockStatus())
- store.dispatch(this.props.action)
- store.dispatch(clearNewArticle())
- this.props.close()
- }
-
- render () {
- return (
-
-
Your article is still editing!
-
-
Do you really want to leave without finishing?
-
-
-
-
-
-
- )
- }
-}
-
-EditedAlert.propTypes = {
- action: PropTypes.object,
- close: PropTypes.func
-}
diff --git a/browser/styles/main/HomeContainer/components/ArticleDetail.styl b/browser/styles/main/ArticleDetail.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/components/ArticleDetail.styl
rename to browser/styles/main/ArticleDetail.styl
diff --git a/browser/styles/main/HomeContainer/components/ArticleList.styl b/browser/styles/main/ArticleList.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/components/ArticleList.styl
rename to browser/styles/main/ArticleList.styl
diff --git a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl b/browser/styles/main/ArticleNavigator.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/components/ArticleNavigator.styl
rename to browser/styles/main/ArticleNavigator.styl
diff --git a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl b/browser/styles/main/ArticleTopBar.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/components/ArticleTopBar.styl
rename to browser/styles/main/ArticleTopBar.styl
diff --git a/browser/styles/main/HomeContainer/index.styl b/browser/styles/main/HomeContainer/index.styl
deleted file mode 100644
index aed33a3d..00000000
--- a/browser/styles/main/HomeContainer/index.styl
+++ /dev/null
@@ -1,12 +0,0 @@
-@require './components/UserNavigator'
-@require './components/ArticleNavigator'
-@require './components/ArticleTopBar'
-@require './components/ArticleList'
-@require './components/ArticleDetail'
-
-@require './lib/modal'
-@require './lib/CreateNewTeam'
-@require './lib/CreateNewFolder'
-@require './lib/Preferences'
-@require './lib/Tutorial'
-@require './lib/EditedAlert'
diff --git a/browser/styles/main/HomeContainer/lib/EditedAlert.styl b/browser/styles/main/HomeContainer/lib/EditedAlert.styl
deleted file mode 100644
index e7ce8d11..00000000
--- a/browser/styles/main/HomeContainer/lib/EditedAlert.styl
+++ /dev/null
@@ -1,28 +0,0 @@
-.EditedAlert.modal
- width 350px
- top 100px
- .title
- font-size 24px
- margin-bottom 15px
- .message
- font-size 14px
- margin-bottom 15px
- .control
- text-align right
- button
- border-radius 5px
- height 33px
- padding 0 15px
- font-size 14px
- background-color white
- border 1px solid borderColor
- border-radius 5px
- margin-left 5px
- &:hover
- background-color darken(white, 10%)
- &.primary
- border-color brandColor
- background-color brandColor
- color white
- &:hover
- background-color lighten(brandColor, 10%)
diff --git a/browser/styles/main/HomeContainer/components/UserNavigator.styl b/browser/styles/main/UserNavigator.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/components/UserNavigator.styl
rename to browser/styles/main/UserNavigator.styl
diff --git a/browser/styles/main/components/Select.styl b/browser/styles/main/components/Select.styl
deleted file mode 100644
index 9dabf0d0..00000000
--- a/browser/styles/main/components/Select.styl
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * React Select
- * ============
- * Created by Jed Watson and Joss Mackison for KeystoneJS, http://www.keystonejs.com/
- * https://twitter.com/jedwatson https://twitter.com/jossmackison https://twitter.com/keystonejs
- * MIT License: https://github.com/keystonejs/react-select
-*/
-.Select {
- position: relative;
-}
-.Select-control {
- position: relative;
- overflow: hidden;
- background-color: #ffffff;
- border: 1px solid #cccccc;
- border-color: #d9d9d9 #cccccc #b3b3b3;
- border-radius: 4px;
- box-sizing: border-box;
- color: #333333;
- cursor: default;
- outline: none;
- padding: 8px 52px 8px 10px;
- transition: all 200ms ease;
-}
-.Select-control:hover {
- // box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06);
-}
-.is-searchable.is-open > .Select-control {
- cursor: text;
-}
-.is-open > .Select-control {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
- background: #ffffff;
- border-color: #b3b3b3 #cccccc #d9d9d9;
-}
-.is-open > .Select-control > .Select-arrow {
- border-color: transparent transparent #999999;
- border-width: 0 5px 5px;
-}
-.is-searchable.is-focused:not(.is-open) > .Select-control {
- cursor: text;
-}
-.is-focused:not(.is-open) > .Select-control {
- // border-color: #0088cc #0099e6 #0099e6;
- // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 5px -1px rgba(0, 136, 204, 0.5);
-}
-.Select-placeholder {
- color: #aaaaaa;
- padding: 8px 52px 8px 10px;
- position: absolute;
- top: 0;
- left: 0;
- right: -15px;
- max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.has-value > .Select-control > .Select-placeholder {
- color: #333333;
-}
-.Select-input > input {
- cursor: default;
- background: none transparent;
- box-shadow: none;
- height: auto;
- border: 0 none;
- font-family: inherit;
- font-size: inherit;
- margin: 0;
- padding: 0;
- outline: none;
- display: inline-block;
- -webkit-appearance: none;
-}
-.is-focused .Select-input > input {
- cursor: text;
-}
-.Select-control:not(.is-searchable) > .Select-input {
- outline: none;
-}
-.Select-loading {
- -webkit-animation: Select-animation-spin 400ms infinite linear;
- -o-animation: Select-animation-spin 400ms infinite linear;
- animation: Select-animation-spin 400ms infinite linear;
- width: 16px;
- height: 16px;
- box-sizing: border-box;
- border-radius: 50%;
- border: 2px solid #cccccc;
- border-right-color: #333333;
- display: inline-block;
- position: relative;
- margin-top: -8px;
- position: absolute;
- right: 30px;
- top: 50%;
-}
-.has-value > .Select-control > .Select-loading {
- right: 46px;
-}
-.Select-clear {
- color: #999999;
- cursor: pointer;
- display: inline-block;
- font-size: 16px;
- padding: 6px 10px;
- position: absolute;
- right: 17px;
- top: 0;
-}
-.Select-clear:hover {
- color: #c0392b;
-}
-.Select-clear > span {
- font-size: 1.1em;
-}
-.Select-arrow-zone {
- content: " ";
- display: block;
- position: absolute;
- right: 0;
- top: 0;
- bottom: 0;
- width: 30px;
- cursor: pointer;
-}
-.Select-arrow {
- border-color: #999999 transparent transparent;
- border-style: solid;
- border-width: 5px 5px 0;
- content: " ";
- display: block;
- height: 0;
- margin-top: -ceil(2.5px);
- position: absolute;
- right: 10px;
- top: 14px;
- width: 0;
- cursor: pointer;
-}
-.Select-menu-outer {
- border-bottom-right-radius: 5px;
- border-bottom-left-radius: 5px;
- background-color: #ffffff;
- border: 1px solid #cccccc;
- border-top-color: #e6e6e6;
- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06);
- box-sizing: border-box;
- margin-top: -1px;
- max-height: 200px;
- position: absolute;
- top: 100%;
- width: 100%;
- z-index: 1000;
- -webkit-overflow-scrolling: touch;
-}
-.Select-menu {
- max-height: 198px;
- overflow-y: auto;
-}
-.Select-option {
- box-sizing: border-box;
- color: #666666;
- cursor: pointer;
- display: block;
- padding: 8px 10px;
-}
-.Select-option:last-child {
- border-bottom-right-radius: 5px;
- border-bottom-left-radius: 5px;
-}
-.Select-option.is-focused {
- background-color: #f2f9fc;
- color: #333333;
-}
-.Select-option.is-disabled {
- color: #cccccc;
- cursor: not-allowed;
-}
-.Select-noresults {
- box-sizing: border-box;
- color: #999999;
- cursor: default;
- display: block;
- padding: 8px 10px;
-}
-.Select.is-multi .Select-control {
- padding: 2px 52px 2px 3px;
-}
-.Select.is-multi .Select-input {
- vertical-align: middle;
- border: 1px solid transparent;
- margin: 2px;
- padding: 3px 0;
-}
-.Select-item {
- background-color: brandColor;
- border-radius: 2px;
- // border: 1px solid #c9e6f2;
- color: white;
- display: inline-block;
- font-size: 1em;
- margin: 2px;
-}
-.Select-item-icon,
-.Select-item-label {
- display: inline-block;
- vertical-align: middle;
-}
-.Select-item-label {
- cursor: default;
- border-bottom-right-radius: 2px;
- border-top-right-radius: 2px;
- padding: 3px 5px;
-}
-.Select-item-label .Select-item-label__a {
- color: white;
- cursor: white;
-}
-.Select-item-icon {
- cursor: pointer;
- border-bottom-left-radius: 2px;
- border-top-left-radius: 2px;
- border-right: 1px solid darken(brandColor, 10%)
- padding: 2px 5px 4px;
-}
-.Select-item-icon:hover,
-.Select-item-icon:focus {
- background-color: lighten(brandColor, 10%)
-}
-.Select-item-icon:active {
- background-color: #c9e6f2;
-}
-.Select.is-multi.is-disabled .Select-item {
- background-color: #f2f2f2;
- border: 1px solid #d9d9d9;
- color: #888888;
-}
-.Select.is-multi.is-disabled .Select-item-icon {
- cursor: not-allowed;
- border-right: 1px solid #d9d9d9;
-}
-.Select.is-multi.is-disabled .Select-item-icon:hover,
-.Select.is-multi.is-disabled .Select-item-icon:focus,
-.Select.is-multi.is-disabled .Select-item-icon:active {
- background-color: #f2f2f2;
-}
-@keyframes Select-animation-spin {
- to {
- transform: rotate(1turn);
- }
-}
-@-webkit-keyframes Select-animation-spin {
- to {
- -webkit-transform: rotate(1turn);
- }
-}
diff --git a/browser/styles/main/containers/PlanetContainer.styl b/browser/styles/main/containers/PlanetContainer.styl
deleted file mode 100644
index 0e227308..00000000
--- a/browser/styles/main/containers/PlanetContainer.styl
+++ /dev/null
@@ -1,332 +0,0 @@
-navigationWidth= 200px
-articleListWidth= 275px
-
-.PlanetContainer
- absolute top bottom right left
- .tags
- white-space: nowrap;
- overflow-x: auto;
- a
- margin 0 2px
- text-decoration underline
- cursor pointer
- font-size 0.95em
- &.noTag
- color inactiveTextColor
- font-size 0.8em
-
-.PlanetHeader
- absolute left right top
- overflow-y hidden
- 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
- width navigationWidth
- .userName
- position absolute
- left 15px
- top 30px
- width 140px
- font-size 1em
- color textColor
- text-decoration none
- &:hover
- color darken(lightButtonColor, 50%)
- text-decoration underline
- .planetName
- position absolute
- top 5px
- left 10px
- width 145px
- font-size 1.6em
- color brandColor
- overflow hidden
- text-overflow ellipsis
- 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
- .tooltip
- tooltip()
- margin-left -30px
- &:hover .tooltip
- opacity 1
-
-
- .planetSettingButton
- position absolute
- top 15px
- right 5px
- font-size 0.8em
- btnDefault()
- box-sizing border-box
- circle()
- width 26px
- height 26px
- text-align center
- cursor pointer
- transition 0.1s
- &:focus, &.focus
- outline none
- .tooltip
- tooltip()
- margin-top 11px
- margin-left -36px
- &:hover .tooltip
- opacity 1
-
- .headerControl
- noSelect()
- absolute top bottom right
- left navigationWidth
- .searchInput
- display block
- position absolute
- top 12px
- left 0
- input
- padding-left 32px
- width 300px
- .fa
- position absolute
- top 8px
- left 12px
- color inactiveTextColor
- .refreshButton
- display block
- position absolute
- top 15px
- right 55px
- width 26px
- height 26px
- font-size 0.8em
- btnDefault()
- circle()
- text-align center
- cursor pointer
- transition 0.1s
- &:focus, &.focus
- outline none
- .tooltip
- tooltip()
- margin-top 11px
- margin-left -39px
- &:hover .tooltip
- opacity 1
- .logo
- display block
- position absolute
- top 4px
- right 10px
- cursor pointer
- img
- transition 0.1s
- opacity 0.9
- &:hover img, &:hover .tooltip
- opacity 1
- .tooltip
- tooltip()
- margin-top -5px
- margin-left -67px
-
-
-.PlanetNavigator
- absolute bottom left
- noSelect()
- top 55px
- width navigationWidth
- border-right solid 1px highlightenBorderColor
- padding 10px
- box-sizing border-box
- .launchButton
- border-radius 22px
- font-size 1.1em
- nav
- a
- display block
- box-sizing border-box
- padding 15px 15px
- margin 10px 0
- border-radius 10px
- text-decoration none
- background-color transparent
- color textColor
- cursor pointer
- transition 0.1s
- btnDefault()
- border none
-
-.PlanetArticleList
- absolute bottom right
- left navigationWidth
- top 55px
- width articleListWidth
- border-right solid 1px highlightenBorderColor
-
- &>ul
- absolute top bottom left right
- overflow-y auto
- li
- .articleItem
- noSelect()
- border solid 2px transparent
- position relative
- height 94px
- width 100%
- cursor pointer
- transition 0.1s
- .itemLeft
- position absolute
- top 4px
- bottom 4px
- width 38px
- padding 3px 0 3px 3px
- text-align center
- .profileImage
- margin-bottom 5px
- circle()
- .fa
- line-height 25px
- .itemRight
- position absolute
- top 4px
- bottom 4px
- right 2px
- left 40px
- overflow-x hidden
- padding 3px 10px 3px 3px
- .itemInfo
- margin 5px 0 13px
- color lighten(textColor, 25%)
- font-size 0.7em
- .userProfileName
- color brandColor
- font-size 1.2em
- .description
- line-height 120%
- margin-bottom 10px
- font-size 1em
- overflow-x hidden
- white-space nowrap
- text-overflow ellipsis
- .tags
- position absolute
- bottom 5px
- font-size 0.9em
- &:hover, &.hover
- background-color hoverBackgroundColor
- &:active, &.active
- background-color white
- &:active, &.active
- border-color brandBorderColor
- .divider
- border-bottom solid 1px borderColor
-
-.PlanetArticleDetail
- absolute right bottom
- top 55px
- left navigationWidth + articleListWidth
- .detailHeader
- border solid 2px transparent
- position relative
- height 105px
- width 100%
- transition 0.1s
- .itemLeft
- position absolute
- top 7px
- bottom 4px
- width 38px
- padding 3px 0 3px 3px
- text-align center
- .profileImage
- margin-bottom 5px
- circle()
- .fa
- line-height 25px
- .itemRight
- position absolute
- top 7px
- bottom 4px
- right 2px
- left 40px
- overflow-x hidden
- padding 3px 10px 3px 3px
- .itemInfo
- margin 5px 0 13px
- color lighten(textColor, 25%)
- font-size 0.7em
- .userProfileName
- color brandColor
- font-size 1.2em
- .description
- line-height 120%
- margin-bottom 10px
- font-size 1em
- overflow-x auto
- white-space nowrap
- .tags
- position absolute
- bottom 5px
- font-size 0.9em
- .itemControl
- position absolute
- z-index 1
- top 2px
- right 2px
- .deleteButton, .editButton
- btnDefault()
- text-align center
- width 33px
- height 33px
- border-radius 16.5px
- font-size 15px
- margin 0 3px
- .tooltip
- tooltip()
- margin-top 10px
- &:hover .tooltip
- opacity 1
- .editButton .tooltip
- margin-left -12px
- .deleteButton .tooltip
- margin-left -26px
- .detailBody
- absolute left right bottom
- top 105px
- .content
- position absolute
- top 5px
- bottom 5px
- left 2px
- right 2px
- box-sizing border-box
- padding 5px
- border-top solid 1px borderColor
- &.noteDetail
- .detailBody .content
- overflow-x hidden
- overflow-y auto
- marked()
- &.codeDetail
- .detailBody .content
- .ace_editor
- absolute left right top bottom
diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl
deleted file mode 100644
index e8b17cea..00000000
--- a/browser/styles/main/containers/UserContainer.styl
+++ /dev/null
@@ -1,123 +0,0 @@
-userNavigatorWidth = 200px
-userNavigatorBgColor = #333
-userNavigatorColor = #DDD
-userNavigatorProfileNameColor = brandColor
-userNavigatorBorderColor = #666
-
-userContentBgColor = #E6E6E6
-
-.UserContainer
- absolute top bottom right
- left 60px
- .content
- absolute top bottom right
- left userNavigatorWidth
- background-color userContentBgColor
- .UserNavigator
- absolute left top bottom
- width userNavigatorWidth
- background-color userNavigatorBgColor
- color userNavigatorColor
- noSelect()
- &>.profile
- height 60px
- padding 10px 15px 0
- box-sizing border-box
- position relative
- border-bottom solid 1px userNavigatorBorderColor
- cursor pointer
- &>.profileName
- color userNavigatorProfileNameColor
- font-size 22px
- cursor pointer
- transition 0.1s
- &>.name
- padding 5px 10px
- font-size 14px
- color userNavigatorColor
- cursor pointer
- transition 0.1s
- &>.dropdownIcon
- position absolute
- top 20px
- right 25px
- float right
- width 20px
- height 20px
- line-height 20px
- font-size 8px
- border solid 1px userNavigatorColor
- border-radius 12.5px
- text-align center
- transition 0.1s
- &:hover
- &>.profileName
- color lighten(brandColor, 10%)
- &>.name
- color white
- &>.dropdownIcon
- border-color white
- &:active
- &>.dropdownIcon
- background-color brandColor
- border-color brandColor
- &>.control
- padding 15px 15px
- &>.newPostButton
- background-color brandColor
- color white
- height 44px
- width 100%
- border none
- border-radius 5px
- font-size 16px
- font-weight 600
- transition 0.1s
- &:hover
- background-color lighten(brandColor, 10%)
- &>.menu
- absolute left right bottom
- top 134px
- padding 15px 0
- overflow auto
- &>.menuGruop
- &>.label
- border-bottom 1px solid userNavigatorBorderColor
- padding 10px 15px
- font-size 18px
- margin-bottom 10px
- &>.plusButton
- float right
- width 20px
- height 20px
- margin-top -2.5px
- margin-right -5px
- line-height 15px
- font-size 8px
- border solid 1px userNavigatorColor
- border-radius 10px
- background-color transparent
- text-align center
- color userNavigatorColor
- &:hover
- border-color white
- color white
- &:active
- background-color brandColor
- border-color brandColor
- &>.folders
- .folderButton
- padding 10px 25px
- width 100%
- background-color transparent
- border none
- font-size 14px
- color userNavigatorColor
- transition 0.1s
- text-align left
- &:hover
- background-color transparentify(white, 20%)
- color white
- &.active
- background-color brandColor
- color white
diff --git a/browser/styles/main/index.styl b/browser/styles/main/index.styl
index 99a266f1..b28d6069 100644
--- a/browser/styles/main/index.styl
+++ b/browser/styles/main/index.styl
@@ -3,8 +3,10 @@
@import '../mixins/*'
global-reset()
@import '../shared/*'
-@import './containers/*'
-@import './HomeContainer'
+@import './ArticleNavigator'
+@import './ArticleTopbar'
+@import './ArticleList'
+@import './ArticleDetail'
@import './modal/*'
DEFAULT_FONTS = 'Lato', helvetica, arial, sans-serif
diff --git a/browser/styles/main/HomeContainer/lib/CreateNewFolder.styl b/browser/styles/main/modal/CreateNewFolder.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/lib/CreateNewFolder.styl
rename to browser/styles/main/modal/CreateNewFolder.styl
diff --git a/browser/styles/main/HomeContainer/lib/CreateNewTeam.styl b/browser/styles/main/modal/CreateNewTeam.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/lib/CreateNewTeam.styl
rename to browser/styles/main/modal/CreateNewTeam.styl
diff --git a/browser/styles/main/HomeContainer/lib/Preferences.styl b/browser/styles/main/modal/Preferences.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/lib/Preferences.styl
rename to browser/styles/main/modal/Preferences.styl
diff --git a/browser/styles/main/HomeContainer/lib/Tutorial.styl b/browser/styles/main/modal/Tutorial.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/lib/Tutorial.styl
rename to browser/styles/main/modal/Tutorial.styl
diff --git a/browser/styles/main/HomeContainer/lib/modal.styl b/browser/styles/main/modal/modal.styl
similarity index 100%
rename from browser/styles/main/HomeContainer/lib/modal.styl
rename to browser/styles/main/modal/modal.styl