Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-19 13:48:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix layout and modal issues

Browse source 
These were "regressions" after the bootstrap 3 migration
This commit is contained in:
Reinier Balt 2014-06-26 13:59:06 +02:00
parent 29acdc5a9d
commit 2f13da8bff
9 changed files with 89 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/tracks.js.coffee.erb
View file

@ -48,13 +48,16 @@ TracksApp =
dialog.find("form").attr("data-link", settings.target_link)
dialog.find("form").attr("data-id", settings.target_id)
# set title of dialog
dialog.find("h3#myModalLabel").html(settings.title)
dialog.find("h4#myModalLabel").html(settings.title)
# set focus to input field when dialog is shown
dialog.on 'shown', ->
dialog.on 'show.bs.modal', ->
# twitter-typeahead adds span around search field with display:inline-block. This causes
# the search field to ignore the width set in tracks.css
$("span.twitter-typeahead").css("display", "block")
dialog.on 'shown.bs.modal', ->
$("input#tracks-goto-item").focus()
# show the dialog
dialog.modal()
@ -120,7 +123,7 @@ TracksApp =
TracksApp.selectTodo($("div.todo-item").first())
noteOfTodo: (todo) ->
notes_id = todo.find("i.icon-book").attr("data-note-id")
notes_id = todo.find("i.fa-book").attr("data-note-id")
$("div#" + notes_id )
toggleNoteOfTodo: (todo) ->
@ -154,12 +157,12 @@ root = exports ? this
root.TracksApp = TracksApp
$ ->
$("a#menu-keyboard-shotcuts").click -> $('div#tracks-shortcuts-dialog').modal()
$("a.button-add-todo").click -> TracksApp.add_todo()
$("a.button-home").click -> TracksApp.go_home()
$("a.button-goto").click -> TracksApp.go_menu()
$("span.todo-description-icons i.icon-book").click -> TracksApp.toggleNoteOfTodo( $(this).parent().parent().parent().parent().parent() )
$("span.todo-item-description-container").click -> TracksApp.selectTodo( $(this).parent().parent().parent() )
$("a#menu-keyboard-shotcuts").click -> $('div#tracks-shortcuts-dialog').modal()
$("button.button-add-todo").click -> TracksApp.add_todo()
$("button.button-home").click -> TracksApp.go_home()
$("button.button-goto").click -> TracksApp.go_menu()
$("span.todo-description-icons i.fa-book").click -> TracksApp.toggleNoteOfTodo( $(this).parent().parent().parent().parent().parent() )
$("span.todo-item-description-container").click -> TracksApp.selectTodo( $(this).parent().parent().parent() )
autocompleteDataset = new Dataset
limit: 7

10
app/assets/stylesheets/tracks.css.scss
View file

@ -9,6 +9,7 @@ body {
div.tracks-main {
background-color: #FFF;
border-radius: 10px;
padding-top: 10px;
}
/* Header */
@ -43,7 +44,7 @@ div.todo-item {
margin-top: 7px;
border: 3px solid #EEE;
border-width: 0px 0px 1px 0px;
padding: 0px 3px 0px 3px;
padding: 0px 3px 0px 3px;
min-height: none;
line-height: none;
@ -82,7 +83,7 @@ div.todo-item {
background-color: #EEE;
border-radius: 3px;
padding: 10px;
margin: 0px -3px 0px -3px;
margin: 0px 12px 0px -3px;
}
div.todo-sub-menu {
margin-top: 5px;
@ -117,6 +118,11 @@ span.tags {
.label {
margin-right: 1px;
background-color: #BBB;
}
}
span.tags, div.tracks-todo-badges{
span.label {
a:hover, a:focus {
text-decoration: none;
}