Merge branch '0.6.0'

browser/styles/main/index.styl

@@ -1,13 +1,6 @@
-@import '../../../node_modules/nib/lib/nib'
 @import '../vars'
 @import '../mixins/*'
 global-reset()
-@import '../shared/*'
-@import './ArticleNavigator'
-@import './ArticleTopBar'
-@import './ArticleList'
-@import './ArticleDetail'
-@import './modal/*'
 @import '../theme/*'
 
 DEFAULT_FONTS = 'Lato', helvetica, arial, sans-serif
@@ -96,63 +89,25 @@ textarea.block-input
 #content
   fullsize()
 
-.Main
-  .appUpdateButton
-    position fixed
-    z-index 2000
-    bottom 5px
-    right 53px
-    padding 10px 15px
-    border none
-    border-radius 5px
-    background-color brandColor
-    color white
-    opacity 0.7
-    &:hover
-      opacity 1
-      background-color lighten(brandColor, 10%)
-  .contactButton
-    position fixed
-    z-index 2000
-    bottom 5px
-    right 5px
-    padding 10px 15px
-    border none
-    border-radius 5px
-    background-color brandColor
-    color white
-    opacity 0.7
-    &:hover
-      opacity 1
-      background-color lighten(brandColor, 10%)
-    .tooltip
-      tooltip()
-      margin-top -22px
-      margin-left -107px
-    &:hover .tooltip
-      opacity 1
+modalZIndex= 1000
+modalBackColor = transparentify(black, 65%)
 
-.OSSAnnounceModal
-  height 250
-  text-align center
-  .OSSAnnounceModal-title
-    font-size 32px
-    padding 45px 0
-
-  .OSSAnnounceModal-link
-    display block
-    font-size 20px
-    margin 25px 0 65px
-  .OSSAnnounceModal-closeBtn
-    display block
-    margin 0 auto
-    border none
+.ModalBase
+  fixed top left bottom right
+  z-index modalZIndex
+  &.hide
+    display none
+  .modalBack
+    absolute top left bottom right
+    background-color modalBackColor
+    z-index modalZIndex + 1
+  .modal
+    position relative
+    width 650px
+    margin 50px auto 0
+    z-index modalZIndex + 2
+    background-color white
+    padding 15px
+    color #666666
     border-radius 5px
-    width 150px
-    height 33px
-    background-color brandColor
-    color white
-    opacity 0.7
-    &:hover
-      opacity 1
-      background-color lighten(brandColor, 10%)
+