Fixed some treema styling.

This commit is contained in:
Scott Erickson 2014-04-24 11:38:30 -07:00
parent 1eb2adbc61
commit 84d21490ab
3 changed files with 8 additions and 26 deletions

View file

@ -85,10 +85,6 @@
padding-top: 6px
.treema-image-file
.btn:after
content: "Upload Picture"
margin-left: 20px
img
display: block
clear: both

View file

@ -18,20 +18,6 @@
border: 3px inset rgba(0, 100, 100, 0.2)
box-sizing: border-box
padding: 5px
.treema-node a.btn
height: 17px
display: inline-block
position: relative
width: 20px
padding: 0
float: left
margin-right: 2px
i
position: absolute
top: 1px
left: 3px
.treema-selection-map
position: fixed

View file

@ -28,7 +28,7 @@ class LiveEditingMarkup extends TreemaNode.nodeMap.ace
valEl.append(
$('<div></div>').append(
$('<button>Pick Image</button>')
.addClass('btn')
.addClass('btn btn-sm btn-primary')
.click(=> filepicker.pick @onFileChosen)
)
)
@ -70,19 +70,19 @@ class SoundFileTreema extends TreemaNode.nodeMap.string
buildValueForDisplay: (valEl) ->
mimetype = "audio/#{@keyForParent}"
pickButton = $('<a class="btn"><i class="icon-upload"></i></a>')
pickButton = $('<a class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-upload"></i></a>')
.click(=> filepicker.pick {mimetypes:[mimetype]}, @onFileChosen)
playButton = $('<a class="btn"><i class="icon-play"></i></a>')
playButton = $('<a class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-play"></i></a>')
.click(@playFile)
stopButton = $('<a class="btn"><i class="icon-stop"></i></a>')
stopButton = $('<a class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-stop"></i></a>')
.click(@stopFile)
dropdown = $('<div class="btn-group dropdown"></div>')
dropdownButton = $('<a></a>')
.addClass('btn dropdown-toggle')
.addClass('btn btn-primary btn-xs dropdown-toggle')
.attr('href', '#')
.append($('<span class="caret"></span>'))
.append($('<span class="glyphicon glyphicon-chevron-down"></span>'))
.dropdown()
dropdown.append dropdownButton
@ -107,7 +107,7 @@ class SoundFileTreema extends TreemaNode.nodeMap.string
if @data
valEl.append(playButton)
valEl.append(stopButton)
valEl.append(dropdown) if files.length and @canEdit()
valEl.append(dropdown) # if files.length and @canEdit()
if @data
path = @data.split('/')
name = path[path.length-1]
@ -168,7 +168,7 @@ class ImageFileTreema extends TreemaNode.nodeMap.string
buildValueForDisplay: (valEl) ->
mimetype = 'image/*'
pickButton = $('<a class="btn"><i class="icon-upload"></i></a>')
pickButton = $('<a class="btn btn-sm btn-primary"><i class="icon-upload"></i> Upload Picture</a>')
.click(=> filepicker.pick {mimetypes:[mimetype]}, @onFileChosen)
valEl.append(pickButton)