This commit is contained in:
Mo Bitar
2016-12-25 18:38:58 -06:00
parent a091323faf
commit 4e239e481c
5 changed files with 14 additions and 19 deletions

View File

@@ -87,7 +87,7 @@ module.exports = function(grunt) {
'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js', '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/ng-token-auth/dist/ng-token-auth.js',
'vendor/assets/bower_components/angular-cookie/angular-cookie.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/restangular/dist/restangular.js',
'vendor/assets/bower_components/marked/lib/marked.js', 'vendor/assets/bower_components/marked/lib/marked.js',
'vendor/assets/bower_components/oclazyload/dist/ocLazyLoad.js', 'vendor/assets/bower_components/oclazyload/dist/ocLazyLoad.js',

View File

@@ -1,5 +1,5 @@
.editor { .editor {
width: 50%; width: 60%;
&.fullscreen { &.fullscreen {
width: 100%; width: 100%;

View File

@@ -1,5 +1,5 @@
.notes { .notes {
width: 30%; width: 25%;
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
border-right: 1px solid #dddddd; border-right: 1px solid #dddddd;
@@ -52,7 +52,7 @@
} }
} }
$note-selection-color: #2960ec; $note-selection-color: #086dd6;
.note { .note {
width: 100%; width: 100%;
@@ -77,9 +77,9 @@
color: white; color: white;
} }
&:hover:not(.selected) { // &:hover:not(.selected) {
background-color: $note-selection-color; // background-color: $note-selection-color;
color: white; // color: white;
} // }
} }
} }

View File

@@ -1,7 +1,6 @@
.tags { .tags {
width: 20%; width: 15%;
background-color: #ebebeb;
.tags-title-bar { .tags-title-bar {
color: black; color: black;
@@ -13,12 +12,15 @@
} }
.content { .content {
background-color: #ebebeb !important; background-color: #f6f6f6 !important;
} }
.tag-add-button { .tag-add-button {
margin-top: -6px; margin-top: -6px;
background-color: #d7d7d7 !important; background-color: #d7d7d7 !important;
float: right;
position: absolute;
right: 12px;
&:hover { &:hover {
background-color: rgba(#d7d7d7, 0.8) !important; background-color: rgba(#d7d7d7, 0.8) !important;

View File

@@ -4,7 +4,6 @@
"devDependencies": { "devDependencies": {
"babel-cli": "^6.18.0", "babel-cli": "^6.18.0",
"babel-preset-env": "^1.1.1", "babel-preset-env": "^1.1.1",
"babel-preset-es2015": "^6.18.0",
"babel-preset-es2016": "^6.16.0", "babel-preset-es2016": "^6.16.0",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-angular-templates": "^1.1.0", "grunt-angular-templates": "^1.1.0",
@@ -12,17 +11,11 @@
"grunt-browserify": "^5.0.0", "grunt-browserify": "^5.0.0",
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-cssmin": "^1.0.2", "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-sass": "^1.0.0",
"grunt-contrib-uglify": "^2.0.0", "grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0", "grunt-contrib-watch": "^1.0.0",
"grunt-haml2html": "^0.3.1", "grunt-haml2html": "^0.3.1",
"grunt-newer": "^1.2.0", "grunt-newer": "^1.2.0",
"grunt-ng-annotate": "^3.0.0", "grunt-ng-annotate": "^3.0.0"
"grunt-sprockets-directives": "^0.1.0"
},
"dependencies": {
"actioncable": "^5.0.0"
} }
} }