update tour to conform to guidelines at #1507

This commit is contained in:
Tyler Renelle 2013-09-10 18:31:26 -04:00
parent 16a4e87fea
commit 964eb91799
4 changed files with 8 additions and 7 deletions

View file

@ -14,6 +14,7 @@ module.exports = function(grunt) {
'build/app.js': [
'public/bower_components/jquery/jquery.min.js',
'public/bower_components/bootstrap-growl/jquery.bootstrap-growl.min.js',
'public/bower_components/bootstrap-tour/buid/js/bootstrap-tour.min.js',
'public/bower_components/angular/angular.min.js',
'public/bower_components/angular-sanitize/angular-sanitize.min.js',
'public/bower_components/marked/lib/marked.js',
@ -104,7 +105,6 @@ module.exports = function(grunt) {
'build/bower_components/habitrpg-shared/dist/spritesheets.css': ['public/bower_components/habitrpg-shared/dist/spritesheets.css'],
'build/bower_components/bootstrap/docs/assets/css/bootstrap.css': ['public/bower_components/bootstrap/docs/assets/css/bootstrap.css'],
'build/bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css': ['public/bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css'],
'build/bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css': ['public/bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css'],
'build/bower_components/bootstrap/docs/assets/css/docs.css': ['public/bower_components/bootstrap/docs/assets/css/docs.css']
}
}

View file

@ -5,6 +5,7 @@
@import "../bower_components/bootstrap-datepicker/css/datepicker.css"
@import "../bower_components/angular-ui/build/angular-ui.min.css"
@import "../bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css"
@import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
// Custom includes
@import "./tasks.styl"
@ -21,7 +22,6 @@
@import "./game-pane.styl"
@import "./npcs.styl"
@import "./challenges.styl"
@import "./tour.styl"
// fix exploding to very wide for some reason
.datepicker

View file

@ -26,3 +26,9 @@
z-index 0
display block
position:relative
// Tour (Justin)
.tour-tour .NPC-Justin
float: left
margin-right: 5px
.popover-navigation {clear:both;}

View file

@ -1,5 +0,0 @@
@import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
.tour-tour .NPC-Justin
float: left
padding-right: 5px
.popover-navigation {clear:both;}