FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
pixeldesu 2015-06-08 22:17:14 +02:00
parent 8109cb8e2d f464ca2288
commit 0aeab3b7f7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -60,8 +60,8 @@ for the configuration we use on Retrospring.
#### Configure It #### Configure It
# Change into the justask directory # Change into the project directory
$ cd justask $ cd retrospring
# Copy the example config # Copy the example config
$ cp config/justask.yml.example config/justask.yml $ cp config/justask.yml.example config/justask.yml

2
app/assets/stylesheets/scss/navbar.scss
View File

@ -133,7 +133,7 @@
border: none; border: none;
} }
@media (min-width: 768px) { @media (min-width: 769px) {
nav.navbar .nav > li:not(.profile--image-dropdown) { nav.navbar .nav > li:not(.profile--image-dropdown) {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
position: relative; position: relative;

2
app/controllers/ajax/question_controller.rb
View File

@ -86,7 +86,7 @@ class Ajax::QuestionController < ApplicationController
@message = I18n.t('messages.question.preview.fail') @message = I18n.t('messages.question.preview.fail')
begin begin
@markdown = markdown(params[:md], Time.new) @markdown = markdown params[:md]
@message = I18n.t('messages.question.preview.okay') @message = I18n.t('messages.question.preview.okay')
rescue rescue
@status = :fail @status = :fail