From 964eb91799890a6901eca0705cfb9ba6c0bcead9 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 10 Sep 2013 18:31:26 -0400 Subject: [PATCH] update tour to conform to guidelines at #1507 --- Gruntfile.js | 2 +- public/css/index.styl | 2 +- public/css/npcs.styl | 6 ++++++ public/css/tour.styl | 5 ----- 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 public/css/tour.styl diff --git a/Gruntfile.js b/Gruntfile.js index ce422bda48..dc9e98a78f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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'] } } diff --git a/public/css/index.styl b/public/css/index.styl index 96738d907d..fbb9913e4a 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -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 diff --git a/public/css/npcs.styl b/public/css/npcs.styl index b4d82d77be..c9cc6d3bfc 100644 --- a/public/css/npcs.styl +++ b/public/css/npcs.styl @@ -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;} \ No newline at end of file diff --git a/public/css/tour.styl b/public/css/tour.styl deleted file mode 100644 index 01199d8a71..0000000000 --- a/public/css/tour.styl +++ /dev/null @@ -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;} \ No newline at end of file