updated higlightjs, fixes for code blocks, code block style changes
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -11,7 +11,7 @@ gem 'hirb' # pretty console output
|
||||
gem 'rb-readline'
|
||||
gem 'rest-client'
|
||||
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
|
||||
|
||||
# Gems used only for assets and not required
|
||||
|
||||
11
Gemfile.lock
11
Gemfile.lock
@@ -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
|
||||
remote: git://github.com/jomo/kaminari.git
|
||||
revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70
|
||||
@@ -68,8 +75,6 @@ GEM
|
||||
debug_inspector (0.0.2)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
highlight_js-rails (7.1.0)
|
||||
rails (>= 3.1.1)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
hirb (0.7.1)
|
||||
@@ -171,7 +176,7 @@ DEPENDENCIES
|
||||
binding_of_caller
|
||||
capistrano
|
||||
coffee-rails
|
||||
highlight_js-rails
|
||||
highlight_js-rails!
|
||||
hirb
|
||||
jquery-rails
|
||||
kaminari!
|
||||
|
||||
@@ -36,7 +36,7 @@ $(function(){
|
||||
});
|
||||
$('pre code').each(function() {
|
||||
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 {
|
||||
$(this).parent().attr("lang", "(language unknown)");
|
||||
}
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
*= require_self
|
||||
*= require style.css
|
||||
*= require mobi.css
|
||||
*= require highlight/tomorrow-night.css
|
||||
*= require highlight/default.css
|
||||
*/
|
||||
@@ -344,9 +344,9 @@ pre {
|
||||
background: #3f3f3f;
|
||||
|
||||
&:after {
|
||||
color: #fff;
|
||||
content: attr(lang); // show language on top right
|
||||
font-style: italic;
|
||||
text-transform: capitalize;
|
||||
margin: 4px 10px;
|
||||
position: absolute;
|
||||
right: -10px;
|
||||
@@ -365,10 +365,7 @@ pre {
|
||||
code {
|
||||
display: block;
|
||||
padding: 0.5em;
|
||||
color: #C5C8C6; //hljs
|
||||
box-shadow: 0 0 16px #222 inset;
|
||||
background: #3f3f3f !important;
|
||||
border: none;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 3px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user