Skip to content

Commit 2169217

Browse files
committed
design polish on a few items in /files
Fixes: CNVS-28841 test plan: - as a user with the new ui - click the "account" link from the left nav - from the sub-nav click "files" - if you do not have any items uploaded - do so in order to click an item and see the action buttons groupset... a few tweaks have been made to bring it inline with products design example: http://screencast.com/t/QA6E3u5u - next click into a course and from the course sub-nav click "files" - the tweaks from above should be viewable on this page as well example: http://screencast.com/t/85IoRnYwlpiE note: - a comment has been left on the jira regarding the odd course sub-nav placement for files within a course *** wil need to be addressed on a new ticket/commit Change-Id: I49cae6c4057e44076ce9cae0489f02c065927f85 Reviewed-on: https://gerrit.instructure.com/77893 Tested-by: Jenkins Reviewed-by: Chris Hart <chart@instructure.com> Product-Review: Chris Hart <chart@instructure.com> QA-Review: Myller de Araujo <myller@instructure.com>
1 parent a432777 commit 2169217

3 files changed

Lines changed: 19 additions & 9 deletions

File tree

app/jsx/files/Toolbar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define([
3838
className='btn btn-add-folder'
3939
aria-label= {I18n.t('Add Folder')}
4040
>
41-
<i className='icon-plus' />
41+
<i className='icon-plus' />&nbsp;
4242
<span className= {phoneHiddenSet} >
4343
{I18n.t('Folder')}
4444
</span>
@@ -113,7 +113,7 @@ define([
113113
aria-label= {I18n.t('Move')}
114114
dataTooltip= ''
115115
>
116-
<i className='icon-copy-course' />
116+
<i className='icon-updown' />
117117
</button>
118118
);
119119
}

app/jsx/files/UploadButton.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ define([
4848
<button
4949
type= 'button'
5050
className= 'btn btn-primary btn-upload'
51-
ariaLabel= {I18n.t('upload', 'Upload')}
51+
ariaLabel= {I18n.t('Upload')}
5252
onClick= {this.handleAddFilesClick}
5353
>
54-
<i className='icon-upload'/>
54+
<i className='icon-upload'/>&nbsp;
5555
<span className= {this.hiddenPhoneClassname()} >
56-
{ I18n.t('upload', 'Upload') }
56+
{ I18n.t('Upload') }
5757
</span>
5858
</button>
5959
{ this.buildPotentialModal() }

app/stylesheets/pages/react_files/_react_files.scss

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ body:not(.with-left-side) & .ic-app-nav-toggle-and-crumbs--files {
3232
}
3333
}
3434

35-
.ef-main-buttons{
35+
.ef-main-buttons {
3636
.ui-buttonset, .ui-button {
3737
display: inline-block;
3838
}
3939
}
4040

41-
.ef-header{
41+
.ef-header {
4242
@if $use_new_styles {
4343
padding: $ic-sp*2 0 $ic-sp;
4444
border-bottom: 1px solid $ic-border-light;
@@ -51,7 +51,17 @@ body:not(.with-left-side) & .ic-app-nav-toggle-and-crumbs--files {
5151
display: flex;
5252
align-items: center;
5353
}
54-
.ui-buttonset { margin: 0; }
54+
.ui-buttonset {
55+
margin: 0;
56+
}
57+
& .ui-button:first-child {
58+
border-top-left-radius: $borderRadius;
59+
border-bottom-left-radius: $borderRadius;
60+
}
61+
& .ui-button:last-child {
62+
border-top-right-radius: $borderRadius;
63+
border-bottom-right-radius: $borderRadius;
64+
}
5565
}
5666

5767
.ef-search-form {
@@ -86,7 +96,7 @@ body:not(.with-left-side) & .ic-app-nav-toggle-and-crumbs--files {
8696
flex: 1;
8797
display: flex;
8898
justify-content: flex-end;
89-
> * { margin-left: $ic-sp/4; }
99+
> * { margin-left: $ic-sp/3; }
90100
}
91101

92102
.ef-main{

0 commit comments

Comments
 (0)