Merge pull request #62 from IceEnd/dev

LINUX,Windows样式适配
IceEnd · Oct 3, 2018 · 00d8e78 · 00d8e78
2 parents b925ee5 + 5175932
commit 00d8e78
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/app/views/assets/scss/index.scss b/app/views/assets/scss/index.scss
@@ -71,8 +71,6 @@ html, body, #root {
 
 /* 工具栏 */
 .tool-bar {
-	// flex: 0 0 5.4rem;
-	// width: 5.4rem;
 	flex: 0 0 4.5rem;
 	width: 4.5rem;
 	height: 100%;
@@ -119,7 +117,7 @@ html, body, #root {
 			height: 2.6rem;
 			width: 2.6rem;
 			display: inline-block;
-			line-height: 3rem;
+			line-height: 2.6rem;
 			transition: background-color, box-shadow .2s ease-in-out;
 		}
 
@@ -150,6 +148,41 @@ html, body, #root {
 	}
 }
 
+/* linux or windows tool-bar */
+.not-darwin {
+	.tool-bar {
+		flex: 0 0 4rem;
+		width: 4rem;
+	}
+
+
+	.logo {
+		text-align: center;
+		margin-top: 0;
+		img {
+			width: 3.3rem;
+			height: 3.3rem;
+			border-radius: 50%;
+		}
+
+		.avatar {
+			width: 3.3rem;
+			height: 3.3rem;
+		}
+	}
+
+	.menu-list .menu-item-radius {
+		height: 2.5rem;
+		width: 2.5rem;
+		line-height: 2.5rem;
+	}
+
+	.setting-wrap .setting {
+		width: 1.8rem;
+		height: 1.8rem;
+	}
+}
+
 .app-lounch-loading {
 	z-index: 9999;
 	position: fixed;

diff --git a/app/views/assets/scss/themes.scss b/app/views/assets/scss/themes.scss
@@ -3,7 +3,7 @@
 .light {
 	&.not-darwin {
 		.tool-bar {
-			background-image: linear-gradient(to left, rgb(230, 230, 230), rgb(210, 210, 210));
+			background: #e6e6e6;
 		}
 	}
 	.tool-bar {

diff --git a/app/views/container/App.jsx b/app/views/container/App.jsx
@@ -330,7 +330,7 @@ export default class App extends Component {
         <Fragment>
           <SVG />
           <Router history={history}>
-            <div className={`container ${notDarwin} ${theme}`}>
+            <div className={`container ${notDarwin} ${theme} ${platform}`}>
               <AppToolBar
                 defaultDrive={app.settings.defaultDrive}
                 avatar={user.avatar}