Permalink
Browse files

tooltip experimentation

  • Loading branch information...
Zertuk committed Nov 16, 2015
1 parent c593d58 commit a003d1fe4ca4245eccdd7f82a860f97d2b15cc59
View
@@ -1,39 +1,40 @@
{
"name": "slotwo",
"version": "0.0.1",
"description": "slotwo",
"authors": [],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"devDependencies": {
"angular-mocks": "~1.3.17",
"sinon": "http://sinonjs.org/releases/sinon-1.12.1.js",
"bardjs": "~0.1.4"
},
"dependencies": {
"jquery": "~2.1.4",
"angular": "~1.3.17",
"angular-sanitize": "~1.3.17",
"extras.angular.plus": "~0.9.2",
"font-awesome": "~4.3.0",
"moment": "~2.10.3",
"angular-ui-router": "~0.2.15",
"toastr": "~2.1.1",
"angular-animate": "~1.3.17"
},
"resolutions": {
"angular": "1.3.17"
},
"overrides": {
"bootstrap": {
"main": "dist/css/bootstrap.css",
"dist": "dist/js/bootstrap.js"
}
"name": "slotwo",
"version": "0.0.1",
"description": "slotwo",
"authors": [],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"devDependencies": {
"angular-mocks": "~1.3.17",
"sinon": "http://sinonjs.org/releases/sinon-1.12.1.js",
"bardjs": "~0.1.4"
},
"dependencies": {
"jquery": "~2.1.4",
"angular": "~1.3.17",
"angular-sanitize": "~1.3.17",
"extras.angular.plus": "~0.9.2",
"font-awesome": "~4.3.0",
"moment": "~2.10.3",
"angular-ui-router": "~0.2.15",
"toastr": "~2.1.1",
"angular-animate": "~1.3.17",
"angular-tooltips": "~0.1.25"
},
"resolutions": {
"angular": "1.3.17"
},
"overrides": {
"bootstrap": {
"main": "dist/css/bootstrap.css",
"dist": "dist/js/bootstrap.js"
}
}
}
}
View
@@ -9,6 +9,7 @@
"test": "gulp test"
},
"dependencies": {
"angular-tooltips": "^0.1.25",
"body-parser": "^1.8.2",
"express": "^4.9.3",
"morgan": "^1.1.1",
@@ -13,7 +13,8 @@
'app.enemy',
'app.level',
'app.message',
'app.template'
'app.template',
'720kb.tooltips'
]);
})();

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -16,6 +16,7 @@
<!-- bower:css -->
<link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="/bower_components/toastr/toastr.css" />
<link rel="stylesheet" href="/bower_components/angular-tooltips/dist/angular-tooltips.min.css" />
<!-- endbower -->
<!-- endbuild -->
<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
@@ -42,8 +43,8 @@ <h1>{{vm.currentLocation.name}}</h1>
<p class = "alignvert">{{vm.player.health}} / {{vm.player.maxHealth}}</p>
</div><!--healthbar-->
</div><!--row-->
<div class = "row">
<button class = "marginbottom10 mainbutton" ng-click = "vm.switchLocation(vm.currentLocation.prev)">Return to {{vm.currentLocation.prevName}}</button>
<div class = "row conditional">
<button ng-if = "vm.currentLocation.prevName" class = "marginbottom10 mainbutton" ng-click = "vm.switchLocation(vm.currentLocation.prev)">Return to {{vm.currentLocation.prevName}}</button>
<p class = "mainmessage" message-directive messageerror = "{{vm.messageError}}">{{vm.mainMessage}}</p>
</div><!--row-->
</header>
@@ -61,6 +62,7 @@ <h1>{{vm.currentLocation.name}}</h1>
<script src="/bower_components/angular-ui-router/release/angular-ui-router.js"></script>
<script src="/bower_components/toastr/toastr.js"></script>
<script src="/bower_components/angular-animate/angular-animate.js"></script>
<script src="/bower_components/angular-tooltips/dist/angular-tooltips.min.js"></script>
<!-- endbower -->
<!-- endbuild -->
@@ -26,6 +26,10 @@ header {
}
.conditional {
height: 33px;
}
.error {
color: red;
}

0 comments on commit a003d1f

Please sign in to comment.