update main style to support nc 25

Signed-off-by: binsky <timo@binsky.org>

3 files changed, 29 insertions, 47 deletions

diff --git a/sass/app.scss b/sass/app.scss
index 5e543704..87a4ef1c 100644
--- a/sass/app.scss
+++ b/sass/app.scss
@@ -68,21 +68,20 @@
 }
 
 #passman-controls {
+  display: flow-root;
+  position: sticky;
+  width: 100%;
   box-sizing: border-box;
-  position: fixed;
-  margin: -45px 0 0;
-  right: 0;
-  left: 0;
   border-bottom: 1px solid #c9c9c9;
-  padding: 0 !important;
   background-color: rgba(255, 255, 255, .95);
   z-index: 50;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  height: 54px !important;
+  padding-right: 20px !important;
 
-  height: 44px !important;
   .breadcrumb{
     //Move Homeicon to the right to prevent overlap with burgermenu
     @media only screen and (max-width: 769px) {
@@ -100,15 +99,14 @@
 }
 @media only screen and (min-width: 1024px){
   #app-navigation+#app-content #passman-controls {
-    left: 300px;
-    width: calc( 100% - 300px ) !important;
+
   }
 }
 #passman-controls .button,  #passman-controls, #passman-controls input[type='submit'],  #passman-controls input[type='text'],  #passman-controls input[type='password'],  #passman-controls select {
   box-sizing: border-box;
-  display: inline-block;
+  //display: inline-block;
   height: 36px;
-  padding: 7px 10px;
+  padding: 5px 10px;
 }
 .nopadding{
   padding-right: 0;
diff --git a/sass/credentials.scss b/sass/credentials.scss
index b1ea62a4..29c870f5 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -20,13 +20,6 @@
  *
  */
 
-//override nc style to fix wrong offset
-#content {
-  padding-top: 47px !important; // 45px but +2 because of borders
-  height: 100%;
-  width: 100%;
-}
-
 //fix for different heights of passwordicon
 .icon-image-size{
   width: 16px;
@@ -73,8 +66,6 @@
 }
 #app-content {
 
-  margin-left: 300px;
-
   @media only screen and (max-width: 769px) {
     width: 100vw;
   }
@@ -85,11 +76,11 @@
   overflow-x: hidden;
 
   //width: 100%;
-  #app-content-wrapper {
-    min-height: 95%;
-    display:flex;
+  .main_list {
+    //min-height: 95%;
+    //display:flex;
     //hack for missing separatorbar when app-sidebar is opened
-    height: calc(100vh - 49px);
+    //height: calc(100vh - 49px);
 
     #passman-controls {
       text-align: center;
@@ -110,7 +101,7 @@
 
     .title {
       text-align: center;
-      display: inline-block;
+      display: inline-flex;
       font-weight: bold;
       margin-top: 10px;
       @media screen and (max-width: 820px) {
@@ -508,27 +499,20 @@
 
     }
 
-    .main_list{
-      flex:1;
-      float:left;
-      height:auto;
-      overflow:auto;
-      width:100%;
-      .share{
-        overflow:hidden;
-      }
-      .nopasswords{
-        margin-right: auto;
-        margin-left: auto;
-        margin-top: 10%;
-        text-align: center;
-      }
-      .belowList{
-        margin-right: auto;
-        margin-left: auto;
-        margin-top: 1%;
-        text-align: center;
-      }
+    .share{
+      overflow:hidden;
+    }
+    .nopasswords{
+      margin-right: auto;
+      margin-left: auto;
+      margin-top: 10%;
+      text-align: center;
+    }
+    .belowList{
+      margin-right: auto;
+      margin-left: auto;
+      margin-top: 1%;
+      text-align: center;
     }
 
     .app_sidebar {
diff --git a/sass/vaults.scss b/sass/vaults.scss
index 25242c8a..d9e7dc34 100644
--- a/sass/vaults.scss
+++ b/sass/vaults.scss
@@ -36,7 +36,7 @@
   }
 }
 .vault_wrapper{
-  margin:0 auto auto auto;
+  margin: 5em auto auto auto;
 
   max-width: 420px;
   @include border-radius(5px);
@@ -110,4 +110,4 @@
   .vault_wrapper{
     width: 90%;
   }
-}
\ No newline at end of file
+}