jap_mag 0.0.1 → 0.0.2

data/README.md

@@ -20,6 +20,10 @@ Or install it yourself as:
 
 ## Usage
 
+In your CSS manifest (application.css in default):
+
+     *= require jap_mag
+
 Documentation is one the way. Stay tuned!
 
 ## Contributing

data/app/assets/stylesheets/base.scss

@@ -53,11 +53,15 @@ h1 {
 }
 
 h2 {
-	font-size: 1.4em;
+	font-size: 1.6em;
 }
 
 h3 {
-	font-size: 1.2em;
+	font-size: 1.4em;
+}
+
+p {
+	margin: 1em 0;
 }
 
 blockquote {

data/app/assets/stylesheets/{index.css → jap_mag.css}

@@ -10,9 +10,7 @@
  *
  *= require_self
  *= require reset
- *= require_tree ./vendors
  *= require variables
  *= require widgets
  *= require base
- *= require_tree ./modules
  */

data/app/assets/stylesheets/mixins.scss

@@ -1,3 +1,10 @@
+@mixin rounded($radius: 5px) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+
 @mixin box-shadow($effect: 1px 0px 5px black) {
 	box-shadow: $effect;
 	-moz-box-shadow: $effect;

data/app/assets/stylesheets/widgets.scss

@@ -91,7 +91,7 @@ table.basic {
 	td {
 		border-top: 1px solid #ccc;
 
-		.actions a {
+		&.actions a {
 			margin-right: 10px;
 		}
 
@@ -219,18 +219,6 @@ div.tab {
 }
 /* @end */
 
-.toolbar {
-	overflow: hidden;
-
-	.left {
-		float: left;
-	}
-
-	.right {
-		float: right;
-	}
-}
-
 /* @form.basic */
 form.basic {	
 	input[type=text], input[type=search], input[type=email], input[type=password], textarea {
@@ -315,40 +303,8 @@ img.avatar {
 	text-transform: uppercase;
 	white-space: nowrap;
 	background-color: #BFBFBF;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
+	@include rounded(3px);
 	line-height: 18px;
-
-	&.finished {
-		background-color: $color_green;
-	}
-
-	&.wishlist {
-		background-color: $color_pink;
-	}
-
-	&.reading {
-		background-color: $color_yellow;
-	}
-
-	&.rank {
-		background-color: transparent;
-		border: 1px solid #999;
-		color: #999;
-	}
-}
-
-.tag {
-	border: 0px solid;
-	padding: 0 5px 0 13px;
-	margin: 0 3px 3px 0;
-	float: left;
-	background: url(asset_path("tag.png", image)) no-repeat 0;
-
-	&.current:hover {
-		text-decoration: none;
-	}
 }
 
 /* scope button */
@@ -480,28 +436,16 @@ ul.scopes {
 	
 	.left {
 		float: left;
+		margin-right: 10px;
 	}
 	
 	.right {
 		float: right;
+		margin-left: 10px;
 	}
 }
 
 .list {
 	list-style: disc;
 	margin: 0 0 9px 3em;
-}
-
-
-.block {
-	margin: 0 0 20px;
-	
-	h3 {
-		@include h3;
-	}
-	
-	table.basic th {
-		background: none;
-		font-weight: bold;
-	}
 }

data/app/controllers/application_controller.rb

@@ -0,0 +1,11 @@
+class ApplicationController < ActionController::Base
+
+  # i18N
+  def _ key, options={}
+    key = (key[0] == "/") ? key.gsub("/", "") : "#{params[:controller]}.#{params[:action]}.#{key}"
+    t(key, options)
+  end
+
+  helper_method :_
+
+end

data/app/helpers/widgets_helper.rb

@@ -107,8 +107,7 @@ module WidgetsHelper
   # call to action
   #
   def cta text, url, html_options={}
-    default_html_options = {:class => "cta"}
-    html_options = default_html_options.merge(html_options)
+
     html_options[:class] = (html_options[:class].to_s + " cta").strip
 
     link_to content_tag(:span, text), url, html_options

data/app/views/layouts/_flash.erb

@@ -0,0 +1,12 @@
+<div id="flash">
+	<% if flash[:notice] %>
+	<div class="notice"><%= flash[:notice] %></div>
+	<% elsif flash[:error] %>
+	<div class="error"><%= flash[:error] %></div>
+	<% elsif flash[:alert] %>
+	<div class="warning"><%= flash[:alert] %></div>
+	<% elsif flash[:warning] %>
+	<div class="warning"><%= flash[:warning] %></div>   
+	<% end %>
+	<% flash[:notice] = flash[:error] = flash[:warning] = nil %>
+</div>

data/app/views/layouts/_footer.erb

@@ -0,0 +1,11 @@
+<div id="footer">
+	<p><%= t :copyright %></p>
+	<%= clearfix %>
+	<ul class="languages">
+		<%
+		p = params.dup.delete_if{|key| %w(action controller locale).include?(key)}
+		%>
+		<li class="en"><%= link_to_unless_current t(:english), locale: :en, params: p %></li>
+		<li class="zh-CN"><%= link_to_unless_current t(:chinese), locale: "zh-CN", params: p %></li>
+	</ul>
+</div>

data/app/views/layouts/_header.erb

@@ -0,0 +1,5 @@
+<div id="header">
+	<h1><%= link_to t("logo"), root_path %></h1>
+	<p class="slogan"><%= t("slogan") %></p>
+	<%= render "layouts/navigation" %>
+</div>

data/app/views/layouts/_navigation.erb

@@ -0,0 +1,3 @@
+<ul class="navigation">
+  <li><%= link_to_unless_current t("navigation.home"), root_path %></li>
+</ul>

data/app/views/layouts/application.erb

@@ -0,0 +1,33 @@
+<!doctype html>
+<!--[if lt IE 9]><html class="ie"><![endif]-->
+<!--[if gte IE 9]><!--><html><!--<![endif]-->
+<head>
+	<meta charset="utf-8"/>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1, minimum-scale=1,user-scalable=yes" />
+
+	<title><%= content_for(:title) %></title>
+
+	<%= stylesheet_link_tag    "application", :media => "all" %>
+	<%= csrf_meta_tags %>
+</head>
+
+<body class="<%= controller.controller_name.titleize.gsub(/\s/, "") %>"<%= raw " id=\"#{content_for(:id).to_s.titleize.gsub(/\s/, "")}\"" unless content_for(:id).blank? %>>
+	<div class="<%= (controller.action_name).titleize.gsub(/\s/, "") %>" id="body">
+		<%= render :partial => "/layouts/header" %>
+
+		<div id="wrapper">
+			<%= render :partial => "/layouts/flash", :locals => {:flash => flash} %>
+			<%= yield %>
+		</div>
+
+		<%= render :partial => "/layouts/footer" %>
+	</div>
+	<%= render "/layouts/ga" if Rails.env.production? %>
+	<!-- layout:application -->
+	<%= javascript_include_tag "application" %>
+	<!--[if lt IE 9]>
+	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]-->
+</body>
+</html>

data/jap_mag.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["felixding@gmail.com"]
   gem.description   = %q{JapMag is the design language created by Felix Ding. This gem helps designers start a project that follows JapMag.}
   gem.summary       = "jap_mag-#{gem.version}"
-  gem.homepage      = "http://dingyu.me"
+  gem.homepage      = "https://github.com/felixding/JapMag"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/jap_mag/version.rb

@@ -1,3 +1,3 @@
 module JapMag
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jap_mag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies: []
 description: JapMag is the design language created by Felix Ding. This gem helps designers
   start a project that follows JapMag.
@@ -25,16 +25,23 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/base.scss
-- app/assets/stylesheets/index.css
+- app/assets/stylesheets/jap_mag.css
 - app/assets/stylesheets/mixins.scss
 - app/assets/stylesheets/reset.scss
 - app/assets/stylesheets/variables.scss
 - app/assets/stylesheets/widgets.scss
+- app/controllers/application_controller.rb
 - app/helpers/widgets_helper.rb
+- app/views/layouts/_flash.erb
+- app/views/layouts/_footer.erb
+- app/views/layouts/_ga.erb
+- app/views/layouts/_header.erb
+- app/views/layouts/_navigation.erb
+- app/views/layouts/application.erb
 - jap_mag.gemspec
 - lib/jap_mag.rb
 - lib/jap_mag/version.rb
-homepage: http://dingyu.me
+homepage: https://github.com/felixding/JapMag
 licenses: []
 post_install_message: 
 rdoc_options: []