RC > Removed SKY CSS import

config/karma/dev-src-app.karma.conf.js

@@ -38,10 +38,6 @@ function getConfig(config) {
   // It's relative from src/app/
   webpackConfig.resolve.alias['@blackbaud/skyux-builder/runtime'] = runtimePath;
 
-  // Instead of adding skyux2 as a dependency of skyux-builder
-  webpackConfig.resolve.alias['@blackbaud/skyux/dist/css/sky.css'] =
-    '../../utils/runtime-test-skyux.css';
-
   // Remove sky-style-loader
   delete config.preprocessors['../../utils/spec-styles.js'];
   config.files.pop();

e2e/skyux-lib-help-tests/skyux-lib-help.e2e-spec.js

@@ -45,8 +45,6 @@ import {
   SkyModalDemoFormComponent
 } from './modal-fixtures/modal-form-fixture.component';
 
-require('style-loader!@blackbaud/skyux/dist/css/sky.css');
-
 @NgModule({
   imports: [
     SkyAlertModule,

lib/sky-pages-module-generator.js

@@ -69,13 +69,11 @@ function getSource(skyAppConfig) {
     'SkyAppRuntimeConfigParams',
     'SkyAppWindowRef',
     'SkyAuthTokenProvider',
-    'SkyAppStyleLoader',
     'SkyAppViewportService'
   ];
 
   let runtimeProviders = [
     'SkyAppWindowRef',
-    'SkyAppStyleLoader',
     `{
       provide: SkyAppConfig,
       deps: [
@@ -115,6 +113,7 @@ function getSource(skyAppConfig) {
     `import { HttpModule } from '@angular/http';`,
     `import { FormsModule, ReactiveFormsModule } from '@angular/forms';`,
     `import { ActivatedRoute, RouterModule, Routes } from '@angular/router';`,
+    `import { SkyThemeModule } from '@skyux/theme';`,
     `import { Subscription } from 'rxjs/Subscription';`
   ];
 
@@ -129,7 +128,8 @@ function getSource(skyAppConfig) {
     'FormsModule',
     'ReactiveFormsModule',
     'AppExtrasModule',
-    'SkyAppRuntimeModule'
+    'SkyAppRuntimeModule',
+    'SkyThemeModule'
   ];
 
   if (skyAppConfig.skyux.auth) {

package.json

@@ -39,6 +39,7 @@
     "@angular/platform-browser": "^4.3.6",
     "@angular/platform-browser-dynamic": "^4.3.6",
     "@angular/router": "^4.3.6",
+    "@skyux/theme": ">=3.0.0-alpha.1",
     "core-js": "^2.4.1",
     "rxjs": "^5.4.3",
     "ts-node": "^3.0.4",
@@ -56,7 +57,6 @@
     "@pact-foundation/pact-node": "6.7.0",
     "@pact-foundation/pact-web": "5.3.0",
     "@types/core-js": "0.9.41",
-    "@types/fontfaceobserver": "0.0.5",
     "@types/jasmine": "2.5.47",
     "@types/node": "7.0.18",
     "angular2-template-loader": "0.6.2",
@@ -66,7 +66,6 @@
     "cors": "2.8.4",
     "enhanced-resolve": "3.3.0",
     "express": "4.15.3",
-    "fontfaceobserver": "2.0.9",
     "fs-extra": "3.0.1",
     "glob": "7.1.1",
     "hash-file": "3.0.0",
@@ -117,6 +116,7 @@
     "@angular/platform-browser-dynamic": "4.3.6",
     "@angular/router": "4.3.6",
     "@blackbaud/skyux": "2.15.0",
+    "@skyux/theme": "3.0.0-alpha.1",
     "core-js": "2.4.1",
     "cross-spawn": "5.1.0",
     "istanbul": "0.4.5",

runtime/index.ts

@@ -9,7 +9,6 @@ export * from './params';
 export * from './directives';
 export * from './search-results-provider';
 export * from './window-ref';
-export * from './style-loader';
 export * from './viewport.service';
 export * from './omnibar-provider';
 export * from './omnibar-ready-args';

runtime/viewport.service.spec.ts

@@ -0,0 +1,14 @@
+import {
+  SkyAppViewportService
+} from './viewport.service';
+
+import {
+  ReplaySubject
+} from 'rxjs/ReplaySubject';
+
+describe('Viewport service', () => {
+  it('should return an observable when the content is visible', () => {
+    const service = new SkyAppViewportService();
+    expect(service.visible instanceof ReplaySubject).toEqual(true);
+  });
+});

src/app/app.component.spec.ts

@@ -32,7 +32,6 @@ import {
   SkyAppOmnibarProvider,
   SkyAppOmnibarReadyArgs,
   SkyAppSearchResultsProvider,
-  SkyAppStyleLoader,
   SkyAppViewportService,
   SkyAppWindowRef
 } from '@blackbaud/skyux-builder/runtime';
@@ -41,6 +40,10 @@ import {
   HelpInitializationService
 } from '@blackbaud/skyux-lib-help';
 
+import {
+  SkyAppStyleLoader
+} from '@skyux/theme';
+
 import {
   AppComponent
 } from './app.component';

src/app/app.component.ts

@@ -27,11 +27,14 @@ import {
   SkyAppOmnibarProvider,
   SkyAppOmnibarReadyArgs,
   SkyAppSearchResultsProvider,
-  SkyAppStyleLoader,
   SkyAppViewportService,
   SkyAppWindowRef
 } from '@blackbaud/skyux-builder/runtime';
 
+import {
+  SkyAppStyleLoader
+} from '@skyux/theme';
+
 require('style-loader!./app.component.scss');
 
 let omnibarLoaded: boolean;

tsconfig.json

@@ -19,8 +19,7 @@
     "types": [
       "core-js",
       "node",
-      "jasmine",
-      "fontfaceobserver"
+      "jasmine"
     ],
     "baseUrl": ".",
     "paths": {

utils/spec-styles.js

@@ -2,7 +2,7 @@
 
 'use strict';
 
-var styleLoader = require('./sky-style-loader');
+const styleLoader = require('@skyux/theme/utils/node-js/style-loader');
 
 // A race condition exists in Firefox where tests can begin before styles are loaded.
 // This will ensure that styles are loaded before tests run by ensuring the style rule