diff options
| -rw-r--r-- | css/feeds.css | 18 | ||||
| -rw-r--r-- | css/owncloud.css | 56 | ||||
| -rw-r--r-- | templates/main.php | 4 |
3 files changed, 37 insertions, 41 deletions
diff --git a/css/feeds.css b/css/feeds.css index 65073b520..ab7eef696 100644 --- a/css/feeds.css +++ b/css/feeds.css @@ -10,22 +10,22 @@ font-weight: bold; } -#left-content .unread > a { +#app-navigation .unread > a { padding-right: 32px; } -#left-content .utils { +#app-navigation .utils { position: absolute; right: 0; top: 0; bottom: 0; } -#left-content .utils > * { +#app-navigation .utils > * { float: right; } -#left-content .utils button { +#app-navigation .utils button { margin: 0; background-position: center; background-repeat: no-repeat; @@ -37,7 +37,7 @@ width: 32px; } -#left-content li:hover .utils button { +#app-navigation li:hover .utils button { display: block; } @@ -69,15 +69,15 @@ button.action:hover { } -#left-content li:hover > a { +#app-navigation li:hover > a { padding-right: 98px; } -#left-content li:hover > .utils { +#app-navigation li:hover > .utils { display: block; } -#left-content li:hover > .utils .unread-counter { +#app-navigation li:hover > .utils .unread-counter { padding-right: 0; } @@ -93,6 +93,6 @@ button.action:hover { background-image: url('%appswebroot%/news/img/rss.svg'); } -#left-content .ui-draggable-dragging { +#app-navigation .ui-draggable-dragging { width: 249px; }
\ No newline at end of file diff --git a/css/owncloud.css b/css/owncloud.css index 699a3021e..92013924c 100644 --- a/css/owncloud.css +++ b/css/owncloud.css @@ -19,10 +19,6 @@ * */ -/** - * Contains default left-content design stuff - */ - /* needed for angularjs */ #app { height: 100%; @@ -30,7 +26,7 @@ } /* Basic layout */ -#left-content { +#app-navigation { width: 250px; height: 100%; float: left; @@ -40,19 +36,19 @@ padding-bottom: 32px; } -#right-content { +#app-content { height: 100%; overflow-y: auto; } -/* left-content lists */ -#left-content > ul { +/* app-navigation lists */ +#app-navigation > ul { height: 100%; overflow: auto; -moz-box-sizing: border-box; box-sizing: border-box; } -#left-content li { +#app-navigation li { width: 100%; position: relative; -moz-box-sizing: border-box; @@ -60,31 +56,31 @@ text-shadow: 0 1px 0 rgba(255, 255, 255, .9); } -#left-content li.active { +#app-navigation li.active { background-color: #ccc; text-shadow: 0 1px 0 rgba(255,255,255,.7); } -#left-content > ul > li { +#app-navigation > ul > li { border-bottom: 1px solid #ddd; border-top: 1px solid #fff; background-color: #eee; } -#left-content > ul > li.active { +#app-navigation > ul > li.active { border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; } -#left-content ul.with-icon a { +#app-navigation ul.with-icon a { background-size: 16px 16px; background-repeat: no-repeat; background-position: 10px center; padding-left: 32px; } -#left-content li > a { +#app-navigation li > a { width: 100%; padding: 0 16px; overflow: hidden; @@ -97,20 +93,20 @@ color: #333; } -#left-content > ul > li:hover { +#app-navigation > ul > li:hover { border-top: 1px solid #ccc; } -#left-content li:hover > a { +#app-navigation li:hover > a { background-color: #ccc; } /* collapsible */ -#left-content li.collapsible { +#app-navigation li.collapsible { } -#left-content li.collapsible > button.collapse { +#app-navigation li.collapsible > button.collapse { display: none; position: absolute; left: 6px; @@ -128,15 +124,15 @@ display: none; } -#left-content li.collapsible:hover > a { +#app-navigation li.collapsible:hover > a { background-image: none; } -#left-content li.collapsible:hover > button.collapse { +#app-navigation li.collapsible:hover > button.collapse { display: block; } -#left-content li.collapsible button.collapse { +#app-navigation li.collapsible button.collapse { -moz-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); -ms-transform:rotate(-90deg); @@ -144,7 +140,7 @@ transform: rotate(-90deg); } -#left-content li.collapsible.open button.collapse { +#app-navigation li.collapsible.open button.collapse { -moz-transform: rotate(0); -webkit-transform: rotate(0); -ms-transform:rotate(0); @@ -153,20 +149,20 @@ } /* Second level nesting for lists */ -#left-content > ul ul { +#app-navigation > ul ul { display: none; } -#left-content > ul ul li > a { +#app-navigation > ul ul li > a { padding-left: 32px; } -#left-content > ul.with-icon ul li > a { +#app-navigation > ul.with-icon ul li > a { padding-left: 48px; background-position: 24px center; } -#left-content .open { +#app-navigation .open { background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); @@ -174,13 +170,13 @@ background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); } -#left-content > ul li.open:hover { +#app-navigation > ul li.open:hover { -webkit-box-shadow: inset 0 0 3px #cccccc; box-shadow: inset 0 0 3px #cccccc; border-top: 1px solid #ccc; } -#left-content > ul li.open ul { +#app-navigation > ul li.open ul { display: block; } @@ -237,13 +233,13 @@ background-color: #ddd; } -#left-content .personalblock > legend { +#app-navigation .personalblock > legend { padding: 10px 0; margin: 0; } -#left-content .error { +#app-navigation .error { color: #DD1144; } diff --git a/templates/main.php b/templates/main.php index cff8611bf..5a62a0a92 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,5 +1,5 @@ <div id="app" ng-app="News"> - <div id="left-content" ng-controller="FeedController"> + <div id="app-navigation" ng-controller="FeedController"> <ul class="with-icon" data-id="0" droppable> <?php print_unescaped($this->inc('part.addnew')) ?> @@ -26,7 +26,7 @@ </div> - <div id="right-content" ng-class="{loading: loading.loading>0}" + <div id="app-content" ng-class="{loading: loading.loading>0}" ng-controller="ItemController" when-scrolled="scroll()" feed-navigation> <?php print_unescaped($this->inc("part.items")); ?> </div> |