move components

Author: stephenlautier

package.json

@@ -10,8 +10,9 @@
 "build:prod": "ng build --prod",
 "test": "ng test",
 "lint": "ng lint",
-"e2e": "ng e2e",
-"serve:prod": "cd ./dist && http-server",
+ "e2e": "ng e2e",
+ "serve:prod": "cd ./dist && http-server",
+ "clean": "rimraf dist",
 "regenerate": "ng new angular-labs --style scss --routing --service-worker"
 },
 "private": true,
@@ -51,6 +52,7 @@
 "karma-jasmine": "~1.1.0",
 "karma-jasmine-html-reporter": "^0.2.2",
 "protractor": "~5.1.2",
+"rimraf": "^2.6.2",
 "ts-node": "~3.2.0",
 "tslint": "~5.7.0",
 "typescript": "~2.5.3"

src/app/areas/nav/nav.component.scss

@@ -13,8 +13,8 @@ $nav-bg-color: rgba($cod-gray, 0.75) !default;
 .app-version {
 position: absolute;
 cursor: default;
-right: -10px;
-top: -8px;
+right: -15px;
+top: -6px;
 color: $text-diffuse-color;
 font-size: $font-size-xxs;
 }

src/assets/styles/components/_components.scss

@@ -1 +1,4 @@
+@import "activity";
+@import "layout";
+@import "reset";
 @import "typography";

src/assets/styles/activity.scss renamed to src/assets/styles/components/activity.scss

@@ -1,7 +1,4 @@
 /* You can add global styles to this file, and also import other style files */
 @import "~bootstrap/dist/css/bootstrap.min.css";
 @import "~font-awesome/css/font-awesome.css";
-@import "components/components";
-@import "reset";
-@import "layout";
-@import "activity";
+@import "components/components";