diff options
-rw-r--r-- | css/app.css | 1 | ||||
-rw-r--r-- | css/content.css | 17 | ||||
-rw-r--r-- | js/package-lock.json | 30 | ||||
-rw-r--r-- | js/package.json | 10 | ||||
-rw-r--r-- | templates/index.php | 2 |
5 files changed, 35 insertions, 25 deletions
diff --git a/css/app.css b/css/app.css index 229cee81a..b0eaa3fa8 100644 --- a/css/app.css +++ b/css/app.css @@ -9,7 +9,6 @@ */ #global-loading { width: 100%; - height: 100%; } #undo-container { diff --git a/css/content.css b/css/content.css index b21aff528..57b4b22df 100644 --- a/css/content.css +++ b/css/content.css @@ -7,6 +7,14 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @copyright Bernhard Posselt 2014 */ + +#app-content { + width: 100% +} +#app-navigation:not(.hidden) + #app-content { + width: calc(100% - 300px); +} + #app-content #searchresults { display: none; } @@ -47,17 +55,20 @@ * Podcast settings */ #app-content .podcast { - height: 30px; + height: 50px; z-index: 10000; background-color: #111; + display: flex; + position: sticky; + top: 50px; + align-items: center; } #app-content .podcast audio { display: block; - float: left; width: calc(100% - 60px); - height: 30px; border-radius: 0; + height: inherit; } #app-content .podcast button, diff --git a/js/package-lock.json b/js/package-lock.json index 877e8894e..26893ce09 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -92,29 +92,29 @@ "dev": true }, "angular": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.2.tgz", - "integrity": "sha512-JcKKJbBdybUsmQ6x1M3xWyTYQ/ioVKJhSByEAjqrhmlOfvMFdhfMqAx5KIo8rLGk4DFolYPcCSgssjgTVjCtRQ==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.3.tgz", + "integrity": "sha512-hQRhU56shs72y88cS0Uy9g+UAMHoztJ3V+r+iF8o1AK/Bpu8ewmjFDk9j2LjSuN05a9mhxW1rOHnYKOwyTS/Zg==" }, "angular-animate": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.2.tgz", - "integrity": "sha512-/MQL2FEFXhdzFUKJ9AJq6gAYz3YGsh2xHTztuQKY5FkqjEBpF5YGypgprTz153P7t51T8nFqLsG8jwkpRdM6gg==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.3.tgz", + "integrity": "sha512-RIYQhql+jUU13jwTrXemSMYTfbGuLBr7jh67R3UbR2yCQ8IOxcXHn2tx+hm8PwXX8agsFAQjWSPP5wam5ecuSg==" }, "angular-mocks": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.2.tgz", - "integrity": "sha512-yj9eWPG0usXX2eDTWM6YOmAGKraT7qHwuD+NrNyaR+mtrNr2ls77WuWXTjE1hZpmxTaGj4+R1nMY696XZn740Q==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.3.tgz", + "integrity": "sha512-j9JZxJiTdwr1oZPtQQFSMpfNZiY+LzKJaodVeWCdXMA1+mOXxS2f8k0yEnG618O2LHd/MU8z3IibyVgbl9xuiA==" }, "angular-route": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.2.tgz", - "integrity": "sha512-YshcsuhYThFbuQqWDhDvxaZtwlwV6M7dPzB2Eit215t0zx/78A7SSKGtw8SsqYyPCealrgD2QWdv4iY7kl6l1w==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.3.tgz", + "integrity": "sha512-/x6kLCeiG9BCi4DZeuuPfK1G05w69uwu7x69hL4eqSq5VOUkmkbFK1oM2pIKPwkATSYT2QKK0rwPydZNBUvCsw==" }, "angular-sanitize": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.2.tgz", - "integrity": "sha512-8XmhwhT+TwnLzz4VMq9kIqj9b2aBt4lgYWRw9s+Q8ysx0z/glDcnoPxMrlR/dXItlww8NM/1pscgO1bGVGdiXA==" + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.3.tgz", + "integrity": "sha512-2t5BXXx0/4qGdGp54eCvT+1fM+yFP2ub5TnNFIpJDeSrPwlQD8ThesOWxEsBnr+3UVKTE/TzX2Q4g8qjQXhDzw==" }, "ansi-cyan": { "version": "0.1.1", diff --git a/js/package.json b/js/package.json index 2520efe96..3817ca3e6 100644 --- a/js/package.json +++ b/js/package.json @@ -51,11 +51,11 @@ "karma-jasmine": "^1.1.2" }, "dependencies": { - "angular": "^1.7.2", - "angular-animate": "^1.7.2", - "angular-mocks": "^1.7.2", - "angular-route": "^1.7.2", - "angular-sanitize": "^1.7.2", + "angular": "^1.7.3", + "angular-animate": "^1.7.3", + "angular-mocks": "^1.7.3", + "angular-route": "^1.7.3", + "angular-sanitize": "^1.7.3", "debug": "^2.6.8", "masonry-layout": "^4.2.2", "moment": "^2.22.2" diff --git a/templates/index.php b/templates/index.php index c3c1f7feb..1e95667c2 100644 --- a/templates/index.php +++ b/templates/index.php @@ -45,7 +45,7 @@ foreach (Plugin::getScripts() as $appName => $fileName) { ng-controller="NavigationController as Navigation" ng-hide="App.loading.isLoading('global')"> - <news-search on-search="Navigation.search" class="ng-hide"></news-search> + <news-search on-search="Navigation.search"></news-search> <news-title-unread-count unread-count="{{ Navigation.getUnreadCount() }}"> </news-title-unread-count> |