Skip to content
This repository was archived by the owner on Jul 6, 2020. It is now read-only.

Commit 0d68f95

Browse files
author
Bernhard Posselt
committed
fix #718
1 parent edd87fa commit 0d68f95

File tree

13 files changed

+159
-13
lines changed

13 files changed

+159
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
owncloud-news (6.0.4)
22
* **Bugfix**: Allow YouTube videos to go fullscreen, #857
3+
* **Enhancement**: Group plugins in menu, #718
34

45
owncloud-news (6.0.3)
56
* **Enhancement**: Allow to pin feeds, #848

appinfo/checksum.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

css/content.css

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,85 @@
285285
background-image: url('../img/active_star.svg');
286286
}
287287

288+
#app-content .utils .more button {
289+
opacity: .3;
290+
}
291+
292+
#app-content .utils .more button:hover {
293+
opacity: 1;
294+
}
295+
296+
#app-content .utils .more {
297+
position: relative;
298+
}
299+
300+
#app-content .article-actions {
301+
display: none;
302+
filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
303+
-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
304+
-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
305+
position: absolute;
306+
top: 40px;
307+
border-radius: 3px;
308+
z-index: 1000;
309+
border: 1px solid transparent;
310+
background-color: #fff;
311+
margin: 0;
312+
padding: 0;
313+
}
314+
315+
#app-content .article-actions ul {
316+
display: flex;
317+
float: left;
318+
}
319+
320+
#app-content .article-actions li {
321+
float: left;
322+
width: 38px !important;
323+
}
324+
325+
#app-content #articles:not(.compact) .article-actions {
326+
left: 6px;
327+
}
328+
329+
#app-content #articles:not(.compact) .article-actions:after,
330+
#app-content #articles:not(.compact) .article-actions:before {
331+
left: 20px;
332+
}
333+
334+
#app-content #articles.compact .article-actions {
335+
right: -10px;
336+
}
337+
338+
#app-content #articles.compact .article-actions:after,
339+
#app-content #articles.compact .article-actions:before {
340+
right: 9px;
341+
}
342+
343+
#app-content .article-actions:after,
344+
#app-content .article-actions:before {
345+
bottom: 100%;
346+
border: solid transparent;
347+
content: " ";
348+
height: 0;
349+
width: 0;
350+
position: absolute;
351+
pointer-events: none;
352+
}
353+
354+
#app-content .article-actions:after {
355+
border-color: rgba(255, 255, 255, 0);
356+
border-bottom-color: #fff;
357+
border-width: 5px;
358+
margin-left: -5px;
359+
}
360+
#app-content .article-actions:before {
361+
border-color: rgba(255, 255, 255, 0);
362+
border-bottom-color: #fff;
363+
border-width: 9px;
364+
margin-left: -9px;
365+
}
366+
288367
/**
289368
* Article title
290369
*/

css/mobile.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
}
1111

1212
@media (max-width: 600px) {
13+
#app-content .article-actions ul {
14+
max-width: 164px;
15+
}
16+
1317
#app-content .heading .date {
1418
display: none;
1519
}
@@ -27,3 +31,9 @@
2731
padding-left: 44px;
2832
}
2933
}
34+
35+
@media (max-width: 340px) {
36+
#app-content .article-actions {
37+
max-width: 82px;
38+
}
39+
}

css/news.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/news.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/build/app.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2659,19 +2659,24 @@ app.directive('newsAddFeed', ["$rootScope", "$timeout", function ($rootScope, $t
26592659
app.directive('newsArticleActions', function () {
26602660
'use strict';
26612661
return {
2662-
restrict: 'E',
2662+
restrict: 'A',
26632663
scope: {
2664-
'article': '='
2664+
newsArticleActions: '='
26652665
},
26662666
link: function (scope, elem) {
26672667
var plugins = News.getArticleActionPlugins();
26682668

26692669
for (var i=0; i<plugins.length; i+=1) {
2670-
plugins[i](elem, scope.article);
2670+
plugins[i](elem, scope.newsArticleActions);
2671+
}
2672+
2673+
if (plugins.length === 0) {
2674+
$('#app-content .more').hide();
26712675
}
26722676
}
26732677
};
26742678
});
2679+
26752680
app.directive('newsAutoFocus', ["$timeout", function ($timeout) {
26762681
'use strict';
26772682
return function (scope, elem, attrs) {
@@ -3076,6 +3081,22 @@ app.directive('newsTitleUnreadCount', ["$window", function ($window) {
30763081
};
30773082

30783083
}]);
3084+
app.directive('newsToggleShow', function () {
3085+
'use strict';
3086+
return {
3087+
restrict: 'A',
3088+
scope: {
3089+
'newsToggleShow': '@'
3090+
},
3091+
link: function (scope, elem) {
3092+
elem.click(function () {
3093+
var target = $(scope.newsToggleShow);
3094+
target.toggle();
3095+
});
3096+
}
3097+
};
3098+
});
3099+
30793100
app.directive('newsTriggerClick', function () {
30803101
'use strict';
30813102

js/build/app.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/build/app.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/directive/NewsArticleActions.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010
app.directive('newsArticleActions', function () {
1111
'use strict';
1212
return {
13-
restrict: 'E',
13+
restrict: 'A',
1414
scope: {
15-
'article': '='
15+
newsArticleActions: '='
1616
},
1717
link: function (scope, elem) {
1818
var plugins = News.getArticleActionPlugins();
1919

2020
for (var i=0; i<plugins.length; i+=1) {
21-
plugins[i](elem, scope.article);
21+
plugins[i](elem, scope.newsArticleActions);
22+
}
23+
24+
if (plugins.length === 0) {
25+
$('#app-content .more').hide();
2226
}
2327
}
2428
};
25-
});
29+
});

0 commit comments

Comments
 (0)