Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

updated higlightjs, fixes for code blocks, code block style changes

Browse Source
This commit is contained in:
jomo
2015-01-25 16:30:58 +01:00
parent eb7892ebe4
commit c71df8193d
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -11,7 +11,7 @@ gem 'hirb' # pretty console output
gem 'rb-readline' gem 'rb-readline'
gem 'rest-client' gem 'rest-client'
gem 'activerecord-session_store' gem 'activerecord-session_store'
gem 'highlight_js-rails' gem 'highlight_js-rails', :git => 'git://github.com/RedstonerServer/highlight_js-rails.git'
gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination
# Gems used only for assets and not required # Gems used only for assets and not required
Gemfile.lock
+8 -3
View File
@@ -1,3 +1,10 @@
GIT
remote: git://github.com/RedstonerServer/highlight_js-rails.git
revision: 47f60d072950ebf99337e3ffb1a16ec3d4268f69
specs:
highlight_js-rails (8.4)
rails (>= 3.1.1)
GIT GIT
remote: git://github.com/jomo/kaminari.git remote: git://github.com/jomo/kaminari.git
revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70 revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70
@@ -68,8 +75,6 @@ GEM
debug_inspector (0.0.2) debug_inspector (0.0.2)
erubis (2.7.0) erubis (2.7.0)
execjs (2.0.2) execjs (2.0.2)
highlight_js-rails (7.1.0)
rails (>= 3.1.1)
highline (1.6.21) highline (1.6.21)
hike (1.2.3) hike (1.2.3)
hirb (0.7.1) hirb (0.7.1)
@@ -171,7 +176,7 @@ DEPENDENCIES
binding_of_caller binding_of_caller
capistrano capistrano
coffee-rails coffee-rails
highlight_js-rails highlight_js-rails!
hirb hirb
jquery-rails jquery-rails
kaminari! kaminari!
app/assets/javascripts/app.js
+1 -1
View File
@@ -36,7 +36,7 @@ $(function(){
}); });
$('pre code').each(function() { $('pre code').each(function() {
if ($(this).attr("class")) { if ($(this).attr("class")) {
$(this).parent().attr("lang", $(this).attr("class").replace("hljs", "").trim()); $(this).parent().attr("lang", $(this).attr("class").replace("hljs", "").toLowerCase().trim());
} else { } else {
$(this).parent().attr("lang", "(language unknown)"); $(this).parent().attr("lang", "(language unknown)");
} }
app/assets/stylesheets/application.css
+1 -1
View File
@@ -2,5 +2,5 @@
*= require_self *= require_self
*= require style.css *= require style.css
*= require mobi.css *= require mobi.css
*= require highlight/tomorrow-night.css *= require highlight/default.css
*/ */
app/assets/stylesheets/style.css.scss
+2 -5
View File
@@ -344,9 +344,9 @@ pre {
background: #3f3f3f; background: #3f3f3f;
&:after { &:after {
color: #fff;
content: attr(lang); // show language on top right content: attr(lang); // show language on top right
font-style: italic; font-style: italic;
text-transform: capitalize;
margin: 4px 10px; margin: 4px 10px;
position: absolute; position: absolute;
right: -10px; right: -10px;
@@ -365,10 +365,7 @@ pre {
code { code {
display: block; display: block;
padding: 0.5em; padding: 0.5em;
color: #C5C8C6; //hljs border: 1px solid #ccc;
box-shadow: 0 0 16px #222 inset;
background: #3f3f3f !important;
border: none;
border-radius: 3px; border-radius: 3px;
overflow-x: auto; overflow-x: auto;
} }