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

Jump to bottom

Fit newFileMenu to css guidelines #3118

Merged
merged 4 commits into from
Jan 23, 2017
Merged

Fit newFileMenu to css guidelines #3118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
418ebfb
fit newFileMenu to css guidelines
skjnldsv Jan 17, 2017
961fcfa
Popover positionning and classes
skjnldsv Jan 21, 2017
3d86275
Popover positionning fix
skjnldsv Jan 21, 2017
0fc0bcf
Popover newFolder input fix
skjnldsv Jan 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
41 changes: 9 additions & 32 deletions apps/files/css/files.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,46 +768,20 @@ html.ie8 #controls .button.new {
}

.newFileMenu {
width: 200px;
margin-left: -56px;
margin-top: 25px;
font-weight: 300;
top: 100%;
margin-top: 4px;
min-width: 100px;
margin-left: 7px;
z-index: 1001;
}

.newFileMenu .menuitem {
white-space: nowrap;
overflow: hidden;
}
.newFileMenu.popovermenu a.menuitem,
.newFileMenu.popovermenu label.menuitem,
.newFileMenu.popovermenu .menuitem {
padding: 0;
margin: 0;
}

.newFileMenu.popovermenu a.menuitem.active {
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
}

.newFileMenu.bubble:after {
left: 75px;
right: auto;
}
.newFileMenu.bubble:before {
left: 75px;
right: auto;
}

.newFileMenu .filenameform {
display: inline-block;
}

.newFileMenu .filenameform input {
width: 100%;
box-sizing: border-box;
margin: -2px 0;
margin: 2px 0;
}

#fileList .popovermenu .action {
Expand Down Expand Up @@ -835,6 +809,9 @@ html.ie8 #controls .button.new {
height: 15px;
}

.app-files .actions .button.new {
position: relative;
}
.app-files .actions .button.new .icon {
margin-bottom: 2px;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2951,7 +2951,7 @@
this._newFileMenu = new OCA.Files.NewFileMenu({
fileList: this
});
$('body').append(this._newFileMenu.$el);
$('.actions').append(this._newFileMenu.$el);
}
this._newFileMenu.showAt($target);

Expand Down
10 changes: 2 additions & 8 deletions apps/files/js/newfilemenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
*/
var NewFileMenu = OC.Backbone.View.extend({
tagName: 'div',
className: 'newFileMenu popovermenu bubble hidden open menu',
// Menu is opened by default because it's rendered on "add-button" click
className: 'newFileMenu popovermenu bubble menu open menu-left',

events: {
'click .menuitem': '_onClickAction'
Expand Down Expand Up @@ -235,13 +236,6 @@
*/
showAt: function($target) {
this.render();
var targetOffset = $target.offset();
this.$el.css({
left: targetOffset.left,
top: targetOffset.top + $target.height()
});
this.$el.removeClass('hidden');

OC.showMenu(null, this.$el);
}
});
Expand Down