Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App navigation flex #6399

Merged
merged 61 commits into from
Sep 21, 2017
+375 −225
Merged

App navigation flex #6399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
d9770a1
Simplification and reorganisation
skjnldsv Sep 7, 2017
f11b36d
Removed unused old vars and reorganize
skjnldsv Sep 7, 2017
4d2a7fe
Icon auto-padding fix
skjnldsv Sep 7, 2017
d85781d
Allow counter inside a to be clickable
skjnldsv Sep 7, 2017
0a67e0e
Navigation flex magic
skjnldsv Sep 7, 2017
a93bbae
Second menu padding and ellipsis fix
skjnldsv Sep 7, 2017
fb968a3
Fix counter inside link and highlight submenu as well
skjnldsv Sep 7, 2017
37d3310
Fix app navigation positionning
skjnldsv Sep 7, 2017
f5ae444
Fixed collapsible and Folders
skjnldsv Sep 8, 2017
4e245ae
Animate hide/show collapsible menus
skjnldsv Sep 8, 2017
6978420
Organize app-navigation menu types
skjnldsv Sep 8, 2017
adffaff
Fix typo
skjnldsv Sep 8, 2017
0492964
Removed animation breaking things and open submenu which arent .colla…
skjnldsv Sep 9, 2017
da232d4
Fix editable entry design and flex
skjnldsv Sep 10, 2017
76f055d
Delete and edit animation
skjnldsv Sep 10, 2017
d0013b1
merge animation into same prop
skjnldsv Sep 10, 2017
82986ba
Cleanup
skjnldsv Sep 10, 2017
4a3efdc
Add inline style padding
skjnldsv Sep 10, 2017
b0f7ad1
Finally force the menu to be a first-child of app-navigation
skjnldsv Sep 10, 2017
ef41a55
Cleanup 2
skjnldsv Sep 10, 2017
c6ac46f
Fix menu submenu after eec58ae32b0adf35af3aa550c1b1fe21bc2e963a
skjnldsv Sep 10, 2017
c9719ca
Syntax fix and collapse button padding if no icon on link
skjnldsv Sep 10, 2017
43f3fad
Icon fix for sub-items
skjnldsv Sep 12, 2017
a8df5c2
Removed collapsible button requirements, and animate submenu deletion
skjnldsv Sep 12, 2017
6ff81cd
Animation fix
skjnldsv Sep 12, 2017
54bdec8
Fixed comment
skjnldsv Sep 12, 2017
9510d88
Retro compatibility collapse button hide
skjnldsv Sep 12, 2017
681a4ba
Improve collapse animation
skjnldsv Sep 13, 2017
e2c65cf
no need for overflow, let the opacity trick the user and the animatio…
skjnldsv Sep 13, 2017
ce36b13
Max height to 9999
skjnldsv Sep 13, 2017
bd520cb
Added bullet class and fixed comments
skjnldsv Sep 14, 2017
97b6148
Fix deletion/edit supperposition
skjnldsv Sep 14, 2017
63bcd47
Finally removed old legacy code
skjnldsv Sep 14, 2017
04a0c3c
Hide bullet & icons if menu has loading icon
skjnldsv Sep 14, 2017
e9d5960
Loading position fix
skjnldsv Sep 14, 2017
728e00b
Fix github color highlighter
skjnldsv Sep 14, 2017
085d963
Icon shifting and unification of padding
skjnldsv Sep 14, 2017
ee051b5
Removed unused props
skjnldsv Sep 14, 2017
f2f0685
Loader fix on main entry
skjnldsv Sep 14, 2017
99598d3
Padding for deleted and editing entries
skjnldsv Sep 14, 2017
f43b832
Align edit input with its corresponding link text and fix animation
skjnldsv Sep 14, 2017
f721cc5
Fix entry edit buttons borders
skjnldsv Sep 14, 2017
9b47202
Flex to menu items
skjnldsv Sep 16, 2017
edc9f17
Allow custom classes on nav entries
skjnldsv Sep 17, 2017
3e25dcf
Add pinned class to trashbin
skjnldsv Sep 17, 2017
02db24d
Add possibility to pin nav entries at the bottom
skjnldsv Sep 17, 2017
3cdfd21
Removed unwanted css and add quota icon
skjnldsv Sep 17, 2017
46dcf3e
Unwanted css for trashbin
skjnldsv Sep 17, 2017
151c0cb
Unwanted css for trashbin
skjnldsv Sep 17, 2017
2010c13
Quota order
skjnldsv Sep 17, 2017
11023aa
Fix quota order
skjnldsv Sep 17, 2017
05c48da
hack first class occurence .pinned
skjnldsv Sep 17, 2017
231e475
Quota.svg
skjnldsv Sep 17, 2017
3ff60c3
create special class forst first pinned class occurrence
skjnldsv Sep 17, 2017
4b57f68
Fix unit tests
MorrisJobke Sep 18, 2017
85300ab
Quota icon by @jancborchardt
skjnldsv Sep 19, 2017
c66f16a
Relative positionning to li
skjnldsv Sep 19, 2017
3e6b93e
Fix editing field animation
skjnldsv Sep 19, 2017
8ac8773
damn you firefox default values
skjnldsv Sep 19, 2017
0e17b65
Avoid error undefined index classes in log
skjnldsv Sep 20, 2017
eb00dbb
Fix tests
rullzer Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,8 @@
.nav-icon-trashbin {
background-image: url('../img/delete.svg?v=1');
}
/* no icon for the quota bar */
.nav-icon-quota {
padding-left: 15px !important;
background-image: url('../img/quota.svg?v=1');
}

#app-navigation .nav-files a.nav-icon-files {
Expand Down Expand Up @@ -777,11 +776,7 @@ table.dragshadow td.size {
margin: 0 !important;
border: none;
border-radius: 0;
position: fixed !important;
bottom: 44px;
width: inherit !important;
background-color: #fff;
border-right: 1px solid #eee;
background-color: transparent;
z-index:1;

.quota-container {
Expand All @@ -795,11 +790,6 @@ table.dragshadow td.size {
}
}

/* increase the padding of the last item to not hide below the quota item */
.app-files #app-navigation > ul li:nth-last-child(1) {
margin-bottom: 44px;
}

#quotatext {
padding: 0;
height: 30px;
Expand Down
4 changes: 4 additions & 0 deletions apps/files/img/quota.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 12 additions & 9 deletions apps/files/templates/appnavigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<div id="app-navigation">
<ul class="with-icon">
<li id="quota" class="section <?php
<?php $pinned = 0 ?>
<?php foreach ($_['navigationItems'] as $item) {
strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
?>
<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned===1?'first-pinned':'') ?>">
<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
<?php p($item['name']);?>
</a>
</li>
<?php } ?>
<li id="quota" class="section pinned <?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
} ?>">
Expand All @@ -18,14 +29,6 @@
</div>
</a>
</li>
<?php foreach ($_['navigationItems'] as $item) { ?>
<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">
<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
<?php p($item['name']);?>
</a>
</li>
<?php } ?>
</ul>
<div id="app-settings">
<div id="app-settings-header">
Expand Down
8 changes: 8 additions & 0 deletions apps/files/tests/Controller/ViewControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'recent',
Expand All @@ -152,6 +153,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'favorites',
Expand All @@ -162,6 +164,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'sharingin',
Expand All @@ -172,6 +175,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'sharingout',
Expand All @@ -182,6 +186,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'sharinglinks',
Expand All @@ -192,6 +197,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'systemtagsfilter',
Expand All @@ -202,6 +208,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => '',
],
[
'id' => 'trashbin',
Expand All @@ -212,6 +219,7 @@ public function testIndexWithRegularBrowser() {
'active' => false,
'icon' => '',
'type' => 'link',
'classes' => 'pinned',
],
]);

Expand Down
1 change: 1 addition & 0 deletions apps/files_trashbin/appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
'script' => 'list.php',
'order' => 50,
'name' => $l->t('Deleted files'),
'classes' => 'pinned',
];
});
14 changes: 0 additions & 14 deletions apps/files_trashbin/css/trash.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,3 @@
display: none;
}

/* move Deleted Files to bottom of sidebar */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only 3 declarations left in this file - can we move them somewhere else?

.nav-trashbin {
position: fixed !important;
bottom: 88px;
width: inherit !important;
background-color: #fff;
border-right: 1px solid #eee;
margin-bottom: 0px !important;
}
/* double padding to account for Deleted files entry, issue with Firefox */
.app-files #app-navigation > ul li:nth-last-child(2) {
margin-bottom: 88px;
}

Loading