Trying to standardize sass imports in an effort to test #1615, to no avail.

2025-03-14 07:00:01 -04:00 · 2014-09-30 16:17:54 -07:00 · 2014-09-30 16:17:54 -07:00 · 2611e441d7
commit 2611e441d7
parent 1dda6bfcfc
43 changed files with 77 additions and 59 deletions
--- a/.gitignore
+++ b/.gitignore
@ -88,6 +88,8 @@ login.coffee
 # debugging
 *.heapsnapshot

+npm-debug.log*
+
 temp/
 ### If you add something here, copy it to the end of .npmignore, too. ###

--- a/.npmignore
+++ b/.npmignore
@ -104,3 +104,6 @@ login.coffee
 # debugging
 *.heapsnapshot

+npm-debug.log*
+
+temp/
--- a/app/styles/account/account_home.sass
+++ b/app/styles/account/account_home.sass
@ -1,5 +1,5 @@
-@import "../bootstrap/variables"
-@import "../bootstrap/mixins"
+@import "app/styles/bootstrap/variables"
+@import "app/styles/mixins"

 #account-home
  dl
--- a/app/styles/base.sass
+++ b/app/styles/base.sass
@ -1,5 +1,5 @@
-@import "bootstrap/variables"
-@import "bootstrap/mixins"
+@import "app/styles/bootstrap/variables"
+@import "app/styles/mixins"

 html
  background-color: #2f261d
--- a/app/styles/common/top_nav.sass
+++ b/app/styles/common/top_nav.sass
@ -1,5 +1,5 @@
-@import "../bootstrap/variables"
-@import "../bootstrap/mixins"
+@import "app/styles/bootstrap/variables"
+@import "app/styles/mixins"

 // This is still very blocky. Browser reflows? Investigate why.
 .open > .dropdown-menu
--- a/app/styles/community.sass
+++ b/app/styles/community.sass
@ -1,5 +1,5 @@
-@import "bootstrap/variables"
-@import "bootstrap/mixins"
+@import "app/styles/bootstrap/variables"
+@import "app/styles/mixins"

 #community-view
  
--- a/app/styles/editor/level/add-thangs-view.sass
+++ b/app/styles/editor/level/add-thangs-view.sass
@ -1,4 +1,4 @@
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"

 #add-thangs-view
  $addPaletteIconColumns: 6
--- a/app/styles/editor/level/modal/world_select.sass
+++ b/app/styles/editor/level/modal/world_select.sass
@ -1,4 +1,4 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"

 #select-point-modal
  @include user-select(none)
@ -15,4 +15,4 @@
    width: 23%
    box-sizing: border-box
    text-align: center
-    margin: 0 1% 10px
+    margin: 0 1% 10px
--- a/app/styles/editor/level/thangs-tab-view.sass
+++ b/app/styles/editor/level/thangs-tab-view.sass
@ -1,4 +1,4 @@
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"
   
 #thangs-tab-view
  $extantThangsWidth: 250px
--- a/app/styles/front-view.sass
+++ b/app/styles/front-view.sass
@ -1,5 +1,5 @@
-@import "bootstrap/mixins"
-@import "bootstrap/variables"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #front-view
  h1
--- a/app/styles/home.sass
+++ b/app/styles/home.sass
@ -1,5 +1,5 @@
-@import "bootstrap/mixins"
-@import "bootstrap/variables"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #home-view
  
--- a/app/styles/not_found.sass
+++ b/app/styles/not_found.sass
@ -1,5 +1,5 @@
-@import "bootstrap/mixins"
-@import "bootstrap/variables"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #not-found-view

--- a/app/styles/play.sass
+++ b/app/styles/play.sass
@ -1,5 +1,5 @@
-@import "bootstrap/mixins"
-@import "bootstrap/variables"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #play-view
  .row
--- a/app/styles/play/ladder_home.sass
+++ b/app/styles/play/ladder_home.sass
@ -1,4 +1,4 @@
-@import "app/styles/bootstrap/mixins"
+@import "app/styles/mixins"
@import "app/styles/bootstrap/variables"

 #ladder-home-view
--- a/app/styles/play/level.sass
+++ b/app/styles/play/level.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 body.is-playing
  background-color: black
--- a/app/styles/play/level/chat.sass
+++ b/app/styles/play/level/chat.sass
@ -1,4 +1,5 @@
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #level-chat-view

@ -76,4 +77,4 @@
    border-color: rgba(0,0,0,0.4)
    border-radius: 2px
    border-width: 1px
-    text-shadow: 1px 1px 1px black
+    text-shadow: 1px 1px 1px black
--- a/app/styles/play/level/control_bar.sass
+++ b/app/styles/play/level/control_bar.sass
@ -1,5 +1,5 @@
-@import "../../bootstrap/variables"
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #control-bar-view
  width: 55%
--- a/app/styles/play/level/goals.sass
+++ b/app/styles/play/level/goals.sass
@ -1,4 +1,5 @@
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #goals-view
  position: absolute
@ -50,4 +51,4 @@
  display: none

 #goals-view.collapsed ul
-  display: none
+  display: none
--- a/app/styles/play/level/gold.sass
+++ b/app/styles/play/level/gold.sass
@ -1,5 +1,5 @@
@import "app/styles/mixins"
-@import "app/styles/bootstrap/mixins"
+@import "app/styles/bootstrap/variables"

 #gold-view
  display: none
--- a/app/styles/play/level/hud.sass
+++ b/app/styles/play/level/hud.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #thang-hud.no-selection
  .center
--- a/app/styles/play/level/level-flags-view.sass
+++ b/app/styles/play/level/level-flags-view.sass
@ -1,5 +1,5 @@
@import "app/styles/mixins"
-@import "app/styles/bootstrap/mixins"
+@import "app/styles/bootstrap/variables"

 #level-flags-view
  display: none
--- a/app/styles/play/level/loading.sass
+++ b/app/styles/play/level/loading.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

@mixin wing-background($url: '', $backgroundPosition: left)
  background: black
--- a/app/styles/play/level/playback.sass
+++ b/app/styles/play/level/playback.sass
@ -1,4 +1,5 @@
-@import "../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #playback-view
  width: 55%
--- a/app/styles/play/level/thang_avatar.sass
+++ b/app/styles/play/level/thang_avatar.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .thang-avatar-view

--- a/app/styles/play/level/tome/cast_button.sass
+++ b/app/styles/play/level/tome/cast_button.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 +keyframes(castablePulse)
  from
--- a/app/styles/play/level/tome/problem_alert.sass
+++ b/app/styles/play/level/tome/problem_alert.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .problem-alert
  z-index: 10
--- a/app/styles/play/level/tome/spell.sass
+++ b/app/styles/play/level/tome/spell.sass
@ -1,4 +1,5 @@
-@import "app/styles/bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

@mixin editor-height($extraHeight)
  @include box-sizing(border-box)
--- a/app/styles/play/level/tome/spell_debug.sass
+++ b/app/styles/play/level/tome/spell_debug.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .spell-debug-view
  position: absolute
--- a/app/styles/play/level/tome/spell_list.sass
+++ b/app/styles/play/level/tome/spell_list.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #spell-list-view
  display: none
@ -15,4 +16,4 @@ html.no-borderimage
  #spell-list-view
    background: transparent url(/images/level/popover_background.png)
    background-size: 100% 100%
-    border: 0
+    border: 0
--- a/app/styles/play/level/tome/spell_list_entry.sass
+++ b/app/styles/play/level/tome/spell_list_entry.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .spell-list-entry-view
  code
--- a/app/styles/play/level/tome/spell_list_entry_thangs.sass
+++ b/app/styles/play/level/tome/spell_list_entry_thangs.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .spell-list-entry-view
  .spell-list-entry-thangs-view
@ -25,4 +26,4 @@ html.no-borderimage
    .spell-list-entry-thangs-view
      background: transparent url(/images/level/popover_background.png)
      background-size: 100% 100%
-      border: 0
+      border: 0
--- a/app/styles/play/level/tome/spell_palette.sass
+++ b/app/styles/play/level/tome/spell_palette.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #spell-palette-view
  position: absolute
--- a/app/styles/play/level/tome/spell_palette_entry.sass
+++ b/app/styles/play/level/tome/spell_palette_entry.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #level-view.hero .spell-palette-entry-view
  // Not clickable.
--- a/app/styles/play/level/tome/spell_toolbar.sass
+++ b/app/styles/play/level/tome/spell_toolbar.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .spell-toolbar-view
  position: relative
--- a/app/styles/play/level/tome/thang_list.sass
+++ b/app/styles/play/level/tome/thang_list.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #thang-list-view
  margin: 50px 15px 15px 15px
--- a/app/styles/play/level/tome/thang_list_entry.sass
+++ b/app/styles/play/level/tome/thang_list_entry.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .thang-list-entry-view
  @include opacity(0.90)
--- a/app/styles/play/level/tome/thang_list_entry_spells.sass
+++ b/app/styles/play/level/tome/thang_list_entry_spells.sass
@ -1,4 +1,5 @@
-@import "../../../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 .thang-list-entry-spells

--- a/app/styles/play/level/tome/tome.sass
+++ b/app/styles/play/level/tome/tome.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #tome-view
  height: 100%
--- a/app/styles/play/spectate.sass
+++ b/app/styles/play/spectate.sass
@ -1,5 +1,5 @@
-@import "app/styles/bootstrap/mixins"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #spectate-level-view
  #playback-view
--- a/app/styles/play/world-map-view.sass
+++ b/app/styles/play/world-map-view.sass
@ -1,6 +1,5 @@
-@import "app/styles/bootstrap/mixins"
-@import "app/styles/bootstrap/variables"
@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 $forestMapWidth: 2500
 $forestMapHeight: 1536
--- a/app/styles/recruitment_base.sass
+++ b/app/styles/recruitment_base.sass
@ -1,5 +1,5 @@
-@import "bootstrap/variables"
-@import "bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #employers-wrapper
  background-color: #B4B4B4
--- a/app/styles/user/user_home.sass
+++ b/app/styles/user/user_home.sass
@ -1,5 +1,5 @@
-@import "../bootstrap/variables"
-@import "../bootstrap/mixins"
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"

 #user-home
  margin-top: 20px
--- a/config.coffee
+++ b/config.coffee
@ -25,11 +25,11 @@ exports.config =
          vendor[\/\\](?!scripts[\/\\]Box2d)
          |bower_components[\/\\](?!aether)
        )///
-        'javascripts/box2d.js': ///^( 
+        'javascripts/box2d.js': ///^(
          # Include box2dweb for profiling and IE9
          # Vector renamed to Box2DVector to avoid name collisions
          # TODO: move this to assets/lib since we're not really joining anything here?
-          (vendor[\/\\]scripts[\/\\]Box2dWeb-2.1.a.3) 
+          (vendor[\/\\]scripts[\/\\]Box2dWeb-2.1.a.3)
        )///
        'javascripts/lodash.js': ///^(
          (bower_components[\/\\]lodash[\/\\]dist[\/\\]lodash.js)