locomotive_cms 0.0.4.beta8 → 0.0.4.beta9

data/config/assets.yml

@@ -71,6 +71,7 @@ stylesheets:
   box:
     - public/stylesheets/admin/blueprint/screen.css
     - public/stylesheets/admin/box.css
+    - public/stylesheets/admin/safari.css
   common:
     - public/stylesheets/admin/blueprint/screen.css
     - public/stylesheets/admin/layout.css
@@ -82,6 +83,7 @@ stylesheets:
     - public/stylesheets/admin/formtastic.css
     - public/stylesheets/admin/formtastic_changes.css
     - public/stylesheets/admin/application.css
+    - public/stylesheets/admin/safari.css
   fancybox:
     - public/stylesheets/admin/plugins/fancybox.css
     - public/stylesheets/admin/fancybox_changes.css

data/lib/locomotive/engine.rb

@@ -18,7 +18,8 @@ require 'httparty'
 require 'redcloth'
 require 'delayed_job_mongoid'
 require 'zip/zipfilesystem'
-require 'jammit'
+# require 'jammit'
+require 'jammit-s3'
 
 $:.unshift File.dirname(__FILE__)
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.4.beta8"
+  VERSION = "0.0.4.beta9"
 end

data/public/javascripts/admin/utils.js

@@ -9,6 +9,8 @@ function makeSlug(val, sep) { // code largely inspired by http://www.thewebsitet
   return val.toLowerCase();
 }
 
-String.prototype.trim = function() {
-  return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
-}
+(function() {
+  String.prototype.trim = function() {
+    return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
+  }
+})();

data/public/stylesheets/admin/box.css

@@ -130,11 +130,6 @@ body { background: #000 url(/images/admin/background/body.png) repeat 0 0; }
   line-height: 21px;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  #panel div.footer .button { padding-left: 5px; }
-  #panel div.footer .button span { top: 0px; padding-right: 10px; }
-}
-
 /* ___ Messages ___ */
 
 div.application-message {

data/public/stylesheets/admin/buttons.css

@@ -21,11 +21,6 @@
   outline: none;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  .button { padding-left: 5px; }
-  .button span { top: 0px; }
-}
-
 .button.light {
   background-image: url(/images/admin/buttons/light-gray-left.png);
   color: #787a89;

data/public/stylesheets/admin/formtastic_changes.css

@@ -65,11 +65,6 @@ form.formtastic fieldset.foldable ol {
 
 form.formtastic fieldset.foldable.folded ol { display: none; }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  form.formtastic fieldset.foldable legend span em { top: 0px; }
-  form.formtastic fieldset.foldable.folded legend span em { top: 0px; }
-}
-
 /* ___ inputs ___ */
 
 form.formtastic fieldset.inputs { min-height: 30px; width: 100%; margin-bottom: 20px; }
@@ -83,12 +78,6 @@ form.formtastic fieldset.inputs ol {
   border-top: 1px solid #ccced7;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  form.formtastic fieldset.inputs ol {
-    margin-top: 30px;
-  }
-}
-
 form.formtastic fieldset ol li { width: 100%; position: relative; margin-bottom: 1.3em; }
 
 form.formtastic fieldset ol li label { text-align: left; padding: 0.3em 2em 0 20px; font-size: 0.8em; color: #17171b; width: 15%; }

data/public/stylesheets/admin/layout.css

@@ -143,10 +143,6 @@ body {
   background: transparent url(/images/admin/icons/actions.png) no-repeat 0 0;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  #content #local-actions-bar a em { top: 4px; }
-}
-
 #content #local-actions-bar a.show em { background-position: 0 0; }
 #content #local-actions-bar a.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
 #content #local-actions-bar a.download em { background-position: 0 -32px; }

data/public/stylesheets/admin/safari.css

@@ -0,0 +1,15 @@
+@media screen and/*!YUI-Compresser */(-webkit-min-device-pixel-ratio:0) {
+
+  #panel div.footer .button { padding-left: 5px; }
+  #panel div.footer .button span { top: 0px; padding-right: 10px; }
+
+  .button { padding-left: 5px; }
+  .button span { top: 0px; }
+
+  form.formtastic fieldset.foldable legend span em { top: 0px; }
+  form.formtastic fieldset.foldable.folded legend span em { top: 0px; }
+
+  form.formtastic fieldset.inputs ol { margin-top: 30px; }
+
+  #content #local-actions-bar a em { top: 4px; }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_cms
 version: !ruby/object:Gem::Version 
-  hash: -1848230060
+  hash: -1848230059
   prerelease: true
   segments: 
   - 0
   - 0
   - 4
-  - beta8
-  version: 0.0.4.beta8
+  - beta9
+  version: 0.0.4.beta9
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +01:00
+date: 2010-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -702,6 +702,7 @@ files:
 - public/stylesheets/admin/plugins/selectmenu.css
 - public/stylesheets/admin/plugins/tiny_mce.css
 - public/stylesheets/admin/plugins/toggle.css
+- public/stylesheets/admin/safari.css
 - public/javascripts/admin/account.js
 - public/javascripts/admin/aloha/aloha-nodeps.js
 - public/javascripts/admin/aloha/aloha.js