many tiny changes

This commit is contained in:
jomo
2013-06-25 02:53:12 +02:00
parent c5dfdbeb8f
commit ceb39bf0c3
22 changed files with 209 additions and 80 deletions

View File

@@ -13,3 +13,5 @@
//= #require jquery
//= #require jquery_ujs
//= #require_tree .
//= require jquery
//= require confirm

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@@ -0,0 +1,6 @@
$(function(){
$('[data-confirm]').click(function(){
var c = confirm($(this).attr('data-confirm'));
if (!c) return false;
})
})

6
app/assets/javascripts/jquery.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@@ -173,6 +173,9 @@ and (min-width: 1000px)
#post-content {
margin-top: 10px;
clear: both;
img {
max-width: 100%;
}
}
#comments {
@@ -181,10 +184,18 @@ and (min-width: 1000px)
margin-bottom: 12px;
padding: 15px;
box-shadow: 0 0 10px #bbb inset;
&:hover .editlink {
opacity: 1;
margin-right: 0;
}
&.author {
background: #dadada;
box-shadow: 0 0 10px #a7a7a7 inset;
}
.comment-content {
word-wrap: break-word;
overflow: hidden;
}
}
textarea {
width: 480px;
@@ -296,7 +307,24 @@ and (min-width: 1000px)
}
}
.editlink {
float: right;
opacity: 0;
margin-right: -10px;
transition: opacity 0.3s, margin 0.3s;
}
#edit_create_post {
float: left;
}
#delete_post {
float: right;
}
#blogpost_text {
width: 100%;
}