Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

File attachment padding #845

Merged
merged 23 commits into from
Jul 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a7e37d1
Ng4 upgrade (#799)
Blackbaud-PatrickOFriel Jun 14, 2017
d2caa3a
Updated version of Stache (#805)
Blackbaud-SteveBrush Jun 16, 2017
c1d2d85
update travis scripts (#806)
Blackbaud-PatrickOFriel Jun 16, 2017
10e9cab
Update visual baseline with logging (#807)
Blackbaud-PatrickOFriel Jun 16, 2017
863b2bf
Travis build 1644 pushed to skyux2 [ci skip]
blackbaud-sky-build-user Jun 16, 2017
29a7c7a
Changelog and package updates for rc.0 (#808)
Blackbaud-PatrickOFriel Jun 16, 2017
fc7b73f
Merge 32 (#816)
Blackbaud-PatrickOFriel Jun 20, 2017
a409fba
Updates for rc.1 (#817)
Blackbaud-PatrickOFriel Jun 20, 2017
4d4d26a
Update karma firefox (#818)
Blackbaud-PatrickOFriel Jun 21, 2017
95dba71
Drop down primary (#819)
Blackbaud-SandhyaRajasabeson Jun 21, 2017
963c999
Updated versions of Stache, Builder (#821)
Blackbaud-SteveBrush Jun 23, 2017
25d137f
Merging master branch, Release 2.0.0-beta.2 (#826)
Blackbaud-SteveBrush Jun 23, 2017
843c45d
scss class
Blackbaud-SandhyaRajasabeson Jun 28, 2017
f89531a
Tab keyboard support (#843)
Blackbaud-SandhyaRajasabeson Jun 29, 2017
01c6435
Added scss classes
Blackbaud-SandhyaRajasabeson Jun 29, 2017
922c4fb
Added animation polyfill (#841)
Blackbaud-SandhyaRajasabeson Jun 29, 2017
0f98384
More class changes in html
Blackbaud-SandhyaRajasabeson Jun 29, 2017
4977b2b
Text Highlight directive (#839)
Blackbaud-AdamHickey Jun 29, 2017
e4f7b1c
Deleted h4 h5 styling in sass
Blackbaud-SandhyaRajasabeson Jun 30, 2017
c1abea7
Font family, stray h4, margin bottom
Blackbaud-SandhyaRajasabeson Jun 30, 2017
59120b1
Merge branch 'rc-ng4-upgrade' into file-attachment-padding
Blackbaud-PatrickOFriel Jun 30, 2017
215ffbc
Merge branch 'master' into file-attachment-padding
Blackbaud-PatrickOFriel Jul 6, 2017
0daf710
whitespace bump
Blackbaud-PatrickOFriel Jul 7, 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
2 changes: 1 addition & 1 deletion src/app/learn/reference/cli-commands/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<li><p><stache-code>skyux version</stache-code> or <stache-code>skyux -v</stache-code> — Returns the version of SKY UX CLI.</p></li>
<li><p><stache-code>skyux</stache-code>, <stache-code>skyux help</stache-code>, or <stache-code>skyux -h</stache-code> — Displays help information for SKY UX CLI arguments. This lists the commands and options that are available in the SKY UX CLI and provides descriptions.</p></li>
</ul>

<stache-page-anchor>
Options
</stache-page-anchor>
Expand Down
22 changes: 17 additions & 5 deletions src/modules/fileattachments/file-drop.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,26 @@
#fileInput/>
<div class="sky-file-drop-contents" *ngIf="customEl.children.length === 0">
<div class="sky-file-drop-contents-not-over">
<h4>{{'file_upload_drag_file_here' | skyResources}}</h4>
<h5>{{'file_upload_or_click_to_browse' | skyResources}}</h5>
<div class="sky-file-drop-text-header">
{{'file_upload_drag_file_here' | skyResources}}
</div>
<div class="sky-file-drop-text">
{{'file_upload_or_click_to_browse' | skyResources}}
</div>
<i class="fa fa-cloud-upload sky-file-upload-icon"></i>
</div>
<!-- This will appear when file is dragged over and is valid -->
<div class="sky-file-drop-contents-accept" >
<h4>{{'file_upload_drop_files_here' | skyResources}}</h4>
<div class="sky-file-drop-text-header">
{{'file_upload_drop_files_here' | skyResources}}
</div>
<i class="fa fa-bullseye sky-file-upload-icon"></i>
</div>
<!-- This will appear when file is dragged over and is invalid -->
<div class="sky-file-drop-contents-reject" >
<h4>{{'file_upload_invalid_file' | skyResources}}</h4>
<div class="sky-file-drop-text-header">
{{'file_upload_invalid_file' | skyResources}}
</div>
<i class="fa fa-times-circle sky-file-upload-icon"></i>
</div>
</div>
Expand All @@ -45,7 +53,11 @@ <h4>{{'file_upload_invalid_file' | skyResources}}</h4>
<div class="sky-file-drop-col" *ngIf="allowLinks">
<div class="sky-file-drop-contents">
<div class="sky-file-drop-link">
<h4 class="sky-file-drop-link-header">{{'file_upload_paste_link' | skyResources}}</h4>
<div class="sky-file-drop-link-header">
<div class="sky-file-drop-text-header">
{{'file_upload_paste_link' | skyResources}}
</div>
</div>
<div class="sky-form-group">
<input
type="text"
Expand Down
39 changes: 20 additions & 19 deletions src/modules/fileattachments/file-drop.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,6 @@
width: 100%;
text-align: center;

h4,
h5 {
font-style: italic;
}

h4 {
font-size: $sky-font-size-xl;
margin: 0;
}

h5 {
font-size: $sky-font-size-lg;
margin-top: $sky-margin-half;
}

.sky-file-drop-link-header {
margin-bottom: $sky-margin-half;
}
Expand All @@ -57,10 +42,6 @@
.sky-file-drop-noclick {
.sky-file-drop-contents {
cursor: default;

h5 {
display: none;
}
}
}

Expand Down Expand Up @@ -111,6 +92,26 @@
cursor: default;
}

.sky-file-drop-text-header {
font-size: $sky-font-size-xl;
margin: 0;
}

.sky-file-drop-text {
font-size: $sky-font-size-lg;
margin-top: $sky-margin-half;
margin-bottom: $sky-margin-double;
}

.sky-file-drop-text, .sky-file-drop-text-header {
font-style: italic;
color: $sky-color-black;
font-weight: 600;
font-family: $sky-font-family-base;
line-height: 1.1;
display: block;
}

.sky-file-drop {
background-color: transparent;
border: none;
Expand Down
1 change: 0 additions & 1 deletion src/modules/fileattachments/file-item.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export class SkyFileItemComponent implements DoCheck {
break;
}
}

this.otherCls = 'fa-file-' + (cls ? cls + '-' : '') + 'o';
}
}
Expand Down