diff --git a/package.json b/package.json index d9aabce..771f238 100644 --- a/package.json +++ b/package.json @@ -27,14 +27,14 @@ }, "homepage": "https://github.com/kiswa/TaskBoard#readme", "devDependencies": { - "@angular/common": "2.0.0-rc.6", - "@angular/compiler": "2.0.0-rc.6", - "@angular/core": "2.0.0-rc.6", - "@angular/forms": "2.0.0-rc.6", - "@angular/http": "2.0.0-rc.6", - "@angular/platform-browser": "2.0.0-rc.6", - "@angular/platform-browser-dynamic": "2.0.0-rc.6", - "@angular/router": "3.0.0-rc.2", + "@angular/common": "2.0.0", + "@angular/compiler": "2.0.0", + "@angular/core": "2.0.0", + "@angular/forms": "2.0.0", + "@angular/http": "2.0.0", + "@angular/platform-browser": "2.0.0", + "@angular/platform-browser-dynamic": "2.0.0", + "@angular/router": "3.0.0", "bourbon": "^4.2.7", "bourbon-neat": "^1.8.0", "chai": "^3.5.0", @@ -56,14 +56,14 @@ "gulp-phpunit": "^0.18.0", "gulp-sass": "^2.3.2", "gulp-scss-lint": "^0.4.0", - "gulp-typescript": "^2.13.6", + "gulp-typescript": "^2.14.1", "gulp-uglify": "^2.0.0", "gulp-util": "^3.0.7", "merge-stream": "^1.0.0", "mock-browser": "^0.92.12", - "ng2-dragula": "^1.2.0", + "ng2-dragula": "^1.2.1", "reflect-metadata": "^0.1.8", - "rxjs": "5.0.0-beta.11", + "rxjs": "5.0.0-beta.12", "scss-base": "^1.1.6", "systemjs": "0.19.38", "systemjs-builder": "0.15.31", diff --git a/src/api/composer.lock b/src/api/composer.lock index a787489..80a3e1b 100644 --- a/src/api/composer.lock +++ b/src/api/composer.lock @@ -1074,22 +1074,30 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "5277094ed527a1c4477177d102fe4c53551953e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", + "reference": "5277094ed527a1c4477177d102fe4c53551953e0", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1103,12 +1111,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2016-09-19 16:02:08" }, { "name": "sebastian/comparator", diff --git a/src/scss/_core.scss b/src/scss/_core.scss index a23fae9..f7d7898 100644 --- a/src/scss/_core.scss +++ b/src/scss/_core.scss @@ -179,47 +179,20 @@ button { } } -.hidden { - display: none; -} - .toggle { - position: relative; - vertical-align: middle; + vertical-align: sub; &::before { - background-color: $color-secondary; - border-radius: 3px; - content: ' '; - display: inline-block; - height: 1em; - padding: 5px 7px; - transition: background 300ms; + height: 16px; width: 30px; } &::after { - background-color: $white; - border: 1px solid $color-border; - border-radius: 2px; - content: ' '; - display: inline-block; - height: 1.5em; - left: 0; - position: absolute; - top: -.25em; - transition: transform 150ms; - width: 15px; + top: -2px; } } -.hidden:checked + .toggle { - &::before { - background-color: $color-primary; - } - - &::after { - transform: translate(15px); - } +.hidden:checked + .toggle::after { + transform: translate(15px); } diff --git a/src/scss/_scss-base-settings.scss b/src/scss/_scss-base-settings.scss index d526b73..21ce4ee 100644 --- a/src/scss/_scss-base-settings.scss +++ b/src/scss/_scss-base-settings.scss @@ -8,6 +8,9 @@ $color-text-button: #fff; $color-heading-bg: #dbe9ee; $color-table-row: lighten($color-text, 80%); +$color-toggle-on: $color-primary; +$color-toggle-off: $color-secondary; + $font-url: 'https://fonts.googleapis.com/css?family=Raleway:500|Pontano+Sans|Fira+Mono'; $font-name: 'Pontano Sans'; $font-name-mono: 'Fira Mono'; diff --git a/tsconfig.json b/tsconfig.json index 198696c..ff10b2b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,6 +10,7 @@ "noImplicitAny": false }, "exclude": [ - "node_modules" + "node_modules", + ".c9" ] }