diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-05 13:12:07 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-05 13:12:07 +0200 |
| commit | 24641c909ee45e82d5ec7602a3a31e153cbbbb35 (patch) | |
| tree | a3f92bbc99c146351c07f7fecbb2b0d0ccd7e957 | |
| parent | 9e56acbdc9c3196f630251938a5e8f5b5c507f2c (diff) | |
| download | nextcloud-server-24641c909ee45e82d5ec7602a3a31e153cbbbb35.tar.gz nextcloud-server-24641c909ee45e82d5ec7602a3a31e153cbbbb35.zip | |
adjust CSS to styleguide, remove left padding, prevent user-selection
| -rw-r--r-- | core/css/apps.css | 19 | ||||
| -rw-r--r-- | core/css/header.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 18 |
3 files changed, 33 insertions, 8 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index 4bcf89c7ee4..f48750545f3 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -1,4 +1,5 @@ -/* ---- APP STYLING ---- */ +/* APP STYLING -------------------------------------------------------------- */ + #app { height: 100%; @@ -8,6 +9,13 @@ -moz-box-sizing: border-box; box-sizing: border-box; } + + + + +/* APP-NAVIGATION ------------------------------------------------------------*/ + + /* Navigation: folder like structure */ #app-navigation { width: 230px; @@ -17,6 +25,10 @@ background-color: #f8f8f8; border-right: 1px solid #ccc; padding-bottom: 44px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } #app-navigation > ul { position: relative; @@ -166,6 +178,11 @@ + + +/* APP-CONTENT ---------------------------------------------------------------*/ + + /* Part where the content will be loaded into */ #app-content { position: relative; diff --git a/core/css/header.css b/core/css/header.css index 83612c67445..d04895d27cf 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -122,10 +122,6 @@ /* NAVIGATION --------------------------------------------------------------- */ -#content-wrapper { - padding-left: 0; -} - #navigation { position: fixed; top: 45px; diff --git a/core/css/styles.css b/core/css/styles.css index 6eb09e6e942..082a6496a28 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -253,6 +253,10 @@ input[type="submit"].enabled { background: #eee; border-bottom: 1px solid #e7e7e7; z-index: 50; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } #controls .button, #controls button, @@ -272,14 +276,22 @@ input[type="submit"].enabled { display: none; } -#content { position:relative; height:100%; width:100%; } +#content { + position: relative; + height: 100%; + width: 100%; +} #content .hascontrols { position: relative; top: 45px; } #content-wrapper { - position:absolute; height:100%; width:100%; padding-left:80px; padding-top: 45px; - -moz-box-sizing:border-box; box-sizing:border-box; + position: absolute; + height: 100%; + width: 100%; + padding-top: 45px; + -moz-box-sizing:border-box; + box-sizing:border-box; } #emptycontent { |