fix up content and content-wrapper merge ...

diff --cc apps/files/css/files.css
Simple merge

diff --cc core/css/styles.css
index 0124fa854e9ca93d0ab7b2754b66e16767b00a24,7771fd52b9edc944c2919cb53f6bde122cf5ce72..4d6efdd5c48960a02a491056c314fb5ad8afe27f
--- 1/core/css/styles.css
--- 2/core/css/styles.css
+++ b/core/css/styles.css
@@@ -93,15 -94,8 +93,13 @@@ input[type="submit"].enabled { backgrou
  /* CONTENT ------------------------------------------------------------------ */
  #controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
  #controls .button { display:inline-block; }
- #content { 
-       height: 100%; 
-       width: 100%;
-       padding-top: 3.5em;
-       padding-left: 64px;
-       box-sizing: border-box;
-       -moz-box-sizing: border-box;
 -#content { height: 100%; width: 100%; position: relative; }
 -#content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
++
++#content { position:relative; height:100%; width:100%; }
++#content-wrapper {
++      position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
++      -moz-box-sizing:border-box; box-sizing:border-box;
 +}
- /* TODO check if this is better: #content { top:3.5em; left:12.5em; position:absolute; } */
++
  #leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
  #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
  #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }

diff --cc core/templates/layout.user.php
index e1d6607b851bfde82d79edbae66ad65ed9c2d731,a16d2c9e55d0f0807695427f99871c7676a3cad6..93cf494163b123e5a013d1e985de9a1551fd0739
--- 1/core/templates/layout.user.php
--- 2/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@@ -81,10 -55,22 +81,12 @@@
                                        </li>
                                <?php endforeach; ?>
                        </ul>
 -
 -                      <ul id="settings" class="svg">
 -                              <img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
 -                              <span><?php echo $l->t('Settings');?></span>
 -                              <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
 -                              <?php foreach($_['settingsnavigation'] as $entry):?>
 -                                      <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
 -                              <?php endforeach; ?>
 -                              </div>
 -                      </ul>
                </div></nav>
  
-               <div id="content">
-                       <?php echo $_['content']; ?>
+               <div id="content-wrapper">
+                       <div id="content">
+                               <?php echo $_['content']; ?>
+                       </div>
                </div>
        </body>
  </html>