diff options
-rwxr-xr-x | service/go | 2 | ||||
-rw-r--r-- | web-ui/app/index.html | 2 | ||||
-rw-r--r-- | web-ui/app/templates/page/logout.hbs | 4 | ||||
-rw-r--r-- | web-ui/app/templates/page/logout_shortcut.hbs | 2 | ||||
-rw-r--r-- | web-ui/app/templates/tags/shortcut.hbs | 2 | ||||
-rw-r--r-- | web-ui/package.json | 8 | ||||
-rw-r--r-- | web-ui/test/spec/tags/ui/tag_shortcut.spec.js | 1 |
7 files changed, 12 insertions, 9 deletions
@@ -4,7 +4,7 @@ function setuppy { pip install -r test_requirements.txt python setup.py develop $* pip uninstall -y scrypt; pip install scrypt - pip uninstall -y gunpg; pip install gnupg==1.2.5 + pip uninstall -y gnupg; pip install gnupg==1.2.5 } function setupjs { diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 17570852..f845f128 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -35,7 +35,7 @@ </ul> <ul id="custom-tags-shortcuts" class="shortcuts"> <li> - <a class="left-off-canvas-toggle" href="#" title="View your tags"><i class="fa fa-tags"></i><div class="shortcut-label">Tags</div></a> + <a class="left-off-canvas-toggle" href="#"><i class="fa fa-tags"></i><div class="shortcut-label">Tags</div></a> </li> </ul> <ul id="logout-shortcut" class="shortcuts"> diff --git a/web-ui/app/templates/page/logout.hbs b/web-ui/app/templates/page/logout.hbs index d3895a71..a17b3b7e 100644 --- a/web-ui/app/templates/page/logout.hbs +++ b/web-ui/app/templates/page/logout.hbs @@ -2,7 +2,7 @@ <li> <a title="logout" href={{logout_url}}> <div class="fa fa-sign-out"></div> - <i class="shortcut-label">Logout</i> + <i class="shortcut-label"></i> Logout </a> </li> -</ul>
\ No newline at end of file +</ul> diff --git a/web-ui/app/templates/page/logout_shortcut.hbs b/web-ui/app/templates/page/logout_shortcut.hbs index 20df5513..dacedd7a 100644 --- a/web-ui/app/templates/page/logout_shortcut.hbs +++ b/web-ui/app/templates/page/logout_shortcut.hbs @@ -1,5 +1,5 @@ <li> - <a class="left-off-canvas-toggle logout" title="logout" > + <a class="left-off-canvas-toggle logout" > <i class="fa fa-sign-out"></i> <div class="shortcut-label">Logout</div> </a> diff --git a/web-ui/app/templates/tags/shortcut.hbs b/web-ui/app/templates/tags/shortcut.hbs index 5fa32320..1e82d6a9 100644 --- a/web-ui/app/templates/tags/shortcut.hbs +++ b/web-ui/app/templates/tags/shortcut.hbs @@ -1,5 +1,5 @@ <li class="{{ selected }}"> - <a title="{{ tagName }}"> + <a> {{#if displayBadge }} <span class="{{ badgeType }}-count">{{ count }}</span> {{/if}} diff --git a/web-ui/package.json b/web-ui/package.json index 7d39cfc5..a3fd3b2c 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -3,7 +3,6 @@ "version": "0.0.0", "devDependencies": { "bower": "1.3.12", - "minify": "1.4.1", "handlebars": "2.0.0", "html-minifier": "^0.6.9", "imagemin": "3.1.0", @@ -16,14 +15,19 @@ "karma-junit-reporter": "0.2.2", "karma-phantomjs-launcher": "0.1.4", "karma-requirejs": "0.2.2", - "requirejs": "2.1.15" + "minify": "1.4.1", + "requirejs": "2.1.15", + "watch": "^0.13.0" }, "scripts": { "test": "npm run clean && npm run handlebars && node_modules/karma/bin/karma start --single-run --browsers PhantomJS $GRUNT_OPTS", "debug": "npm run clean && npm run handlebars && node_modules/karma/bin/karma start --browsers Chrome $GRUNT_OPTS", + "watch": "npm run compass-watch & npm run handlebars-watch", "watch-test": "node_modules/karma/bin/karma start", "handlebars": "mkdir -p app/js/generated/hbs/ && handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .", + "handlebars-watch": "node_modules/.bin/watch 'npm run handlebars' app/templates", "compass": "compass compile", + "compass-watch": "compass watch", "build": "npm run clean && npm run handlebars && npm run compass", "jshint": "node_modules/.bin/jshint --config=.jshintrc app && node_modules/.bin/jshint --config=.jshintrc test", "clean": "rm -rf .tmp/ dist/**/* app/js/generated/hbs/* app/css/*", diff --git a/web-ui/test/spec/tags/ui/tag_shortcut.spec.js b/web-ui/test/spec/tags/ui/tag_shortcut.spec.js index d1c7939a..fe235541 100644 --- a/web-ui/test/spec/tags/ui/tag_shortcut.spec.js +++ b/web-ui/test/spec/tags/ui/tag_shortcut.spec.js @@ -20,7 +20,6 @@ describeComponent('tags/ui/tag_shortcut', function () { }); it('renders the shortcut inside the parent', function () { - expect(parent.html()).toMatch('<a title="inbox">'); expect(parent.html()).toMatch('<i class="fa fa-inbox"></i>'); expect(parent.html()).toMatch('<div class="shortcut-label">inbox</div>'); }); |