almanac 0.9.1 → 0.9.2

data/README.md

@@ -3,7 +3,7 @@ Almanac is the most elegant mountable blog engine that can be easily hooked up i
 
 ## Main Features
 - Slick default design that can be easily customized.
-- Markdown for everything.
+- kramdown (better Markdown) for all input fields.
 - Drafts that make sense.
 - Easy Google Analytics support.
 - Disqus support for comments.
@@ -71,6 +71,18 @@ Lastly, you'll have to specify the name of your user model. Create a `config/ini
 Almanac.user_class = "User" # other possibilities: "Author", "Writer", etc.
 ```
 
+## Kramdown
+[Kramdown](http://kramdown.rubyforge.org/index.html) is the superset of Markdown. All input fields can use it. Check out all [syntax rules](http://kramdown.rubyforge.org/syntax.html) for kramdown. One of the best examples of kramdown usage is code highlighting that is part of Almanac. In your post you can simply write:
+
+```
+~~~ruby
+def foo
+  puts "bar"
+end
+```
+
+And it will generate a nice looking block of Ruby code once your post is published.
+
 ## Post Comments
 Almanac supports commenting via [Disqus](http://disqus.com/)—the best commenting solution on the web. If you want your blog to support commenting, register with Disqus, add a website and copy-paste "Site Shortname" to the appropriate field in Blog Settings.
 
@@ -95,4 +107,4 @@ Go back to the `almanac` directory and run `rspec spec`.
 - Write code for a feature or bug fix.
 - Add Rspec tests for it.
 - Commit, do not make changes to rakefile or version.
-- Submit a pull request.
+- Submit a pull request.

data/app/assets/javascripts/almanac/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require bootstrap/bootstrap
+//= require twitter/bootstrap
 //= require_tree .

data/app/assets/stylesheets/almanac/3-main.css.scss

@@ -5,7 +5,7 @@ $font-family-title: "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue B
 .almanac {
   background-color: grey;
   [class^="icon-"], [class*=" icon-"] {
-    background-image: url("icons/glyphicons-halflings.png");
+
   }
 
   input[type="file"] {

data/app/assets/stylesheets/almanac/application.css

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require bootstrap/bootstrap
- *= require bootstrap/bootstrap-responsive
+ *= require 'bootstrap_and_overrides'
  *= require_tree .
  */

data/app/assets/stylesheets/almanac/bootstrap_and_overrides.css.less

@@ -0,0 +1,36 @@
+@import 'twitter/bootstrap/bootstrap';
+@import 'twitter/bootstrap/variables.less';
+@import 'twitter/bootstrap/mixins.less';
+@import 'twitter/bootstrap/responsive-utilities.less';
+@import 'twitter/bootstrap/responsive-768px-979px';
+@import 'twitter/bootstrap/responsive-767px-max';
+@import 'twitter/bootstrap/responsive-1200px-min.less';
+@import 'twitter/bootstrap/responsive-navbar.less';
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
+@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
+
+// Font Awesome
+@import "fontawesome/font-awesome";
+
+// Glyphicons
+//@import "twitter/bootstrap/sprites.less";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

data/lib/almanac.rb

@@ -8,7 +8,6 @@ require "will_paginate"
 require "will_paginate-bootstrap"
 require "acts-as-taggable-on"
 require "almanac/MarkdownParser"
-require "bootstrap-rails-engine"
 
 module Almanac
   mattr_accessor :user_class

data/lib/almanac/version.rb

@@ -1,3 +1,3 @@
 module Almanac
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almanac
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-rails-engine
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -389,6 +405,7 @@ files:
 - app/assets/stylesheets/almanac/2-prettify.css
 - app/assets/stylesheets/almanac/3-main.css.scss
 - app/assets/stylesheets/almanac/application.css
+- app/assets/stylesheets/almanac/bootstrap_and_overrides.css.less
 - app/controllers/almanac/application_controller.rb
 - app/controllers/almanac/blogs_controller.rb
 - app/controllers/almanac/images_controller.rb