diff --git a/css/login.css b/css/login.css
index 6966dbd..0d264bd 100644
--- a/css/login.css
+++ b/css/login.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
.cm-tab-wrap-hack::after { content: ""; }
.com-user { position: fixed; display: flex; justify-content: center; align-items: center; background: rgb(255, 255, 255) none repeat scroll 0% 0%; }
.com-user, .com-user::after { top: 0px; left: 0px; bottom: 0px; right: 0px; z-index: 1000; }
@@ -24,7 +23,6 @@ button:active { border-color: rgb(36, 127, 255) rgb(18, 94, 237) rgb(0, 61, 219)
.layout-desktop .icons > div { display: flex; width: 150px; height: 150px; justify-content: center; align-items: center; flex-direction: column; }
.layout-desktop .icons > div img { max-width: 60px; max-height: 60px; }
.layout-desktop .icons > div span { margin-top: 10px; color: rgb(255, 255, 255); font-size: 12px; }
-=======
@charset "utf-8";
/* CSS Document */
@@ -89,4 +87,3 @@ i,em{font-style:normal;}
.foot em{ float:left}
.foot span{ float:right; padding-right:10px; color:#dae1e4;}
.foot span a{ padding:0 12px; font-size:14px; color:#dae1e4; }
->>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
diff --git a/css/macdefault.css b/css/macdefault.css
index ce711e0..f0d876d 100644
--- a/css/macdefault.css
+++ b/css/macdefault.css
@@ -211,15 +211,16 @@ body {
#win10-menu {
position: fixed;
top: 31px;
+ left: 0.5%;
background-color: rgba(255,255,255,0.55);
- height:auto;
- width: 12.5%;
+ height: auto;
+ width: 10%;
max-width: 880px;
overflow: auto;
z-index: 1000;
overflow-y: hidden;
- transition: bottom 0.5s ;
- border-radius: 0 0 5px 5px;
+ transition: bottom 0.5s;
+ border-radius: 3px;
}
#win10-menu.hidden {
@@ -873,7 +874,7 @@ body {
}
#win10_btn_show_desktop {
border-left: grey 1px solid;
- width: 30px;
+ width: 15px;
margin-left: 3px;
padding: 0 !important
}
diff --git a/demo.html b/demo.html
index 8273feb..1f262c6 100644
--- a/demo.html
+++ b/demo.html
@@ -57,7 +57,6 @@
})
},2000);
});
-
diff --git a/index.html b/index.html
index bd70c5d..a49b0ab 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,6 @@
})
},2000);
});
-
@@ -88,7 +87,6 @@
-