diff --git a/Gruntfile.js b/Gruntfile.js index 3715f65eb..5ecb2b443 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -87,7 +87,7 @@ module.exports = function(grunt) { 'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js', 'vendor/assets/bower_components/ng-token-auth/dist/ng-token-auth.js', 'vendor/assets/bower_components/angular-cookie/angular-cookie.js', - 'vendor/assets/bower_components/lodash/dist/lodash.js', + 'vendor/assets/bower_components/lodash/dist/lodash.min.js', 'vendor/assets/bower_components/restangular/dist/restangular.js', 'vendor/assets/bower_components/marked/lib/marked.js', 'vendor/assets/bower_components/oclazyload/dist/ocLazyLoad.js', diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss index 0c7ec35bf..96303b048 100644 --- a/app/assets/stylesheets/app/_editor.scss +++ b/app/assets/stylesheets/app/_editor.scss @@ -1,5 +1,5 @@ .editor { - width: 50%; + width: 60%; &.fullscreen { width: 100%; diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss index 17adec1c7..b106638b8 100644 --- a/app/assets/stylesheets/app/_notes.scss +++ b/app/assets/stylesheets/app/_notes.scss @@ -1,5 +1,5 @@ .notes { - width: 30%; + width: 25%; border-left: 1px solid #dddddd; border-right: 1px solid #dddddd; @@ -52,7 +52,7 @@ } } - $note-selection-color: #2960ec; + $note-selection-color: #086dd6; .note { width: 100%; @@ -77,9 +77,9 @@ color: white; } - &:hover:not(.selected) { - background-color: $note-selection-color; - color: white; - } + // &:hover:not(.selected) { + // background-color: $note-selection-color; + // color: white; + // } } } diff --git a/app/assets/stylesheets/app/_tags.scss b/app/assets/stylesheets/app/_tags.scss index 2b38bd327..a0393f0b6 100644 --- a/app/assets/stylesheets/app/_tags.scss +++ b/app/assets/stylesheets/app/_tags.scss @@ -1,7 +1,6 @@ .tags { - width: 20%; - background-color: #ebebeb; + width: 15%; .tags-title-bar { color: black; @@ -13,12 +12,15 @@ } .content { - background-color: #ebebeb !important; + background-color: #f6f6f6 !important; } .tag-add-button { margin-top: -6px; background-color: #d7d7d7 !important; + float: right; + position: absolute; + right: 12px; &:hover { background-color: rgba(#d7d7d7, 0.8) !important; diff --git a/package.json b/package.json index 2bf2c05b0..58902c563 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "devDependencies": { "babel-cli": "^6.18.0", "babel-preset-env": "^1.1.1", - "babel-preset-es2015": "^6.18.0", "babel-preset-es2016": "^6.16.0", "grunt": "^1.0.1", "grunt-angular-templates": "^1.1.0", @@ -12,17 +11,11 @@ "grunt-browserify": "^5.0.0", "grunt-contrib-concat": "^1.0.1", "grunt-contrib-cssmin": "^1.0.2", - "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-nodeunit": "~0.4.1", "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", "grunt-haml2html": "^0.3.1", "grunt-newer": "^1.2.0", - "grunt-ng-annotate": "^3.0.0", - "grunt-sprockets-directives": "^0.1.0" - }, - "dependencies": { - "actioncable": "^5.0.0" + "grunt-ng-annotate": "^3.0.0" } }