Skip to content

Commit a639b15

Browse files
committed
Merge branch 'hotfix/22.6.2'
2 parents ea5260a + 94248ec commit a639b15

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [22.6.2] - 2022-6-24
8+
### Hotfix
9+
- Fix long file name display issue
10+
711
## [22.6.1] - 2022-6-23
812
### Hotfix
913
- Fix bug where users can initiate moving a folder to within itself

lib/osf-components/addon/components/file-browser/file-item/styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
justify-content: space-between;
55
padding: 12px 0;
66
border-top: solid 1px $color-border-gray;
7-
height: 60px;
7+
min-height: 60px;
88

99
span {
1010
margin: 0 6px;
@@ -67,7 +67,7 @@
6767

6868
.FileList__item__options {
6969
display: flex;
70-
align-items: flex-end;
70+
align-items: center;
7171
flex: 1;
7272
}
7373

lib/osf-components/addon/components/file-browser/folder-item/styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
justify-content: space-between;
55
padding: 12px 0;
66
border-top: solid 1px $color-border-gray;
7-
height: 60px;
7+
min-height: 60px;
88

99
span {
1010
margin: 0 6px;
@@ -61,7 +61,7 @@
6161

6262
.FileList__item__options {
6363
display: flex;
64-
align-items: flex-end;
64+
align-items: center;
6565
flex: 1;
6666
}
6767

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-osf-web",
3-
"version": "22.6.1",
3+
"version": "22.6.2",
44
"description": "Ember front-end for the Open Science Framework",
55
"license": "Apache-2.0",
66
"author": "Center for Open Science <support@cos.io>",

0 commit comments

Comments
 (0)