From 03068f68e5712b6a7b470544a32e36ede0c36a88 Mon Sep 17 00:00:00 2001
From: xmcp <xiaoyuanan2000@sina.com>
Date: Wed, 19 Jun 2019 20:38:27 +0800
Subject: [PATCH] move global title to infrastructure

---
 src/Flows.css      |  8 --------
 src/Title.css      | 13 -------------
 src/Title.js       | 11 ++---------
 src/infrastructure |  2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/Flows.css b/src/Flows.css
index 10f0ee1b..ce105013 100644
--- a/src/Flows.css
+++ b/src/Flows.css
@@ -59,22 +59,14 @@
     overflow-y: hidden;
 }
 
-.aux-margin,
 .left-container .flow-item {
     margin-left: 50px;
 }
-.aux-margin {
-    width: calc(100% - 2 * 50px);
-}
 
 @media screen and (max-width: 1300px) {
-    .aux-margin,
     .left-container .flow-item {
         margin-left: 10px;
     }
-    .aux-margin {
-        width: calc(100% - 2 * 10px);
-    }
 
     .flow-reply-row {
         width: calc(100% - 485px);
diff --git a/src/Title.css b/src/Title.css
index 90c4c26f..ae338106 100644
--- a/src/Title.css
+++ b/src/Title.css
@@ -10,19 +10,6 @@
     margin-bottom: 1em;
 }
 
-.title {
-    font-size: 1.5em;
-    height: 4em;
-    padding-top: 1em;
-    text-align: center;
-}
-.title .title-small {
-    opacity: .6;
-    padding-top: .5em;
-    font-size: .5em;
-    line-height: .5em;
-}
-
 .control-bar {
     display: flex;
     margin-top: .5em;
diff --git a/src/Title.js b/src/Title.js
index ea596839..13a713f2 100644
--- a/src/Title.js
+++ b/src/Title.js
@@ -1,4 +1,5 @@
 import React, {Component, PureComponent} from 'react';
+import {AppSwitcher} from './infrastructure/widgets';
 import {LoginForm, PostForm} from './UserAction';
 import {TokenCtx} from './UserAction';
 import {PromotionBar} from './Common';
@@ -153,22 +154,14 @@ class ControlBar extends PureComponent {
 }
 
 export function Title(props) {
-    let date=new Date();
-    let final_exam_egg=(1+date.getMonth())===6 && date.getDate()>=8 && date.getDate()<=21;
-
     return (
         <div className="title-bar">
+            <AppSwitcher appid="hole" />
             <div className="aux-margin">
                 <div className="title">
                     <p className="centered-line">
                         P大树洞
                     </p>
-                    <p className="title-small">
-                        { final_exam_egg && window.config.easter_egg ?
-                            <span style={{backgroundColor: 'yellow'}}>期末加油</span> :
-                            "官方网页版"
-                        }
-                    </p>
                 </div>
                 <ControlBar show_sidebar={props.show_sidebar} set_mode={props.set_mode} />
             </div>
diff --git a/src/infrastructure b/src/infrastructure
index 68ae75e3..04472185 160000
--- a/src/infrastructure
+++ b/src/infrastructure
@@ -1 +1 @@
-Subproject commit 68ae75e38ecb45e7518b2b94c0de91701b8a56e8
+Subproject commit 044721854a2e35603e87254f943c5f359a319102