Clean up snow styles

Fixes slab#84
phamtrisi · May 14, 2014 · 166daf0 · 166daf0
1 parent ed4ba5e
commit 166daf0
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 148 deletions.
diff --git a/demo/styles/advanced.styl b/demo/styles/advanced.styl
@@ -17,9 +17,6 @@
 .toolbar-container
   border-bottom: 1px solid #ccc
 
-.toolbar-container .sc-format-group
-  margin-right: 10px
-
 .basic-wrapper .toolbar-container
   .sc-active, button:hover
     color: green

diff --git a/src/dom.coffee b/src/dom.coffee
@@ -163,6 +163,13 @@ DOM =
       when DOM.TEXT_NODE then return node.data or ""
       else return ""
 
+  getTextNodes: (root) ->
+    walker = root.ownerDocument.createTreeWalker(root, NodeFilter.SHOW_TEXT)
+    nodes = []
+    while node = walker.nextNode()
+      nodes.push(node)
+    return nodes
+
   getWindow: (node) ->
     return node.ownerDocument.defaultView or node.ownerDocument.parentWindow
 

diff --git a/src/lib/color-picker.coffee b/src/lib/color-picker.coffee
@@ -6,7 +6,6 @@ class ColorPicker extends Picker
   constructor: ->
     super
     DOM.addClass(@container, 'sc-color-picker')
-    DOM.addClass(@container.querySelector('.sc-picker-label'), 'sc-format-button')
 
   buildItem: (picker, option, index) ->
     item = super(picker, option, index)

diff --git a/src/lib/picker.coffee b/src/lib/picker.coffee
@@ -5,11 +5,11 @@ Normalizer = require('../normalizer')
 
 class Picker
   @TEMPLATE: '
-    <div class="sc-picker-label"></div>
-    <div class="sc-picker-options"></div>'
+    <span class="sc-picker-label"></span>
+    <span class="sc-picker-options"></span>'
 
   constructor: (@select) ->
-    @container = @select.ownerDocument.createElement('div')
+    @container = @select.ownerDocument.createElement('span')
     this.buildPicker()
     DOM.addClass(@container, 'sc-picker')
     @select.style.display = 'none'
@@ -31,7 +31,7 @@ class Picker
     )
 
   buildItem: (picker, option, index) ->
-    item = @select.ownerDocument.createElement('div')
+    item = @select.ownerDocument.createElement('span')
     item.setAttribute('data-value', option.getAttribute('value'))
     DOM.addClass(item, 'sc-picker-item')
     DOM.setText(item, DOM.getText(option))

diff --git a/src/themes/snow/index.coffee b/src/themes/snow/index.coffee
@@ -103,21 +103,19 @@ class SnowTheme extends DefaultTheme
       select = module.container.querySelector(".sc-#{format}")
       return unless select?
       switch format
-        when 'font', 'size'
+        when 'font', 'size', 'align'
           picker = new Picker(select)
-        when 'align'
-          picker = new Picker(select)
-          DOM.addClass(picker.container.querySelector('.sc-picker-label'), 'sc-format-button')
-          _.each(picker.container.querySelectorAll('.sc-picker-item'), (item) ->
-            DOM.addClass(item, 'sc-format-button')
-          )
         when 'color', 'background'
           picker = new ColorPicker(select)
           _.each(picker.container.querySelectorAll('.sc-picker-item'), (item, i) ->
             DOM.addClass(item, 'sc-primary-color') if i < 7
           )
       @pickers.push(picker) if picker?
     )
+    _.each(DOM.getTextNodes(module.container), (node) ->
+      if DOM.getText(node).trim().length == 0
+        DOM.removeNode(node)
+    )
 
 
 module.exports = SnowTheme