From 755a86e3d3955567e6568f388fa0a4c20a7d526d Mon Sep 17 00:00:00 2001
From: Dominik Kundel <dominik.kundel@gmail.com>
Date: Fri, 15 Aug 2014 01:56:01 +0200
Subject: [PATCH] moving some styling
---
.../play/level/tome/spell_palette_entry.sass | 72 +++++++++++++++++
app/styles/play/level/tome/tome.sass | 78 -------------------
app/views/play/level/tome/SpellView.coffee | 3 +-
3 files changed, 73 insertions(+), 80 deletions(-)
diff --git a/app/styles/play/level/tome/spell_palette_entry.sass b/app/styles/play/level/tome/spell_palette_entry.sass
index f6afd320e..489fcab54 100644
--- a/app/styles/play/level/tome/spell_palette_entry.sass
+++ b/app/styles/play/level/tome/spell_palette_entry.sass
@@ -30,3 +30,75 @@
&.undefined
color: rgb(197, 6, 11)
+.spell-palette-popover.popover
+ // Only those popovers which are our direct children (spell documentation)
+ max-width: 600px
+
+ &.pinned
+ left: auto !important
+ top: 50px !important
+ right: 45%
+ // bottom: 151px
+ @include user-select(text)
+ // Wish I could set max-width and max-height (and override Bootstrap's stuff)
+ // but without explicitly setting height, child overflow-y: scroll doesn't work
+ min-width: 45%
+ height: 60%
+
+ .arrow
+ display: none
+
+ .close
+ position: absolute
+ top: 5%
+ right: 5%
+ font-size: 28px
+ font-weight: bold
+ @include opacity(0.6)
+ text-shadow: 0 1px 0 white
+
+ &:hover
+ @include opacity(1)
+
+ padding: 10px 10px 30px 10px
+ border-image: url(/images/level/popover_background.png) 18 fill round
+ border-width: 15px
+ @include box-shadow(0 0 0 #000)
+
+ h1:not(.not-code), h2:not(.not-code), h3:not(.not-code), h4:not(.not-code), h5:not(.not-code), h6:not(.not-code)
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace
+
+ .popover-title
+ background-color: transparent
+ margin: 0 14px
+ padding: 8px 0
+ border-bottom-color: #ccc
+
+ .popover-content
+ max-height: 100%
+ overflow-y: auto
+ margin-right: 10px
+ img
+ float: right
+
+ &.top .arrow
+ bottom: -2%
+ &.bottom .arrow
+ top: -2%
+ &.left .arrow
+ right: 0%
+ &.right .arrow
+ left: -3%
+
+html.no-borderimage
+ .spell-palette-popover.popover
+ background: transparent url(/images/level/popover_background.png)
+ background-size: 100% 100%
+ border: 0
+
+html.fullscreen-editor
+ .spell-palette-popover.popover.pinned
+ min-width: 600px
+ bottom: inherit
+ right: 50%
+ margin-right: -300px
\ No newline at end of file
diff --git a/app/styles/play/level/tome/tome.sass b/app/styles/play/level/tome/tome.sass
index d3db84cd2..64f0321b9 100644
--- a/app/styles/play/level/tome/tome.sass
+++ b/app/styles/play/level/tome/tome.sass
@@ -73,7 +73,6 @@
// Set z-index of autocomplete popup smaller than the one of popovers
.ace_editor.ace_autocomplete
z-index: 20 !important
- border-color: red !important
html.no-borderimage
#tome-view
@@ -89,80 +88,3 @@ html.no-borderimage
bottom: inherit
right: 50%
margin-right: -300px
-
-
-// NEED TO MOVE THIS
-// --------------------------------
-
-.spell-palette-popover.popover
- // Only those popovers which are our direct children (spell documentation)
- max-width: 600px
-
- &.pinned
- left: auto !important
- top: 50px !important
- right: 45%
- // bottom: 151px
- @include user-select(text)
- // Wish I could set max-width and max-height (and override Bootstrap's stuff)
- // but without explicitly setting height, child overflow-y: scroll doesn't work
- min-width: 45%
- height: 60%
-
- .arrow
- display: none
-
- .close
- position: absolute
- top: 5%
- right: 5%
- font-size: 28px
- font-weight: bold
- @include opacity(0.6)
- text-shadow: 0 1px 0 white
-
- &:hover
- @include opacity(1)
-
- padding: 10px 10px 30px 10px
- border-image: url(/images/level/popover_background.png) 18 fill round
- border-width: 15px
- @include box-shadow(0 0 0 #000)
-
- h1:not(.not-code), h2:not(.not-code), h3:not(.not-code), h4:not(.not-code), h5:not(.not-code), h6:not(.not-code)
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace
-
- .popover-title
- background-color: transparent
- margin: 0 14px
- padding: 8px 0
- border-bottom-color: #ccc
-
- .popover-content
- max-height: 100%
- overflow-y: auto
- margin-right: 10px
- img
- float: right
-
- &.top .arrow
- bottom: -2%
- &.bottom .arrow
- top: -2%
- &.left .arrow
- right: 0%
- &.right .arrow
- left: -3%
-
-html.no-borderimage
- .spell-palette-popover.popover
- background: transparent url(/images/level/popover_background.png)
- background-size: 100% 100%
- border: 0
-
-html.fullscreen-editor
- .spell-palette-popover.popover.pinned
- min-width: 600px
- bottom: inherit
- right: 50%
- margin-right: -300px
\ No newline at end of file
diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee
index 2169e6f91..db292efa6 100644
--- a/app/views/play/level/tome/SpellView.coffee
+++ b/app/views/play/level/tome/SpellView.coffee
@@ -201,11 +201,10 @@ module.exports = class SpellView extends CocoView
tabTrigger: doc.snippets[e.language].tab
snippetEntries.push entry
- # window.zatanna = @zatanna
+ # window.zatannaInstance = @zatanna
# window.snippetEntries = snippetEntries
lang = @editModes[e.language].substr 'ace/mode/'.length
@zatanna.addSnippets snippetEntries, lang
- window.aceEditor = @ace
onMultiplayerChanged: ->
if @session.get('multiplayer')