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

Commit

Permalink
File attachment padding (#845)
Browse files Browse the repository at this point in the history
* Ng4 upgrade (#799)

* Package upgrades

* Fixed tslint issues

TODO:
  - fix search and sort tests

* Update package.json

* Fix context replacement plugin

* Remove forkCheckerPlugin from webpack

* Fix contentBase error

* fix sort test add logging back to karma.conf

* Fix search tests

TODO:
  - fix code coverage gaps

* Fix lint errors

* ignore new istanbul quirks

* update rollup to include platform browser name

* Angular 4 Upgrade > Additional Edits (#702)

* Allow for proper nesting for getting data for lists and grids (#671)

* Changed the list helper getData function to set the result to null if the final part was undefined so that nesting works correctly.

* Added unit tests

* updates skyux2 docs to use stache2 (#681)

* home page and pulling in stache things

* removed need for title service

* components demo component using stache

* removed change to package json

* removed unecessary method

* updating learn page and removing overview folder

* spacing issue fixed

* Convert reference topics to Stache 2

* refactored all the tutorial section

* Doc tweaks for Stache 2.

* Final doc tweaks before merge

* versioned without vs

* Update builder version (#693)

* Update builder version

* Remove unneeded packages

* Update full page modal header sizes (#679)

* Update full page modal header sizes

* Update full screen modal screenshots

* Travis build 1313 pushed to skyux2 [ci skip]

* Update wait component z-index (#684)

* Travis build 1316 pushed to skyux2 [ci skip]

* Adjust padding for closeable tab (#685)

To account for built-in padding in the close button.

* Travis build 1318 pushed to skyux2 [ci skip]

* Handle styles for filedrop when links are not allowed (#686)

* Travis build 1325 pushed to skyux2 [ci skip]

* Add cancel button to wizard docs and update modal button spacing (#689)

* Added yarn lock

* Cleaned files based on lint rules

* Removed unused comments

* Updated excluded source maps

* Updated version of tslint

* Fixed linting errors

* Reverting version of browserstack-local

* Update to connect to browserstack properly

Use browserstack service instead of binary. Also fix error with axe.

* Fix variable name

* Bump tests

* Remove unit tests to test visual tests on their own

* Actually remove unit tests for ci to run visuals

* Use one parallel test

* Add error logs for wdio

* Add unit tests back

* Log build number for visual tests on ci

* Add logs to see what's going on

* Try to use travis browsersrtack addon

* try using travis browserstack again

* remove old browserstack stuff

* Use encrypted variables with travis browserstack

* Add more logging and use different travis encryption

* Add more logging

* Add more logging to webdriver

* Add more logging

* Tweak visual server settings

* try running visual test webpack dev server

* set noInfo to false

* update host for dev server

* use local browserstack wdio

* see what error occurs when using nonsense text

* Add env variables back

* Add more wdio configuration

* Use browserstack binary

* Remove extra options from visual-server

* Remove unneeded logging

* make log level silent

* Run entire test suite

Revert normalize-sass to original version

* use old wdio versions for testing

* Add connection retry settings

* whitespace bump

* Re update wdio packages

* Remove unneeded logging

* Remove parallel testing

* Use sudo required for builds

* remove reference to browserstack-local

* See how 25 parallel tests run

* Use 3 parallel visual tests and latest stable version of node

* Update visual-server.js

* Update travis-script.sh

* Updated formatting

* More adjustments

* Added console logs

* Added error checking

* Added logs

* Reduced number of instances

* Updated logs

* Updated log

* Updated logs

* Updates

* Removed console logs

* Changed styles for visual test

* Updated wait test

* Updates to private variables

* Updated list toolbar default

* Updated public variable

* Updating selenium version

* Fixed bugs with templates

* Cleaned up unnecessary changes

* Updated version of stache

* Upped max instances

* Up wait for timeout

* Add some waitForVisibles in alert and action button

* Added path resolves

* Builder visual (#791)

* Add start of visual tests

* continue working on skyux builder visual tests

* more work on getting builder visual tests to work

* More work around visual tests

* fix package name typo

* Update import paths for visual test spa

* Add normalize-scss to package.json

* Fix moment import to work with rollup

This way works also with copying the dist folder to node_modules

* fix tile strangeness

* start scripts for visual test setup

* Continue protractor work

* start of visual test command

* duplicate a bit of work to get protractor ready to go

* Get protractor to go to a page

* Add first pass at image comparison

TODO:
  - do not fail when image does not exist

* Continue pixdiff work

* Work on thresholds

* Screenshots working with alert visual test

TODO:
  - create compare screenshot wrapper function
  - get action button tests
  - get working with browserstack
  - get working with browserstack and TravisCI

* Add wrapper function for visual tests

TODO:
  - accessibility testing
  - more elegant way to change size
  - use browserstack
  - travis commands

* Add checkAccessibility

TODO:
  - browserstack configuration
  - get working in travis

* Break out local visual test conf file

* Add content for ci visual tests

TODO:
  - switch configuration file used based on argue
  - test using browserstack
  - add the rest of the tests
  - get TravisCI implementations working

* Allow visual tests to change config based on command line

* Browserstack tests working

* fix browserstack local visual tests

TODO:
  - get other tests moved over
  - test using browserstack
  - get TravisCI integration working
  - remove all traces of wdio and old tests

* Add avatar visual test

* Add button visual test

* Add visual tests for card, checkbox, and chevron

* Add datepicker, definition list, and dropdown visual tests

* Add error, file drop, and filter visual tests

* Add visual tests for grid, key-info, label, list-secondary-actions, list-view-checklist, and modals

* add visual tests for navbar

* Add page summary visual tests

* Add visual tests for paging, radio, repeater

* Add visual tests for search, sort, tabs

* Add visual tests for text-expand, text-expand-repeater, tiles

* Finsih visual tests

* Updated visual tests

* Update ci tests

* fix package.json conflict

* update other visual test scripts

* Tweak scripts

* Fix lint errors

* Attempt to add path for skyux/dist/core

* Updated stache version

* ignore temporary visual test files

* Update code coverage

* Remove some old visual tests

* Remove old visual test artifacts

* Remove other old visual test artifacts

* remove webdriver packages from package.json

* Update documentation for visual tests

* Finish documentation for new visual test methodology

* Fix visual test selector in new modal tests

* Updated version of Stache (#805)

* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump

* update travis scripts (#806)

* update travis scripts

* update visual baseline script

* Update visual baseline with logging (#807)

* Travis build 1644 pushed to skyux2 [ci skip]

* Changelog and package updates for rc.0 (#808)

* Merge 32 (#816)

* AppSettings and config files docs.

* appSettings and config files docs.

* Doc tweaks.

* Code sample cleanup

* Max height transition (#804)

* update builder version for skyux documentation

* pass string to expandmode

* Update container for component search

* Use class instead of inline styles

* work on text expand firefox bug

* continue work on firefox transitions

* Adjust text expand animation for firefox

* Update tests for new text expand animation

* Fix tslint errors

* Update master plunker to point to beta release (#812)

* List paging first page (#814)

* Only set page number on search when paging exists

* Add tests for search paging bug

* Updates for beta.32 (#815)

* Fix typo for iso8601

* Update dependencies for spa visual tests

* Updates for rc.1 (#817)

* Updates for rc.1

* Tweak changelog styles

* Update karma firefox (#818)

* Drop down primary (#819)

* added primary in html class

* testing for primary dropdown option

* lint errors fixed

* documentation fixes from john

* documentation changes

* changed isPrimary boolean property to buttonStyle string property

* fixed test errors

* Updated versions of Stache, Builder (#821)

* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump

* Update package.json

* Update package.json

* Update package.json

* Updated releases

* Updated version of stache

* Updated version of stache

* Added resolve for visual tests

* Updated version of stache

* Merging master branch, Release 2.0.0-beta.2 (#826)

* AppSettings and config files docs.

* appSettings and config files docs.

* Doc tweaks.

* Code sample cleanup

* Max height transition (#804)

* update builder version for skyux documentation

* pass string to expandmode

* Update container for component search

* Use class instead of inline styles

* work on text expand firefox bug

* continue work on firefox transitions

* Adjust text expand animation for firefox

* Update tests for new text expand animation

* Fix tslint errors

* Update master plunker to point to beta release (#812)

* List paging first page (#814)

* Only set page number on search when paging exists

* Add tests for search paging bug

* Updates for beta.32 (#815)

* Adding Autonumeric Pipe/Module (#792)

* Adding Autonumeric

* Fixed Test

* Changed name from SkyAutonumeric to  SkyNumeric

* Changing formatting

* Changes per comments, OptionsObject used

* Updated wording

* Email validation (#810)

* created email validation ts

* email validation scss

* email validation code and test start

* email validator testing files

* last lint error fixed

* component page summary

* error message/red halo doesn't show until lost focus

* Changes from Patrick

* Changes from Patrick (took care of errors)

* added form control for demo input box consistency

* Fixed lint errors

* Added sky-form-control to demo/removed onInit from module code

* Lint errors

* Add note about serving in Windows 10 with IE11 or Edge. (#820)

* Add note about serving in Windows 10 with IE11 or Edge.

* Rework note based on feedback from Bobby.

* Updates for beta.33 (#825)

* Fixed linting errors

* Update package.json

* Dont run skyux build for now

* Updated travis script

* Readded build

* Moved remove commands

* Updated version of builder

* Updated changelog and version

* scss class

* Tab keyboard support (#843)

* Added animation polypill

* Moved import to dependencies

* Tab keyboard accessibility

* Added scss classes

* Added animation polyfill (#841)

* Added animation polypill

* Moved import to dependencies

* More class changes in html

* Text Highlight directive (#839)

* Adding highlight directive and demo page.

* Adding and replacing highlight style.

* Use mark element.

* Update demo.

* Add test for directive.

* Update test.

* Update highlighter to be case insensitive.

* Can't add mark text to innerhtml.

* Update tests.

* Use mutation observer for dom events.

* Reformat test

* Update async test.

* Mock mutation observer service.

* Add extra test.

* Adding visual tests.

* Add text highlight visual test.

* Move mutation service class.

* Update event creation in test.

* Adding test for mutation observer class. Removing undefined check for IE10.

* Disconnect mutation observer on destroy. Add exports. Fix name.

* Deleted h4 h5 styling in sass

* Font family, stray h4, margin bottom

* whitespace bump
  • Loading branch information
Blackbaud-SandhyaRajasabeson authored and Blackbaud-PatrickOFriel committed Jul 7, 2017
1 parent 3824d9a commit 39617d7
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 26 deletions.
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

0 comments on commit 39617d7

Please sign in to comment.