Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit 16965b3

Browse files
author
John Earle
committed
Squashed commit of the following:
commit bf29114 Merge: aa0ae1f f960d81 Author: John Earle <jearle@salesforce.com> Date: Wed Feb 15 15:22:42 2017 -0800 Merge pull request #29 from salesforce-ux/chore/clean-up Pre-release clean up commit aa0ae1f Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 15 15:20:55 2017 -0800 fonts fixed commit f960d81 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:42:48 2017 -0800 Add contruting guidelines commit 8ecb83b Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:40:52 2017 -0800 Update the readme commit 31d68ac Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:40:44 2017 -0800 Whitespace fix commit 8d092dc Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:40:25 2017 -0800 Set author as Salesforce commit 0566cd7 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:39:52 2017 -0800 Add release to changelog commit cfe9fdf Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:39:37 2017 -0800 Remove duplicate license field commit ec08353 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:35:17 2017 -0800 Clean up JS whitespace and indentation commit f9d8db4 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:35:03 2017 -0800 Add a changelog commit 22f20fc Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:33:01 2017 -0800 Add editorconfig file commit e4d8062 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:32:50 2017 -0800 Set License to 2015-present commit 0218778 Author: Kaelig <kaelig@deloumeau.fr> Date: Wed Feb 15 13:31:22 2017 -0800 Remove legacy ignored path commit 531e64f Merge: 749f22d d22c281 Author: John Earle <jearle@salesforce.com> Date: Wed Feb 15 08:10:58 2017 -0800 Merge pull request #28 from salesforce-ux/feature/multi-threadCache Feature/multi-thread cache commit d22c281 Merge: e84adb2 749f22d Author: jandolina <jandolina@salesforce.com> Date: Mon Feb 13 15:07:47 2017 -0800 Merge branch 'development' of github.com:salesforce-ux/design-system-ios into feature/mutithreadCache commit e84adb2 Author: jandolina <jandolina@salesforce.com> Date: Mon Feb 13 15:07:36 2017 -0800 Added caching and verified project files commit 749f22d Merge: de15395 69c9df0 Author: John Earle <j.earle@salesforce.com> Date: Mon Feb 13 14:30:27 2017 -0800 merge in master commit de15395 Merge: d0d5399 b7fc33e Author: John Earle <jearle@salesforce.com> Date: Mon Feb 13 14:06:47 2017 -0800 Merge pull request #26 from salesforce-ux/feature/native-tests Feature/native tests commit b7fc33e Merge: 6e594d6 d0d5399 Author: John Earle <j.earle@salesforce.com> Date: Mon Feb 13 14:06:21 2017 -0800 merged commit d0d5399 Merge: f11b350 6e325be Author: John Earle <jearle@salesforce.com> Date: Mon Feb 13 13:56:05 2017 -0800 Merge pull request #27 from salesforce-ux/fix/license-headers Update license headers commit 6e325be Author: John Earle <j.earle@salesforce.com> Date: Mon Feb 13 13:55:44 2017 -0800 update year in license commit 653bc92 Merge: 3d6142f f11b350 Author: John Earle <j.earle@salesforce.com> Date: Mon Feb 13 13:54:32 2017 -0800 merged commit 3d6142f Author: John Earle <j.earle@salesforce.com> Date: Mon Feb 13 13:51:48 2017 -0800 renamed LICENSE to LICENSE.txt commit f11b350 Author: Joe Andolina <jandolina@salesforce.com> Date: Mon Feb 13 11:50:18 2017 -0800 Feature/generated folder fix (#25) * Removing Generated * Removed and re-added all the generated files to a new Generated folder. commit 53b0ffb Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 8 14:04:10 2017 -0800 adjust lib cell image height commit 22ec7cd Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 8 11:34:00 2017 -0800 Update license headers commit 6e594d6 Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 8 10:38:04 2017 -0800 Size tests added commit e17aedc Author: John Earle <j.earle@salesforce.com> Date: Tue Feb 7 16:04:59 2017 -0800 tests for color, icon range commit ab28eea Author: jandolina <jandolina@salesforce.com> Date: Tue Feb 7 13:42:07 2017 -0800 Merged the Split Headers with the Test Suite commit 0e7b464 Merge: 74f0fd4 09d3582 Author: jandolina <jandolina@salesforce.com> Date: Tue Feb 7 13:18:39 2017 -0800 Merge branch 'development' into feature/native-tests # Conflicts: # SalesforceDesignSystem.xcodeproj/project.pbxproj commit 74f0fd4 Author: John Earle <j.earle@salesforce.com> Date: Tue Feb 7 12:44:18 2017 -0800 color tests started commit 09d3582 Author: Joe Andolina <jandolina@salesforce.com> Date: Tue Feb 7 10:20:12 2017 -0800 Feature/HeaderSplit (#20) * Working through naming split * Separated out a new library for token names * Removed a print statement * Updated some spacing issues commit 8e26765 Author: jandolina <jandolina@salesforce.com> Date: Fri Feb 3 11:28:42 2017 -0800 Removed gitignore from the project file and moved the intro graphic down commit 4a4c90f Author: Joe Andolina <jandolina@salesforce.com> Date: Fri Feb 3 10:13:09 2017 -0800 Adding unit tests (#19) 994 Passing commit aa22528 Author: Joe Andolina <jandolina@salesforce.com> Date: Thu Feb 2 17:55:03 2017 -0800 Added bouds checks for library access (#18) commit 6c718df Author: John Earle <j.earle@salesforce.com> Date: Thu Feb 2 13:29:46 2017 -0800 rebuilt binaries to see change commit 4ff908f Author: jandolina <jandolina@salesforce.com> Date: Wed Feb 1 11:35:19 2017 -0800 Rounding action icons in the template this time commit 6f4933f Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 1 11:31:24 2017 -0800 integrated minification commit 2d660d2 Author: jandolina <jandolina@salesforce.com> Date: Wed Feb 1 10:31:11 2017 -0800 Cleaning up project folder commit 8ca4e48 Author: jandolina <jandolina@salesforce.com> Date: Wed Feb 1 10:26:58 2017 -0800 Auto rounding ActionIcons. Increased uitility icon sizes commit 92c9758 Author: John Earle <j.earle@salesforce.com> Date: Wed Feb 1 10:15:25 2017 -0800 icons fixed commit d7b40ed Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 31 14:38:04 2017 -0800 Reintroduced Search commit fd6f6f0 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 31 14:24:33 2017 -0800 Code sample and visual audit commit f9ffb13 Author: John Earle <j.earle@salesforce.com> Date: Fri Jan 27 11:37:46 2017 +0100 added cleaning commit 983d23d Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 20 15:46:43 2017 -0800 Updated enum iteration and added global constants commit 1f1b054 Author: John Earle <jearle@salesforce.com> Date: Thu Jan 19 10:31:14 2017 -0800 Update README.md commit bc67ad7 Author: jandolina <jandolina@salesforce.com> Date: Wed Jan 18 13:37:10 2017 -0800 Added to the icon api commit 1fc5b15 Author: jandolina <jandolina@salesforce.com> Date: Wed Jan 18 11:40:55 2017 -0800 Icon bgcolor fix commit 0766881 Author: John Earle <j.earle@salesforce.com> Date: Wed Jan 18 10:43:09 2017 -0800 icon scaling commit 16b49d6 Author: John Earle <j.earle@salesforce.com> Date: Wed Jan 18 09:41:41 2017 -0800 icon unicode fix commit 94ea0d2 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 17 13:03:27 2017 -0800 Searching for fonts commit 6f8b73d Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 17 12:18:20 2017 -0800 Tracking down font bundles commit 2bf6148 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 17 11:58:33 2017 -0800 Fixed all compile time errors commit 0c5d315 Merge: d82888b 20f0f84 Author: John Earle <j.earle@salesforce.com> Date: Tue Jan 17 10:55:21 2017 -0800 merged commit d82888b Author: John Earle <j.earle@salesforce.com> Date: Tue Jan 17 10:54:54 2017 -0800 append icon type to enum commit c7f5dc6 Author: John Earle <j.earle@salesforce.com> Date: Tue Jan 17 10:36:43 2017 -0800 append SLDS to enum values commit 20f0f84 Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 16:43:07 2017 -0800 Updated some caching commit 79a0989 Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 16:17:06 2017 -0800 Small tweak to includes commit be4b8b1 Merge: 91eec3b 6e40156 Author: John Earle <j.earle@salesforce.com> Date: Fri Jan 13 15:44:22 2017 -0800 icon scripting commit 91eec3b Author: John Earle <j.earle@salesforce.com> Date: Fri Jan 13 13:32:02 2017 -0800 removed svg optimization commit 6e40156 Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 13:14:13 2017 -0800 Optimizing icon key generation commit dbc37da Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 13:07:04 2017 -0800 Reworked color an dicon caching commit 47b6d0f Merge: f4af3a8 7169490 Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 11:08:52 2017 -0800 Merge branch 'feature/ScriptUpdate' of github.com:salesforce-ux/design-system-ios into feature/ScriptUpdate # Conflicts: # SalesforceDesignSystem.bundle/SalesforceDesignSystemIcons.ttf commit f4af3a8 Author: jandolina <jandolina@salesforce.com> Date: Fri Jan 13 11:08:32 2017 -0800 More integration and housekeeping commit 7169490 Author: John Earle <j.earle@salesforce.com> Date: Fri Jan 13 10:37:13 2017 -0800 sizes commit dbd2e9a Author: jandolina <jandolina@salesforce.com> Date: Thu Jan 12 17:04:21 2017 -0800 Integrated the new scripts commit eecfd3e Merge: ca24b89 5f94fc3 Author: John Earle <j.earle@salesforce.com> Date: Thu Jan 12 16:35:11 2017 -0800 merged commit ca24b89 Author: John Earle <j.earle@salesforce.com> Date: Thu Jan 12 16:33:25 2017 -0800 action and custom icons commit 5f94fc3 Author: jandolina <jandolina@salesforce.com> Date: Wed Jan 11 14:49:19 2017 -0800 Cleaning up the src tree commit 8bb9f83 Author: John Earle <j.earle@salesforce.com> Date: Wed Jan 11 11:30:55 2017 -0800 icon work commit 90f7ad2 Author: jandolina <jandolina@salesforce.com> Date: Wed Jan 11 11:12:43 2017 -0800 Removed extra .h commit b6f8881 Author: jandolina <jandolina@salesforce.com> Date: Wed Jan 11 11:10:42 2017 -0800 Polish commit 84f0f2b Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 22:25:00 2017 -0800 Tied up the SLDSFont and SLDSColor consolidation sldsFontName is not moving from the template to the .m file commit 3d562d2 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 22:13:35 2017 -0800 Tuning consolidation commit 32df464 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 21:53:23 2017 -0800 Consoldatating m files commit dbe1908 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 17:22:42 2017 -0800 Fonts and Colors should be working commit ba4acf5 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 16:59:57 2017 -0800 Integrating scripts 2 commit c875774 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 16:08:54 2017 -0800 Migrating scripts step 1 commit 9742307 Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 12:44:15 2017 -0800 Integrating to new build scripts commit 1c8850e Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 10 12:43:00 2017 -0800 Started integrating colors commit fcfbb17 Author: jandolina <jandolina@salesforce.com> Date: Thu Jan 5 11:38:03 2017 -0800 Updated a pixel discrepancy commit 40ff45b Author: jandolina <jandolina@salesforce.com> Date: Thu Jan 5 11:24:28 2017 -0800 Added accessibility commit 4a95aaf Author: jandolina <jandolina@salesforce.com> Date: Tue Jan 3 17:27:21 2017 -0800 Added tab accessibility hints commit 57607ed Author: John Earle <j.earle@salesforce.com> Date: Tue Jan 3 16:42:28 2017 -0800 accessibility labels for icon list commit 1d6b1e2 Author: John Earle <j.earle@salesforce.com> Date: Tue Jan 3 10:29:03 2017 -0800 updated action bar size commit 0f51874 Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 19 11:19:11 2016 -0800 action bar animation update commit 0f1d1d0 Merge: 5749c76 4882331 Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 19 11:12:48 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 5749c76 Merge: 52c3a82 9f34d8e Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 19 11:12:43 2016 -0800 merged commit 4882331 Author: jandolina <jandolina@salesforce.com> Date: Mon Dec 19 11:08:30 2016 -0800 Updated actionBar animations, removed objC demo commit 52c3a82 Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 19 11:02:48 2016 -0800 color adjustments commit 9f34d8e Author: jandolina <jandolina@salesforce.com> Date: Fri Dec 16 16:39:11 2016 -0800 Tightened up the actionBar button animations commit d3a545a Author: jandolina <jandolina@salesforce.com> Date: Fri Dec 16 14:34:33 2016 -0800 Fixed custom fonts being carried into extra parts of the app commit 4932482 Author: jandolina <jandolina@salesforce.com> Date: Fri Dec 16 14:27:12 2016 -0800 Added private the animate function commit e330398 Author: jandolina <jandolina@salesforce.com> Date: Fri Dec 16 14:25:42 2016 -0800 Cleaning up actionBar and itemBar commit cadbaca Author: John Earle <j.earle@salesforce.com> Date: Fri Dec 16 13:09:16 2016 -0800 ItemBar fix commit 5deac0b Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 22:24:36 2016 -0800 action frames adjusted before animation commit 9eb50c6 Merge: 7dc9769 8344956 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 21:20:47 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 8344956 Author: jandolina <jandolina@salesforce.com> Date: Thu Dec 15 17:29:21 2016 -0800 As a control, it should inherit as such commit 7dc9769 Merge: a5054d1 8cb146d Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 14:59:05 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 8cb146d Author: jandolina <jandolina@salesforce.com> Date: Thu Dec 15 14:56:11 2016 -0800 Trancating labels and adjusting fonts commit a5054d1 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 14:50:24 2016 -0800 shared search controller commit 05f095b Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 12:43:46 2016 -0800 search bar sizing fix commit 20f8f83 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 12:22:12 2016 -0800 added search to colors commit 4dfc741 Merge: cbff131 76d1232 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 15 11:24:59 2016 -0800 details added to account detail view commit cbff131 Author: John Earle <j.earle@salesforce.com> Date: Wed Dec 14 13:06:51 2016 -0800 animation tweaks commit 76d1232 Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 18:47:56 2016 -0800 Added UISearchBar removed light dark switch commit dfd36de Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 17:39:33 2016 -0800 Cleanned up the project folder commit dcb59b9 Merge: 51005b3 23e4a31 Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 17:26:34 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 23e4a31 Merge: cf6b3a3 17fea30 Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 13 17:24:18 2016 -0800 merged commit cf6b3a3 Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 13 17:22:29 2016 -0800 action bar animations commit 51005b3 Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 17:22:18 2016 -0800 Getting ready for sound commit 17fea30 Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 15:20:37 2016 -0800 Verifying color cell selection and swatch usage commit fd3bd66 Author: jandolina <jandolina@salesforce.com> Date: Tue Dec 13 14:39:18 2016 -0800 Updated the main view controller and added universal clipboard commit 2af87f1 Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 13 11:38:16 2016 -0800 account detail header commit 3fa7f9c Merge: 4402cb4 8b7b952 Author: jandolina <jandolina@salesforce.com> Date: Mon Dec 12 15:46:01 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 4402cb4 Author: jandolina <jandolina@salesforce.com> Date: Mon Dec 12 15:45:56 2016 -0800 Tweaked the tab bar navigation commit 8b7b952 Merge: 55861bf 3e131c6 Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 12 15:43:10 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 55861bf Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 12 15:43:05 2016 -0800 nav bar styling/ accounts layout commit 3e131c6 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Mon Dec 12 14:35:27 2016 -0800 Added attributed text examples and made the tabs sticky commit 75181d5 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 9 16:55:16 2016 -0800 Reworked the launch images commit ca5dc72 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 9 12:10:14 2016 -0800 Fixed a launch image issue commit 186e55f Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 9 12:09:25 2016 -0800 Added appIcon commit f527d33 Merge: b581573 2c57066 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 9 11:50:24 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit b581573 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 9 11:50:20 2016 -0800 Updated the code examples to reflect swift enum trimming commit 2c57066 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 16:30:08 2016 -0800 account rows and action bar added commit 6bbe7c9 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 8 14:10:55 2016 -0800 Animated the sample code text commit a70f818 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 8 14:04:16 2016 -0800 Layout tweak commit 36ca01a Merge: 716367f f7314ad Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 8 14:02:59 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 716367f Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 8 14:02:55 2016 -0800 Implemented iconDetails commit f7314ad Merge: 1800e17 69a61b0 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 12:18:12 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 1800e17 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 12:16:51 2016 -0800 tab bar animation commit 69a61b0 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 8 11:31:22 2016 -0800 Finished up the icon list work TODO: Work on the icon detail page commit 7d75ec2 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 10:54:26 2016 -0800 assigned delegate commit 5d89ba5 Merge: 71b8fbe 40b2602 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 10:00:36 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 71b8fbe Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 8 10:00:32 2016 -0800 item bar work commit 40b2602 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Dec 7 23:02:10 2016 -0800 Simplified icon handling Still need a more dynamic way to address icons commit ea1bdfc Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Dec 6 20:46:37 2016 -0800 Working through the icon list and detail view commit c76e0b4 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Dec 6 16:39:59 2016 -0800 Tidied up constraints commit f119fc3 Merge: 2430b4e 9728a31 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Dec 6 16:24:14 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 2430b4e Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Dec 6 16:24:09 2016 -0800 Working with ItemBar commit 9728a31 Merge: c7505ec abeab86 Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 6 16:22:40 2016 -0800 constraint syntax updates commit c7505ec Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 6 15:17:42 2016 -0800 merged commit bf38b6f Author: John Earle <j.earle@salesforce.com> Date: Tue Dec 6 15:16:58 2016 -0800 merged commit abeab86 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Dec 6 15:10:57 2016 -0800 Updated the layout stuff commit 594ec9a Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Mon Dec 5 16:21:03 2016 -0800 Updated the constraint helper internal API commit 499ac30 Author: John Earle <j.earle@salesforce.com> Date: Mon Dec 5 11:16:01 2016 -0800 re-work constraints commit b6035a8 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 2 16:47:51 2016 -0800 Started working with tabs in the code view commit ec4b8e2 Merge: 347c5b0 ecfd426 Author: John Earle <j.earle@salesforce.com> Date: Fri Dec 2 15:00:14 2016 -0800 merged commit 347c5b0 Author: John Earle <j.earle@salesforce.com> Date: Fri Dec 2 14:57:36 2016 -0800 account work commit ecfd426 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 2 14:53:56 2016 -0800 Updated the cell dataProvider call commit 22acabf Merge: bcd6c24 8b1baf8 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 2 14:53:06 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit bcd6c24 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Fri Dec 2 14:53:01 2016 -0800 Broke out colorSwatch and updated the color detail view commit 8b1baf8 Author: John Earle <j.earle@salesforce.com> Date: Fri Dec 2 11:32:18 2016 -0800 merge with with no workspace commit 55cfaff Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 17:21:22 2016 -0800 Optimized the project linking commit aa05b35 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 17:19:01 2016 -0800 Removed pods and test apps commit 59427e0 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 15:30:07 2016 -0800 Removing pods and workspace commit 9b49f44 Merge: e05276a d7248cb Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 15:14:14 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit e05276a Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 15:14:10 2016 -0800 Replaced the custom font commit d7248cb Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 1 15:10:20 2016 -0800 search header styling commit 0bdd354 Merge: 9c95fd8 fbeb9cc Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 1 14:35:54 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 9c95fd8 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 1 14:35:50 2016 -0800 tap gestures commit fbeb9cc Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 13:13:09 2016 -0800 Updated offsets to be positive in the case of .bottom and .right commit 26698b0 Merge: 7b9355f 9c2a204 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 13:04:03 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app # Conflicts: # Demo-Swift/slds-sample-app/FontViewController.swift commit 9c2a204 Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 1 10:37:51 2016 -0800 Updated constraints to enums commit 7b9355f Merge: cb459fd 8096a2c Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 10:37:04 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit cb459fd Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 10:36:57 2016 -0800 Working on codeExample commit 8096a2c Author: John Earle <j.earle@salesforce.com> Date: Thu Dec 1 10:12:51 2016 -0800 updated stacking constraints commit 354267b Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Thu Dec 1 09:40:31 2016 -0800 Broke out the menu and simplified the custom font implementation commit 34df740 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 18:17:25 2016 -0800 Updated the font sample color. commit b639dab Merge: 1e57874 ceec80f Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 18:12:37 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 1e57874 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 18:12:33 2016 -0800 Added a font viewer commit ceec80f Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 17:26:19 2016 -0800 animated icons commit fc3df1b Merge: db21cb0 6c91c96 Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 16:17:49 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 6c91c96 Merge: 5a3e32d d3ac963 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 16:11:10 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app commit 5a3e32d Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 16:11:06 2016 -0800 Working on custom font display commit db21cb0 Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 15:57:06 2016 -0800 icon filtering commit d3ac963 Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 15:11:25 2016 -0800 icon header added commit 63a8091 Merge: 8a6cedc cdf7ec0 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 13:43:46 2016 -0800 Merge branch 'sample-app' of github.com:salesforce-ux/design-system-ios into sample-app # Conflicts: # Demo-Swift/slds-sample-app/MainListViewController.swift commit 8a6cedc Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 13:39:29 2016 -0800 Optimized the main view controller and made a few changes in the color controller commit cdf7ec0 Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 11:22:27 2016 -0800 action icons grid commit f7abcab Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Wed Nov 30 10:42:57 2016 -0800 Added iconController commit 1e2a793 Merge: 9698b11 fdacf1d Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 10:34:18 2016 -0800 starting icon work commit 9698b11 Author: John Earle <j.earle@salesforce.com> Date: Wed Nov 30 10:29:02 2016 -0800 merge commit fdacf1d Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Nov 29 17:35:45 2016 -0800 A little house keeping commit e87bf73 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Nov 29 17:33:07 2016 -0800 Added font listings Still need to style the overall table and add the custom switches commit 5f5dbcf Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Nov 29 16:05:15 2016 -0800 Removed All Warnings commit 80bfba9 Author: Joe Andolina <jandolina@jandolina-ltm.internal.salesforce.com> Date: Tue Nov 29 16:02:40 2016 -0800 Rename Demo to Demo-ObjC commit 2da36a7 Author: John Earle <j.earle@salesforce.com> Date: Tue Nov 29 15:53:13 2016 -0800 rename demo-swift commit 304f00f Merge: d8eb666 9b9b99e Author: John Earle <j.earle@salesforce.com> Date: Tue Nov 29 15:32:53 2016 -0800 Merge branch 'master' of github.com:salesforce-ux/design-system-ios into sample-app commit d8eb666 Author: John Earle <j.earle@salesforce.com> Date: Tue Nov 29 15:19:42 2016 -0800 single color list controller commit 0b5a28b Author: John Earle <j.earle@salesforce.com> Date: Mon Nov 28 15:05:54 2016 -0800 pass colors to detail page commit f93633e Author: John Earle <j.earle@salesforce.com> Date: Mon Nov 28 14:40:55 2016 -0800 swift sample app added
1 parent 69c9df0 commit 16965b3

File tree

280 files changed

+8967
-12162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+8967
-12162
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_size = 2
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[Makefile]
15+
indent_style = tab

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Pods/
2929
.DS_Store
3030

3131
node_modules/
32-
git_modules/
3332
npm-debug.log
3433

3534
_dist_css/

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Change Log
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
6+
and this project adheres to [Semantic Versioning](http://semver.org/).
7+
8+
## 3.0.0
9+
10+
Spring ’17 release.
11+
12+
TODO: release notes.
13+
14+
## Pre 3.0.0
15+
16+
Previous release notes are available on GitHub: <https://github.com/salesforce-ux/design-system-ios/releases>

CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Contributing Code
2+
3+
External contributors will be required to sign a Contributor's License Agreement. You will be prompted to sign it when you open a pull request.
4+
5+
1. Create a new issue before starting your project so that we can keep track of what you are trying to add/fix. That way, we can also offer suggestions or let you know if there is already an effort in progress.
6+
2. Fork off this repository.
7+
3. Create a topic branch for the issue that you are trying to add. When possible, you should branch off the default branch.
8+
4. Edit the code in your fork.
9+
5. Send us a well documented pull request when you are done.
10+
11+
The **GitHub pull requests** should meet the following criteria:
12+
13+
- descriptive title
14+
- brief summary
15+
- @mention several relevant people to review the code
16+
- add helpful GitHub comments on lines that you have questions / concerns about
17+
18+
We'll review your code, suggest any needed changes, and merge it in. Thank you.
642 KB
Binary file not shown.
629 KB
Binary file not shown.
642 KB
Binary file not shown.
654 KB
Binary file not shown.
613 KB
Binary file not shown.
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com),
2+
with Reserved Font Name Lato.
3+
4+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
5+
This license is copied below, and is also available with a FAQ at:
6+
http://scripts.sil.org/OFL
7+
8+
9+
-----------------------------------------------------------
10+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
11+
-----------------------------------------------------------
12+
13+
PREAMBLE
14+
The goals of the Open Font License (OFL) are to stimulate worldwide
15+
development of collaborative font projects, to support the font creation
16+
efforts of academic and linguistic communities, and to provide a free and
17+
open framework in which fonts may be shared and improved in partnership
18+
with others.
19+
20+
The OFL allows the licensed fonts to be used, studied, modified and
21+
redistributed freely as long as they are not sold by themselves. The
22+
fonts, including any derivative works, can be bundled, embedded,
23+
redistributed and/or sold with any software provided that any reserved
24+
names are not used by derivative works. The fonts and derivatives,
25+
however, cannot be released under any other type of license. The
26+
requirement for fonts to remain under this license does not apply
27+
to any document created using the fonts or their derivatives.
28+
29+
DEFINITIONS
30+
"Font Software" refers to the set of files released by the Copyright
31+
Holder(s) under this license and clearly marked as such. This may
32+
include source files, build scripts and documentation.
33+
34+
"Reserved Font Name" refers to any names specified as such after the
35+
copyright statement(s).
36+
37+
"Original Version" refers to the collection of Font Software components as
38+
distributed by the Copyright Holder(s).
39+
40+
"Modified Version" refers to any derivative made by adding to, deleting,
41+
or substituting -- in part or in whole -- any of the components of the
42+
Original Version, by changing formats or by porting the Font Software to a
43+
new environment.
44+
45+
"Author" refers to any designer, engineer, programmer, technical
46+
writer or other person who contributed to the Font Software.
47+
48+
PERMISSION & CONDITIONS
49+
Permission is hereby granted, free of charge, to any person obtaining
50+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
51+
redistribute, and sell modified and unmodified copies of the Font
52+
Software, subject to the following conditions:
53+
54+
1) Neither the Font Software nor any of its individual components,
55+
in Original or Modified Versions, may be sold by itself.
56+
57+
2) Original or Modified Versions of the Font Software may be bundled,
58+
redistributed and/or sold with any software, provided that each copy
59+
contains the above copyright notice and this license. These can be
60+
included either as stand-alone text files, human-readable headers or
61+
in the appropriate machine-readable metadata fields within text or
62+
binary files as long as those fields can be easily viewed by the user.
63+
64+
3) No Modified Version of the Font Software may use the Reserved Font
65+
Name(s) unless explicit written permission is granted by the corresponding
66+
Copyright Holder. This restriction only applies to the primary font name as
67+
presented to the users.
68+
69+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
70+
Software shall not be used to promote, endorse or advertise any
71+
Modified Version, except to acknowledge the contribution(s) of the
72+
Copyright Holder(s) and the Author(s) or with their explicit written
73+
permission.
74+
75+
5) The Font Software, modified or unmodified, in part or in whole,
76+
must be distributed entirely under this license, and must not be
77+
distributed under any other license. The requirement for fonts to
78+
remain under this license does not apply to any document created
79+
using the Font Software.
80+
81+
TERMINATION
82+
This license becomes null and void if any of the above conditions are
83+
not met.
84+
85+
DISCLAIMER
86+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
87+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
88+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
89+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
90+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
91+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
92+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
93+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
94+
OTHER DEALINGS IN THE FONT SOFTWARE.

0 commit comments

Comments
 (0)