summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-12-09 13:32:28 +0100
committerVincent Petry <pvince81@owncloud.com>2014-05-15 17:51:04 +0200
commit9ccb3279dd09b7042ab07c936a4c04127282476f (patch)
treed310007de95b3dae9970ec999b808dad09bd780b /core/css
parent04f73275ba222f0aae80cf80890477b141cd4902 (diff)
downloadnextcloud-server-9ccb3279dd09b7042ab07c936a4c04127282476f.tar.gz
nextcloud-server-9ccb3279dd09b7042ab07c936a4c04127282476f.zip
Added app navigation for files app
- Added links to trashbin and shared dir - Moved "WebDAV" settings block to the app nav's settings section - Added sidebar support in trashbin app as well
Diffstat (limited to 'core/css')
-rw-r--r--core/css/apps.css3
-rw-r--r--core/css/styles.css5
2 files changed, 3 insertions, 5 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index a0bb262854d..377878467c0 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -178,6 +178,9 @@
bottom: 0;
border-top: 1px solid #ccc;
}
+#app-settings.opened #app-settings-content {
+ display: block;
+}
#app-settings-header {
background-color: #eee;
}
diff --git a/core/css/styles.css b/core/css/styles.css
index d21e6bc6907..b99af47ff37 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -302,11 +302,6 @@ input[type="submit"].enabled {
border-bottom: 1px solid #e7e7e7;
z-index: 50;
}
-/* account for shift of controls bar due to app navigation */
-#body-user #controls,
-#body-settings #controls {
- padding-left: 80px;
-}
#controls .button,
#controls button,
#controls input[type='submit'],