stickler 2.2.4 → 2.3.0

data/lib/stickler/client/unyank.rb

@@ -0,0 +1,50 @@
+module Stickler
+  class Client
+    class Unyank < Stickler::Client
+      def self.banner
+<<-_
+Restore a yanked gem to the gemserver's index.
+
+Usage: stickler unyank [options] --gem-version x.y.z gem
+
+  Options:
+_
+      end
+
+      def parser
+        unless @parser then
+          @parser = super
+          @parser.opt( :gem_version,  "The version of the gem to unyank (required)",  :type => :string, :required => true )
+          @parser.opt( :platform, "The platform of the gem to unyank", :type => :string, :default => ::Gem::Platform::RUBY )
+        end
+        return @parser
+      end
+
+      def parse( argv )
+        gem_name = nil
+        opts = super( argv ) do |p|
+          raise Trollop::CommandlineError, "At least one gem is required to unyank" if p.leftovers.empty?
+          gem_name = p.leftovers.shift
+        end
+        opts[:gem_name] = gem_name
+        return opts
+      end
+
+      def run
+        opts = parse( self.argv )
+        repo = remote_repo_for( opts )
+        spec = Stickler::SpecLite.new( opts[:gem_name], opts[:gem_version], opts[:platform] )
+
+        $stdout.write "Unyanking gem #{spec.full_name} from #{repo.uri} : "
+        $stdout.flush
+        if spec = repo.unyank( spec ) then
+          $stdout.puts "OK"
+        else
+          $stdout.puts "FAILURE"
+        end
+      rescue Stickler::Repository::Error => e
+        $stdout.puts "ERROR: #{e.message}"
+      end
+    end
+  end
+end

data/lib/stickler/middleware.rb

@@ -2,3 +2,10 @@ module Stickler
   module Middleware
   end
 end
+require 'stickler/middleware/helpers'
+require 'stickler/middleware/compression'
+require 'stickler/middleware/gemcutter'
+require 'stickler/middleware/index'
+require 'stickler/middleware/local'
+require 'stickler/middleware/mirror'
+require 'stickler/middleware/not_found'

data/lib/stickler/middleware/compression.rb

@@ -1,5 +1,3 @@
-require 'rack/utils'
-require 'stickler/middleware'
 module Stickler::Middleware
   class Compression
     def initialize( app )

data/lib/stickler/middleware/gemcutter.rb

@@ -1,8 +1,4 @@
-require 'sinatra/base'
-require 'stickler/middleware'
 require 'stickler/middleware/local'
-require 'stickler/repository/local'
-
 module Stickler::Middleware
   #
   # A rack middleware for implementing the gemcutter api
@@ -41,10 +37,23 @@ module Stickler::Middleware
       end
     end
 
+    # gemcutter unyank
+    post '/api/v1/gems/unyank' do
+      begin
+        spec = Stickler::SpecLite.new( params[:spec_name], params[:version] )
+        @repo.unyank( spec )
+        logger.info( "Unyanked #{spec.full_name}" )
+        return spec.to_s
+      rescue Stickler::Repository::Error => e
+        logger.error( "Error unyanking #{spec.full_name} to repo : #{e}" )
+        error( 500, "Error unyanking gem to repo: #{e}" )
+      end
+    end
+
     # gemcutter yank
     delete '/api/v1/gems/yank' do
       spec = Stickler::SpecLite.new( params[:gem_name], params[:version] )
-      if s = @repo.yank( spec ) then
+      if @repo.yank( spec ) then
         logger.info( "Yanked #{spec.full_name}" )
         return "Yanked #{spec.full_name}"
       else
@@ -54,8 +63,8 @@ module Stickler::Middleware
     end
 
     # direct delete
-    delete %r{\A/gems/((.*?)-([0-9.]+)(-.*?)?)\.gem\Z} do
-      full_name, name, version, platform = *params[:captures]
+    delete %r{\A/gems/#{NAME_VERSION_PLATFORM_REGEX}\.gem\Z} do
+      name, version, platform = *params[:captures]
       spec = Stickler::SpecLite.new( name, version, platform )
       @repo.delete( spec )
       logger.info( "Deleted #{spec.full_name}" )

data/lib/stickler/middleware/helpers.rb

@@ -1,5 +1,3 @@
-require 'stickler/middleware'
-require 'stickler/repository/local'
 module Stickler::Middleware
   module Helpers
     #
@@ -106,6 +104,6 @@ module Stickler::Middleware
         end
         return by_name
       end
-   end
+    end
   end
 end

data/lib/stickler/middleware/index.rb

@@ -1,11 +1,3 @@
-require 'sinatra'
-require 'stickler/middleware'
-require 'stickler/middleware/helpers'
-require 'stickler/repository/null'
-require 'stickler/spec_lite'
-require 'stickler/logable'
-require 'stickler/paths'
-
 module Stickler::Middleware
   # Index is a Rack middleware that passes all requests through except for the
   # following urls:

data/lib/stickler/middleware/local.rb

@@ -1,8 +1,4 @@
-require 'sinatra'
-require 'stickler/middleware'
 require 'stickler/middleware/index'
-require 'stickler/repository/local'
-
 module Stickler::Middleware
   #
   # A Sinatra middleware that implements the HTTP portions of a Modern gem server.  
@@ -27,7 +23,7 @@ module Stickler::Middleware
   #   use Stickler::Middleware::Local, :repo_root => '/path/to/repository',
   #                                    :serve_indexes => true
   #
-  class Local < Index
+  class Local < ::Stickler::Middleware::Index
     def initialize( app = nil, opts = {} )
       super( app, opts )
       # overwrite the repo that is set in the parent

data/lib/stickler/middleware/mirror.rb

@@ -1,7 +1,3 @@
-require 'sinatra/base'
-require 'stickler/middleware/index'
-require 'stickler/repository/mirror'
-
 module Stickler::Middleware
   #
   # A Mirror server keeps gems from one or more upstream gem servers in local

data/lib/stickler/middleware/not_found.rb

@@ -1,4 +1,3 @@
-require 'stickler/middleware'
 module Stickler::Middleware
   #
   # Idea completely taken from rack-contrib, it can function as a middleware

data/lib/stickler/repository.rb

@@ -1,10 +1,14 @@
-require 'stickler/error'
-require 'rubygems/format'
-require 'rubygems/platform'
-require 'rubygems/dependency'
-
 module Stickler
   module Repository
     class Error < ::Stickler::Error ; end 
   end
 end
+require 'stickler/repository/api'
+require 'stickler/repository/basic_authenticator'
+require 'stickler/repository/index'
+require 'stickler/repository/local'
+require 'stickler/repository/mirror'
+require 'stickler/repository/null'
+require 'stickler/repository/remote'
+require 'stickler/repository/remote_mirror'
+require 'stickler/repository/rubygems_authenticator'

data/lib/stickler/repository/index.rb

@@ -1,5 +1,4 @@
 require 'stickler/spec_lite'
-require 'stickler/repository'
 
 module Stickler::Repository
   #

data/lib/stickler/repository/local.rb

@@ -1,10 +1,8 @@
-require 'stickler/spec_lite'
-require 'stickler/logable'
-require 'stickler/repository'
 require 'stickler/repository/index'
 require 'addressable/uri'
 require 'tempfile'
 require 'forwardable'
+require 'rubygems/format'
 
 module Stickler::Repository
   #
@@ -162,6 +160,15 @@ module Stickler::Repository
       return uri_for_gem( spec )
     end
 
+    #
+    # See Api#unyank
+    #
+    def unyank( spec )
+      return nil if specification_file_exist?( spec )
+      return nil unless gem_file_exist?( spec )
+      install_specification( spec )
+    end
+
 
     #
     # :call-seq:
@@ -194,7 +201,8 @@ module Stickler::Repository
     # See Api#push
     #
     def push( path )
-      spec = specification_from_gem_file( path )
+      # is this line needed? Never used.
+      # spec = specification_from_gem_file( path )
       result = nil
       File.open( path ) do |io|
         result = add( io )

data/lib/stickler/repository/null.rb

@@ -1,4 +1,3 @@
-require 'stickler/repository'
 module Stickler::Repository
   #
   # A null repository.  It is in most respecs like a Repository::Local that has

data/lib/stickler/repository/remote.rb

@@ -1,6 +1,4 @@
 require 'excon'
-require 'stickler/version'
-require 'stickler/repository'
 require 'stickler/repository/api'
 require 'stickler/repository/rubygems_authenticator'
 require 'stickler/repository/basic_authenticator'
@@ -76,7 +74,7 @@ module ::Stickler::Repository
     def push( path )
       spec = speclite_from_gem_file( path )
       raise Stickler::Repository::Error, "gem #{spec.full_name} already exists in remote repository" if remote_gem_file_exist?( spec )
-      resp = resource_request( push_resource, :body => IO.read( path ) )
+      resource_request( push_resource, :body => IO.read( path ) )
       return spec
     rescue Excon::Errors::Error => e
       msg = "Failure pushing #{path} to remote repository : response code => #{e.response.status}, response message => '#{e.response.body}'"
@@ -89,12 +87,24 @@ module ::Stickler::Repository
     def yank( spec )
       return nil unless remote_gem_file_exist?( spec )
       query = { :gem_name => spec.name, :version => spec.version.to_s }
-      resp  = resource_request( yank_resource, :query => query  )
+      resource_request( yank_resource, :query => query  )
       return full_uri_to_gem( spec )
     rescue Excon::Errors::Error => e
       raise Stickler::Repository::Error, "Failure yanking: #{e.inspect}"
     end
 
+    #
+    # See Api#unyank
+      #
+    def unyank( spec )
+      return nil unless remote_gem_file_exist?( spec )
+      query = { :spec_name => spec.name, :version => spec.version.to_s }
+      resource_request( unyank_resource, :query => query  )
+      true
+    rescue Excon::Errors::Error => e
+      raise Stickler::Repository::Error, "Failure unyanking: #{e.inspect}"
+    end
+
     #
     # See Api#delete
     #
@@ -102,7 +112,7 @@ module ::Stickler::Repository
       return false unless remote_gem_file_exist?( spec )
       resource_request( gem_resource( spec ), :method => :delete )
       return true
-    rescue Excon::Errors::Error => e
+    rescue Excon::Errors::Error
       return false
     end
 
@@ -168,25 +178,36 @@ module ::Stickler::Repository
     end
 
     def push_resource
-      unless @push_resource then
+      @push_resource ||= begin
         params = { :method => :post, :headers => { 'Content-Type' => 'application/octet-stream' }, :expects => [ 201, 200 ] }
-        @push_resource = Excon.new( push_uri.to_s, params )
+        Excon.new( push_uri.to_s, params )
       end
-      return @push_resource
     end
 
     def yank_uri
       Addressable::URI.join( uri, "api/v1/gems/yank" )
     end
 
+    def unyank_uri
+      Addressable::URI.join( uri, "api/v1/gems/unyank" )
+    end
+
     def yank_resource
-      unless @yank_resource then
+      @yank_resource ||= begin
         params = { :method => :delete,
                    :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' },
                    :expects => [200] }
-        @yank_resource = Excon.new( yank_uri.to_s, params )
+        Excon.new( yank_uri.to_s, params )
+      end
+    end
+    
+    def unyank_resource
+      @unyank_resource ||= begin
+        params = { :method => :post,
+                   :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+                   :expects => [200] }
+        Excon.new( unyank_uri.to_s, params )
       end
-      return @yank_resource
     end
 
     def gem_resource( spec )
@@ -222,9 +243,9 @@ module ::Stickler::Repository
     end
 
     def remote_uri_exist?( uri )
-      rc = resource_request( Excon.new( uri.to_s ),  :method => :head, :expects => [200] )
+      resource_request( Excon.new( uri.to_s ),  :method => :head, :expects => [200] )
       return true
-    rescue Excon::Errors::Error => e
+    rescue Excon::Errors::Error
       return false
     end
 
@@ -244,10 +265,10 @@ module ::Stickler::Repository
     def resource_request( resource, params = {} )
       trys = 0
       begin
-        resource.connection[:headers]['User-Agent'] = "Stickler Client v#{Stickler::VERSION}"
-        resource.connection[:headers].delete('Authorization')
+        resource.data[:headers]['User-Agent'] = "Stickler Client v#{Stickler::VERSION}"
+        resource.data[:headers].delete('Authorization')
         if authenticator then
-          resource.connection[:headers]['Authorization'] = authenticator.credentials
+          resource.data[:headers]['Authorization'] = authenticator.credentials
         end
         trys += 1
         resource.request( params )
@@ -260,10 +281,9 @@ module ::Stickler::Repository
         # HEAD request.  Only follow a few times though.
         raise redirect unless [ :get, :head ].include?( redirect.request[:method] )
         raise redirect if trys > 5
-        resource = Excon::Connection.new( redirect.response.headers['Location'],
-                                          { :headers => resource.connection[:headers],
-                                            :query   => resource.connection[:headers],
-                                            :method  => resource.connection[:method] } )
+        resource = Excon.new( redirect.response.headers['Location'],
+                              { :headers => resource.data[:headers],
+                                :method  => resource.data[:method] } )
         retry
       end
     end

data/lib/stickler/repository/remote_mirror.rb

@@ -13,7 +13,7 @@ module ::Stickler::Repository
     # repository
     def mirror( spec, upstream_host )
       raise Stickler::Repository::Error, "gem #{spec.full_name} already exists in remote repository" if remote_gem_file_exist?( spec )
-      resp = resource_request( mirror_resource( spec, upstream_host ) )
+      resource_request( mirror_resource( spec, upstream_host ) )
     end
 
     private

data/lib/stickler/server.rb

@@ -1,11 +1,3 @@
-require 'stickler/error'
-require 'stickler/middleware/compression'
-require 'stickler/middleware/gemcutter'
-require 'stickler/middleware/mirror'
-require 'stickler/middleware/index'
-require 'stickler/middleware/not_found'
-require 'rack/commonlogger'
-
 module Stickler
   class Server
 
@@ -30,5 +22,5 @@ module Stickler
         run Sinatra::Base
       end
     end
- end
+  end
 end

data/lib/stickler/server/public/css/blueprint/ie.css

@@ -0,0 +1,35 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+textarea {overflow:auto;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline label {position:relative;top:-0.25em;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}

data/lib/stickler/server/public/css/blueprint/screen.css

@@ -0,0 +1,266 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* reset.css */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
+body {line-height:1.5;}
+table {border-collapse:separate;border-spacing:0;}
+caption, th, td {text-align:left;font-weight:normal;}
+table, td, th {vertical-align:middle;}
+blockquote:before, blockquote:after, q:before, q:after {content:"";}
+blockquote, q {quotes:"" "";}
+a img {border:none;}
+
+/* typography.css */
+html {font-size:100.01%;}
+body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
+h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
+h2 {font-size:2em;margin-bottom:0.75em;}
+h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
+h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
+h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
+h6 {font-size:1em;font-weight:bold;}
+h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
+p {margin:0 0 1.5em;}
+p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
+p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
+a:focus, a:hover {color:#08d;}
+a {color:#009;text-decoration:underline;}
+blockquote {margin:1.5em;color:#666;font-style:italic;}
+strong {font-weight:bold;}
+em, dfn {font-style:italic;}
+dfn {font-weight:bold;}
+sup, sub {line-height:0;}
+abbr, acronym {border-bottom:1px dotted #666;}
+address {margin:0 0 1.5em;font-style:italic;}
+del {color:#666;}
+pre {margin:1.5em 0;white-space:pre;}
+pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
+li ul, li ol {margin:0;}
+ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;}
+ul {list-style-type:disc;}
+ol {list-style-type:decimal;}
+dl {margin:0 0 1.5em 0;}
+dl dt {font-weight:bold;}
+dd {margin-left:1.5em;}
+table {margin-bottom:1.4em;width:100%;}
+th {font-weight:bold;}
+thead th {background:#c3d9ff;}
+th, td, caption {padding:4px 10px 4px 5px;}
+tr.even td {background:#e5ecf9;}
+tfoot {font-style:italic;}
+caption {background:#eee;}
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.added {background:#060;color:#fff;}
+.removed {background:#900;color:#fff;}
+.first {margin-left:0;padding-left:0;}
+.last {margin-right:0;padding-right:0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+
+/* forms.css */
+label {font-weight:bold;}
+fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
+legend {font-weight:bold;font-size:1.2em;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
+input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
+input.text, input.title {width:300px;padding:5px;}
+input.title {font-size:1.5em;}
+textarea {width:390px;height:250px;padding:5px;}
+input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline {line-height:3;}
+form.inline p {margin-bottom:0;}
+.error, .notice, .success, .info {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
+.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
+.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
+.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
+.error a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
+.info a {color:#205791;}
+
+/* grid.css */
+.container {width:740px;margin:0 auto;}
+.showgrid {background:url(src/grid.png);}
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24, .span-25 {float:left;margin-right:10px;}
+.last {margin-right:0;}
+.span-1 {width:20px;}
+.span-2 {width:50px;}
+.span-3 {width:80px;}
+.span-4 {width:110px;}
+.span-5 {width:140px;}
+.span-6 {width:170px;}
+.span-7 {width:200px;}
+.span-8 {width:230px;}
+.span-9 {width:260px;}
+.span-10 {width:290px;}
+.span-11 {width:320px;}
+.span-12 {width:350px;}
+.span-13 {width:380px;}
+.span-14 {width:410px;}
+.span-15 {width:440px;}
+.span-16 {width:470px;}
+.span-17 {width:500px;}
+.span-18 {width:530px;}
+.span-19 {width:560px;}
+.span-20 {width:590px;}
+.span-21 {width:620px;}
+.span-22 {width:650px;}
+.span-23 {width:680px;}
+.span-24 {width:710px;}
+.span-25 {width:740px;margin-right:0;}
+input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24, input.span-25, textarea.span-25 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;}
+input.span-1, textarea.span-1 {width:8px;}
+input.span-2, textarea.span-2 {width:38px;}
+input.span-3, textarea.span-3 {width:68px;}
+input.span-4, textarea.span-4 {width:98px;}
+input.span-5, textarea.span-5 {width:128px;}
+input.span-6, textarea.span-6 {width:158px;}
+input.span-7, textarea.span-7 {width:188px;}
+input.span-8, textarea.span-8 {width:218px;}
+input.span-9, textarea.span-9 {width:248px;}
+input.span-10, textarea.span-10 {width:278px;}
+input.span-11, textarea.span-11 {width:308px;}
+input.span-12, textarea.span-12 {width:338px;}
+input.span-13, textarea.span-13 {width:368px;}
+input.span-14, textarea.span-14 {width:398px;}
+input.span-15, textarea.span-15 {width:428px;}
+input.span-16, textarea.span-16 {width:458px;}
+input.span-17, textarea.span-17 {width:488px;}
+input.span-18, textarea.span-18 {width:518px;}
+input.span-19, textarea.span-19 {width:548px;}
+input.span-20, textarea.span-20 {width:578px;}
+input.span-21, textarea.span-21 {width:608px;}
+input.span-22, textarea.span-22 {width:638px;}
+input.span-23, textarea.span-23 {width:668px;}
+input.span-24, textarea.span-24 {width:698px;}
+input.span-25, textarea.span-25 {width:728px;}
+.append-1 {padding-right:30px;}
+.append-2 {padding-right:60px;}
+.append-3 {padding-right:90px;}
+.append-4 {padding-right:120px;}
+.append-5 {padding-right:150px;}
+.append-6 {padding-right:180px;}
+.append-7 {padding-right:210px;}
+.append-8 {padding-right:240px;}
+.append-9 {padding-right:270px;}
+.append-10 {padding-right:300px;}
+.append-11 {padding-right:330px;}
+.append-12 {padding-right:360px;}
+.append-13 {padding-right:390px;}
+.append-14 {padding-right:420px;}
+.append-15 {padding-right:450px;}
+.append-16 {padding-right:480px;}
+.append-17 {padding-right:510px;}
+.append-18 {padding-right:540px;}
+.append-19 {padding-right:570px;}
+.append-20 {padding-right:600px;}
+.append-21 {padding-right:630px;}
+.append-22 {padding-right:660px;}
+.append-23 {padding-right:690px;}
+.append-24 {padding-right:720px;}
+.prepend-1 {padding-left:30px;}
+.prepend-2 {padding-left:60px;}
+.prepend-3 {padding-left:90px;}
+.prepend-4 {padding-left:120px;}
+.prepend-5 {padding-left:150px;}
+.prepend-6 {padding-left:180px;}
+.prepend-7 {padding-left:210px;}
+.prepend-8 {padding-left:240px;}
+.prepend-9 {padding-left:270px;}
+.prepend-10 {padding-left:300px;}
+.prepend-11 {padding-left:330px;}
+.prepend-12 {padding-left:360px;}
+.prepend-13 {padding-left:390px;}
+.prepend-14 {padding-left:420px;}
+.prepend-15 {padding-left:450px;}
+.prepend-16 {padding-left:480px;}
+.prepend-17 {padding-left:510px;}
+.prepend-18 {padding-left:540px;}
+.prepend-19 {padding-left:570px;}
+.prepend-20 {padding-left:600px;}
+.prepend-21 {padding-left:630px;}
+.prepend-22 {padding-left:660px;}
+.prepend-23 {padding-left:690px;}
+.prepend-24 {padding-left:720px;}
+.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
+.colborder {padding-right:19px;margin-right:20px;border-right:1px solid #ddd;}
+.pull-1 {margin-left:-30px;}
+.pull-2 {margin-left:-60px;}
+.pull-3 {margin-left:-90px;}
+.pull-4 {margin-left:-120px;}
+.pull-5 {margin-left:-150px;}
+.pull-6 {margin-left:-180px;}
+.pull-7 {margin-left:-210px;}
+.pull-8 {margin-left:-240px;}
+.pull-9 {margin-left:-270px;}
+.pull-10 {margin-left:-300px;}
+.pull-11 {margin-left:-330px;}
+.pull-12 {margin-left:-360px;}
+.pull-13 {margin-left:-390px;}
+.pull-14 {margin-left:-420px;}
+.pull-15 {margin-left:-450px;}
+.pull-16 {margin-left:-480px;}
+.pull-17 {margin-left:-510px;}
+.pull-18 {margin-left:-540px;}
+.pull-19 {margin-left:-570px;}
+.pull-20 {margin-left:-600px;}
+.pull-21 {margin-left:-630px;}
+.pull-22 {margin-left:-660px;}
+.pull-23 {margin-left:-690px;}
+.pull-24 {margin-left:-720px;}
+.pull-25 {margin-left:-750px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24, .pull-25 {float:left;position:relative;}
+.push-1 {margin:0 -30px 1.5em 30px;}
+.push-2 {margin:0 -60px 1.5em 60px;}
+.push-3 {margin:0 -90px 1.5em 90px;}
+.push-4 {margin:0 -120px 1.5em 120px;}
+.push-5 {margin:0 -150px 1.5em 150px;}
+.push-6 {margin:0 -180px 1.5em 180px;}
+.push-7 {margin:0 -210px 1.5em 210px;}
+.push-8 {margin:0 -240px 1.5em 240px;}
+.push-9 {margin:0 -270px 1.5em 270px;}
+.push-10 {margin:0 -300px 1.5em 300px;}
+.push-11 {margin:0 -330px 1.5em 330px;}
+.push-12 {margin:0 -360px 1.5em 360px;}
+.push-13 {margin:0 -390px 1.5em 390px;}
+.push-14 {margin:0 -420px 1.5em 420px;}
+.push-15 {margin:0 -450px 1.5em 450px;}
+.push-16 {margin:0 -480px 1.5em 480px;}
+.push-17 {margin:0 -510px 1.5em 510px;}
+.push-18 {margin:0 -540px 1.5em 540px;}
+.push-19 {margin:0 -570px 1.5em 570px;}
+.push-20 {margin:0 -600px 1.5em 600px;}
+.push-21 {margin:0 -630px 1.5em 630px;}
+.push-22 {margin:0 -660px 1.5em 660px;}
+.push-23 {margin:0 -690px 1.5em 690px;}
+.push-24 {margin:0 -720px 1.5em 720px;}
+.push-25 {margin:0 -750px 1.5em 750px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24, .push-25 {float:right;position:relative;}
+div.prepend-top, .prepend-top {margin-top:1.5em;}
+div.append-bottom, .append-bottom {margin-bottom:1.5em;}
+.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
+.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}