Merge pull request #7817 from owncloud/app-navigation-for-apps

Makes #app-navigation a part of app management.

1 files changed, 6 insertions, 21 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5dd41256918..b2c09571404 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -57,13 +57,7 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 
-li.selected,
-#leftcontent li.selected {
-	background-color: #ddd;
-}
-
 table.grid { width:100%; }
-#rightcontent { padding-left: 10px; }
 div.quota {
 	float: right;
 	display: block;
@@ -101,30 +95,21 @@ select.quota.active { background: #fff; }
 /* APPS */
 .appinfo { margin: 1em 40px; }
 h3 { font-size: 1.4em; font-weight: bold; }
-ul.applist a {
-	height: 2.2em;
-	padding: 0.2em 0.2em 0.2em 0.8em !important;
+#app-navigation {
+	padding-bottom: 0px;
 }
-ul.applist .app-external {
-	width: 100%;
-}
-li { color:#888; }
-li.active { color:#000; }
-#leftcontent .appwarning {
+#app-navigation .appwarning {
 	background: #fcc;
 }
-#leftcontent .appwarning:hover {
+#app-navigation.appwarning:hover {
 	background: #fbb;
 }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.externalapp.list { float: right; }
 small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.recommendedapp.list { float: right; }
+small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; }
 span.version { margin-left:1em; margin-right:1em; color:#555; }
 
-.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
-.app.externalapp { max-width: 12.5em; }
-.app.recommendedapp { max-width: 12.5em; }
+
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }