Skip to content
Browse files

Gemfile works with ruby 1.9.2

  • Loading branch information...
1 parent 2a6cf55 commit dc1553c3b761573e505d2e15575024a76f83caa5 @brownman committed Nov 4, 2012
View
BIN .sass-cache/dde4918d3d6e6208f003e8a059cae43f879f4cbf/bootstrap_and_overrides.css.scssc
Binary file not shown.
View
1 app/assets/javascripts/application.js
@@ -13,6 +13,7 @@
//= require jquery
//= require jquery_ujs
//= require bootstrap
+//= require bootstrap-collapse
//= require underscore
//= require backbone
//= require backbone-relational
View
4 app/assets/javascripts/application.js~
@@ -12,7 +12,9 @@
//
//= require jquery
//= require jquery_ujs
-//= require twitter/bootstrap
+//= require bootstrap
+//= require bootstrap-modal
+//= require bootstrap-collapse
//= require underscore
//= require backbone
//= require backbone-relational
View
9 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs
@@ -4,22 +4,23 @@
-<input class='span6' height='1em' type='text' value='<%= obj.title %>'></input>
+<input type="checkbox" name="direction" class="checkbox span12" <%= obj.direction ? 'checked="checked"' : '' %> />
+<input class='span12' height='1em' type='text' value='<%= obj.title %>'></input>
-<input height='1em' class='span3' name="content" value='<%= obj.content %>' />
+<input height='1em' class='span12' name="content" value='<%= obj.content %>' />
-<input rows="1" type="checkbox" name="direction" class="direction" <%= obj.direction ? 'checked="checked"' : '' %> />
-<input class="btn save" type="button" value="<%= obj2 %>">
+
+<input class="btn save span12" type="button" value="<%= obj2 %>">
<div class="btn-group todo-array " <%= obj.direction ? 'dir="rtl"' : '' %> >
View
13 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~
@@ -4,26 +4,23 @@
-<input class='span6' height='1em' type='text' value='<%= obj.title %>'></input>
+<input type="checkbox" name="direction" class="checkbox span6" <%= obj.direction ? 'checked="checked"' : '' %> />
+<input class='span12' height='1em' type='text' value='<%= obj.title %>'></input>
-<input height='1em' class='span3' name="content" value='<%= obj.content %>' />
+<input height='1em' class='span12' name="content" value='<%= obj.content %>' />
-<input rows="1" type="checkbox" name="direction" class="direction" <%= obj.direction ? 'checked="checked"' : '' %> />
-<input width='0px' class="btn save" type="button" value="<%= obj2 %>" />
-<button width='0px' class="btn save" type="submit">
-<%= obj2 %>
-</button>
-<input class="btn save" type="button" value="<%= obj2 %>">
+
+<input class="btn save span12" type="button" value="<%= obj2 %>">
<div class="btn-group todo-array " <%= obj.direction ? 'dir="rtl"' : '' %> >
View
2 app/assets/javascripts/backbone/views/comments/comment_view.js.coffee
@@ -72,7 +72,7 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View
splitted2: ->
arr0 = @get_array()
- list = "<% _.each(people, function(name) { %> <button class='btn btn-info btn-block CodeMirror-wrap test'><%= name %></button> <% }); %>";
+ list = "<% _.each(people, function(name) { %> <button class='btn btn-info btn-block test'><%= name %></button> <% }); %>";
arr = _.template(list, {people : arr0});
#console.log(arr)
arr
View
6 app/assets/javascripts/bootstrap.js.coffee
@@ -2,7 +2,7 @@ jQuery ->
#$("a[rel=popover]").popover()
#$(".tooltip").tooltip()
#$("a[rel=tooltip]").tooltip()
- #$('.accordion-group').collapse({
- #toggle: true
- #})
+ $('.accordion-group').collapse({
+ toggle: true
+ })
console.log('start')
View
16 app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -2,13 +2,7 @@
/* mixins, variables, etc. */
-$grayMediumLight: #eaeaea;
-@mixin box_sizing {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
/* universal */
div.new_comment {
@@ -34,7 +28,7 @@ tr {
button {
text-align: left;
-
+width: 100%;
/*
*padding-left: 0px;
*/
@@ -81,7 +75,7 @@ border:1px solid #000000;
}
-.test2:hover {
+.test:hover {
white-space:normal;
@@ -105,4 +99,10 @@ font-weight:bold;
}
+.direction {
+
+/*
+ *padding-left:0;
+ */
+}

0 comments on commit dc1553c

Please sign in to comment.
Something went wrong with that request. Please try again.