Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.3.9'

  • Loading branch information...
commit 36e7e0477a789f42ead95d5bbbfd2e9d08b27315 2 parents d25e38b + ad9a6c8
@noctivityinc authored
View
1  Gemfile
@@ -19,6 +19,7 @@ gem 'annotate-models'
gem 'hoptoad_notifier'
gem 'chronic'
gem 'whenever'
+gem 'RedCloth'
# github pulls
gem 'nifty-generators'
View
4 RELEASE_NOTES.textile
@@ -1,5 +1,9 @@
h1. Todopia Release Notes
+h3. 0.3.9
+* Added textile formatting to notes
+* Fixed positioning of note popup
+
h3. 0.3.8 (hotfix)
* upgraded to 2.3.8 (ugh)
* fixed bug which sends empty daily todos (sorry)
View
8 app/stylesheets/partials/_notes.sass
@@ -1,10 +1,16 @@
#notes
#index, #list
+ .title
+ color: white
+
.note
border-top: 1px dotted gray
- padding: 1em 0em
+ padding: 1em .50em
margin: 1em 0em
+ p
+ margin-bottom: 1.75em
+
.row
overflow: hidden
View
2  app/views/public/notes/_note.html.haml
@@ -3,4 +3,4 @@
.created_at= note.created_at
.trash= link_to (image_tag "icons/trash_on.png", :title => "Delete Note"), '#', :rel => delete_note_path(note), :class => 'delete_note'
.user= note.user.login
- .body= note.body
+ .body= RedCloth.new(note.body).to_html
View
2  app/views/public/notes/list.html.haml
@@ -1,4 +1,4 @@
#notes
#list
- %em Click to add notes...
+ %em.title Click to add notes...
= render @notes, :locals => {:no_controls => 'true'}
View
2  git-flow-version
@@ -1 +1 @@
-GITFLOW_VERSION=0.3.8
+GITFLOW_VERSION=0.3.9
View
8 public/javascripts/controllers/public/todos.js
@@ -245,7 +245,13 @@ function setup_tooltips(){
$(this).qtip({
content: { url: urlString, method: 'get'},
adjust: { screen: true },
- style: { color: '#ffffff', width: 350, padding: 5, color: 'black', name: 'dark', tip: 'leftTop',border: { 'width': 7, 'radius': 5, 'color': '#000' }}
+ position: {
+ corner: {
+ target: 'leftMiddle',
+ tooltip: 'rightTop'
+ }
+ },
+ style: { color: '#ffffff', width: 350, padding: 5, color: 'black', name: 'dark', tip: 'rightTop',border: { 'width': 7, 'radius': 5, 'color': '#000' }}
});
});
}
View
22 public/stylesheets/compiled/public.css
@@ -1368,16 +1368,24 @@ a img {
}
/* line 3, ../../../app/stylesheets/partials/_notes.sass */
+#notes #index .title, #notes #list .title {
+ color: white;
+}
+/* line 6, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note, #notes #list .note {
border-top: 1px dotted gray;
- padding: 1em 0em;
+ padding: 1em 0.5em;
margin: 1em 0em;
}
-/* line 8, ../../../app/stylesheets/partials/_notes.sass */
+/* line 11, ../../../app/stylesheets/partials/_notes.sass */
+#notes #index .note p, #notes #list .note p {
+ margin-bottom: 2em;
+}
+/* line 14, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .row, #notes #list .note .row {
overflow: hidden;
}
-/* line 11, ../../../app/stylesheets/partials/_notes.sass */
+/* line 17, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .row .created_at, #notes #index .note .row .user, #notes #list .note .row .created_at, #notes #list .note .row .user {
font-family: "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif;
font-style: italic;
@@ -1387,22 +1395,22 @@ a img {
display: inline;
float: left;
}
-/* line 17, ../../../app/stylesheets/partials/_notes.sass */
+/* line 23, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .row .user, #notes #list .note .row .user {
display: inline;
float: right;
}
-/* line 20, ../../../app/stylesheets/partials/_notes.sass */
+/* line 26, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .row .trash, #notes #list .note .row .trash {
display: inline;
float: right;
padding-left: 5px;
}
-/* line 25, ../../../app/stylesheets/partials/_notes.sass */
+/* line 31, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .body, #notes #list .note .body {
padding: 0.5em;
}
-/* line 29, ../../../app/stylesheets/partials/_notes.sass */
+/* line 35, ../../../app/stylesheets/partials/_notes.sass */
#notes #list .note {
color: white;
border-top: 1px dotted gray;
Please sign in to comment.
Something went wrong with that request. Please try again.