locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/assets/stylesheets/locomotive/backoffice/codemirror_changes.css.scss

@@ -3,6 +3,8 @@
 .CodeMirror {
   @include default-input-style;
 
+  padding: 0px;
+
   margin-top: 13px;
 
   font-size: 13px;

data/app/assets/stylesheets/locomotive/backoffice/content_assets.css.scss

@@ -3,6 +3,7 @@
 @import "compass/css3/images";
 @import "compass/css3/text-shadow";
 @import "locomotive/shared/helpers";
+@import "buttons";
 
 ul.content-assets {
 
@@ -114,16 +115,12 @@ ul.content-assets {
       right: 17px;
 
       a {
-        display: block;
-        width: 16px;
-        height: 16px;
+        @include icon-button;
 
-        background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
+        margin: 0 0 0 5px;
 
-        text-indent: -9999px;
-
-        &:hover{
-          background-image: image-url("locomotive/list/icons/trash.png");
+        &:hover {
+          background: #e72635;
         }
       }
     }

data/app/assets/stylesheets/locomotive/backoffice/datepicker.css.scss

@@ -3,6 +3,11 @@
 @import "compass/css3/images";
 @import "compass/css3/text-shadow";
 
+// Note: http://www.west-wind.com/weblog/posts/2009/Sep/12/jQuery-UI-Datepicker-and-zIndex
+#ui-datepicker-div {
+  z-index: 9999999 !important;
+}
+
 .ui-datepicker {
   display: none;
 
@@ -54,34 +59,43 @@
     }
 
     .ui-datepicker-prev, .ui-datepicker-next {
-      top: 4px;
+      top: -3px;
+
+      width: 14px;
+      height: 14px;
 
-      width: 7px;
-      height: 13px;
+      color: transparent;
+      outline: none;
 
       span {
-        background-position: 0 0;
+        background: none;
+        text-indent: 0px;
         cursor: pointer;
+        font-size: 14px;
+        font-weight: normal;
       }
 
       &.ui-state-hover {
         border: 0px;
         @include border-radius(0px);
-        top: 5px;
+        top: -2px;
+        background: none;
+        font-size: 14px;
+        font-weight: normal;
       }
     }
 
     .ui-datepicker-prev {
-      left: 10px;
+      left: 8px;
       span {
-        background-image: image-url("locomotive/datepicker/ui-widget-left-icon.png");
+        &:before { font-family: FontAwesome; content: "\f0d9"; color: #646F75; }
       }
     }
 
     .ui-datepicker-next {
-      right: 10px;
+      right: -1px;
       span {
-        background-image: image-url("locomotive/datepicker/ui-widget-right-icon.png");
+        &:before { font-family: FontAwesome; content: "\f0da"; color: #646F75; }
       }
     }
   }

data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss

@@ -51,9 +51,7 @@ form.formtastic {
       legend span {
         cursor: pointer;
 
-        padding-right: 15px;
-
-        background: transparent image-url("locomotive/form/folded-arrow-on.png") no-repeat right center;
+        &:after { font-family: FontAwesome; content: "\00a0\00a0\f0d7"; }
       }
 
       &.folded legend {
@@ -62,7 +60,7 @@ form.formtastic {
         border-bottom-width: 1px;
 
         span {
-          background-image: image-url("locomotive/form/folded-arrow-off.png");
+          &:after { content: "\00a0\00a0\f0da"; }
         }
       }
     } // .foldable
@@ -116,11 +114,14 @@ form.formtastic {
           margin-right: 20px;
         }
 
-        span.actions {
+        .actions {
           position: absolute;
           top: 0px;
           right: 10px;
 
+          height: 30px;
+          line-height: 30px;
+
           @include tiny-buttons-group;
         }
 
@@ -176,6 +177,11 @@ form.formtastic {
           text-align: left;
           color: #585A69;
           @include single-text-shadow(#fff, 1px, 1px, 1px);
+
+          img.flag {
+            float: left;
+            margin: -3px 10px 0 0;
+          }
         }
 
         p.inline-hints {
@@ -191,6 +197,11 @@ form.formtastic {
           }
         } // p.inline-hints
 
+        .actions {
+          overflow: visible;
+          padding-left: 0px;
+        }
+
         div.list {
           margin-left: 160px;
         }
@@ -206,11 +217,13 @@ form.formtastic {
             width: auto;
             line-height: 14px;
             margin: 0px;
-            padding: 3px 12px 4px 27px;
+            padding: 3px 8px 4px 8px;
 
             @include box-shadow(rgba(0, 0, 0, 0.4) 2px 2px 2px 0);
             @include border-radius(3px);
-            background: #cd0f19 image-url("locomotive/form/icons/error.png") no-repeat 7px center;
+            background: #cd0f19;
+
+            &:before { font-family: FontAwesome; content: "\f071\00a0\00a0"; }
 
             color: #fff !important;
             font-size: 12px;
@@ -353,9 +366,8 @@ form.formtastic {
               @include hover-link;
               color: #787A89;
 
-              &.picture {
-                padding-left: 23px;
-                background: transparent image-url("locomotive/icons/asset_add.png") no-repeat left 1px;
+              i {
+                margin-right: 3px;
               }
             }
           } // .more
@@ -497,11 +509,14 @@ form.formtastic {
             .col {
 
               &.handle {
-                position: relative;
-                top: 4px;
-                margin-left: 5px;
-                margin-right: 2px;
+                margin: 7px 2px 0px 4px;
+
+                @include icon-button;
                 cursor: move;
+
+                i {
+                  font-size: 9px;
+                }
               }
 
               &.label {
@@ -533,23 +548,12 @@ form.formtastic {
               line-height: 30px;
 
               em {
-                padding-left: 17px;
                 margin-left: 0px;
                 background-repeat: no-repeat;
 
                 color: #757575;
                 font-size: 13px;
                 font-weight: normal;
-
-                &.locked {
-                  background-image: image-url("locomotive/icons/membership_lock.png");
-                  background-position: 1px 0px;
-                }
-
-                &.editable {
-                  background-image: image-url("locomotive/icons/membership_edit.png");
-                  background-position: 0px 3px;
-                }
               }
             }
           }
@@ -584,11 +588,14 @@ form.formtastic {
             }
 
             .handle {
-              position: relative;
-              top: 4px;
-              margin-left: 5px;
-              margin-right: 2px;
+              margin: 6px 2px 0px 4px;
+
+              @include icon-button;
               cursor: move;
+
+              i {
+                font-size: 9px;
+              }
             }
 
             .label-input {
@@ -718,9 +725,6 @@ form.formtastic {
 
       top: 0px;
       right: 20px;
-      padding-left: 20px;
-
-      background: transparent image-url("locomotive/icons/asset_switch.png") no-repeat left center;
 
       color: #787a89;
       font-size: 11px;

data/app/assets/stylesheets/locomotive/backoffice/layout.css.scss

@@ -38,7 +38,8 @@ body {
 }
 
 #wrapper {
-  background: transparent image-url("locomotive/background/light.png") repeat-x 0 0;
+  @include background-image(linear-gradient(top, rgba(102, 102, 115, 0.3), rgba(30, 30, 42, 0.3) 252px, rgba(30, 30, 42, 0.3)));
+  height: 100%;
 
   > .container {
     width: 966px;

data/app/assets/stylesheets/locomotive/backoffice/menu/_colors.css.scss

@@ -11,7 +11,8 @@
 
   a {
     @include background-image(linear-gradient($color_top, $color_bottom));
-    span {
+
+    span, i {
       color: #fff;
       @include single-text-shadow(transparent, 0px, 0px, 0px);
     }

data/app/assets/stylesheets/locomotive/backoffice/menu/default.css.scss

@@ -1,15 +1,14 @@
 @import "colors";
-@import "icons";
 
 #menu {
-  li.contents { @include locomotive-contents-icon; }
-  li.settings { @include locomotive-settings-icon; }
+  li.contents { }
+  li.settings { }
 }
 
 body.contents {
   #menu li.contents {
     @include locomotive-black-entry;
-    @include locomotive-contents-icon(true);
+
     // @include locomotive_blue_menu;
     // @include locomotive_green_menu;
   }
@@ -24,44 +23,10 @@ body.settings {
     @include locomotive-blue-entry;
     // @include locomotive_black_menu;
     // @include locomotive-orange-entry;
-    @include locomotive-settings-icon(true);
   }
 
   #submenu {
     @include locomotive-blue-submenu;
     // @include locomotive-orange-submenu;
   }
-}
-
-
-// @import "helpers";
-//
-// #menu li.contents a em { @include menu-contents-icon; }
-// body.contents {
-//   $color: black;
-//   #menu li.contents {
-//     @include menu-color($color);
-//     em { @include menu-contents-icon(true); }
-//   }
-//   #submenu { @include submenu-color($color); }
-// }
-//
-// #menu li.assets a em { @include menu-assets-icon; }
-// body.assets {
-//   $color: green;
-//   #menu li.assets {
-//     @include menu-color($color);
-//     em { @include menu-assets-icon(true); }
-//   }
-//   #submenu { @include submenu-color($color); }
-// }
-//
-// #menu li.settings a em { @include menu-settings-icon; }
-// body.settings {
-//   $color: blue;
-//   #menu li.settings {
-//     @include menu-color($color);
-//     em { @include menu-settings-icon(true); }
-//   }
-//   #submenu { @include submenu-color($color); }
-// }
+}

data/app/assets/stylesheets/locomotive/backoffice/menu/main.css.scss

@@ -37,7 +37,7 @@
       font-size: 13px;
       text-decoration: none;
 
-      span {
+      span, i {
         text-decoration: none;
         color: #787A89;
         @include single-text-shadow(rgba(255, 255, 255, 0.4), 1px, 1px, 1px);

data/app/assets/stylesheets/locomotive/backoffice/menu/sub.css.scss

@@ -34,13 +34,8 @@
       margin: 15px 7px 0 8px;
 
       &.hoverable > a span {
-        em {
-          display: inline-block;
-          background: transparent image-url("locomotive/menu/icons.png") no-repeat 0 -16px;
-          width: 12px;
-          height: 7px;
+        i {
           position: relative;
-          top: 0px;
           left: 6px;
         }
       }
@@ -92,15 +87,14 @@
             @include box-shadow(transparent 0 0 0 0);
           }
 
-          span em {
-            background-position: -12px -16px;
-          }
-
           & > em {
-            @include absolute-position(bottom, 0px, right, -11px);
-            width: 13px;
-            height: 13px;
-            background: transparent image-url("locomotive/menu/popup/bottom-right-corner.png") no-repeat 0 0;
+            @include absolute-position(bottom, 1px, right, -17px);
+            @include border-bottom-left-radius(16px);
+            @include box-shadow(-4px 4px 0 2px #fff);
+            clip: rect(0px, 16px, 16px, 0px);
+            width: 16px;
+            height: 16px;
+            background: transparent none no-repeat 0 0;
           }
         }
       } // > a
@@ -131,7 +125,7 @@
       line-height: 22px;
 
       margin: 0 0 0 0;
-      padding: 0px 10px 0 15px;
+      padding: 0px 10px 0 10px;
 
       @include border-radius(10px);
       @include box-shadow(rgba(255, 255, 255, 0.2) 0 1px 0 0 inset, rgba(255, 255, 255, 0.1) 0 1px 0 0);
@@ -141,20 +135,14 @@
       text-decoration: none;
       font-size: 11px;
 
-      em {
-        display: inline-block;
-        position: relative;
-        background: transparent image-url("locomotive/menu/icons.png") no-repeat 0 0px;
-        height: 11px;
-        width: 11px;
-        top: 2px;
-        left: -5px;
-      }
+      color: #fff;
+      font-size: 11px;
+      @include single-text-shadow(rgba(0, 0, 0, 1), 1px, 1px, 1px);
 
-      span {
-        color: #fff;
-        font-size: 11px;
-        @include single-text-shadow(rgba(0, 0, 0, 1), 1px, 1px, 1px);
+      i {
+        position: relative;
+        right: 2px;
+        font-size: 10px;
       }
 
       &:hover {
@@ -221,28 +209,32 @@
 
       a {
         font-size: 13px;
-        background: transparent image-url("locomotive/menu/popup/add.png") no-repeat left 4px;
-        padding-left: 12px;
+
+        i {
+          font-size: 10px;
+          text-decoration: none;
+        }
       }
 
       &.edit {
         padding-top: 0px;
-
-        a {
-          background: transparent image-url("locomotive/menu/popup/bullet.png") no-repeat left 5px;
-        }
       }
     }
 
     ul {
-      list-style-image: image-url("locomotive/menu/popup/bullet.png");
-      margin: 0px 0px 0 15px;
+      list-style: none;
+      margin: 0px 0px 0px 0px;
 
       li {
         position: relative;
         height: 24px;
         line-height: 24px;
 
+        i {
+          font-size: 10px;
+          color: #1f82bc;
+        }
+
         a { font-size: 11px; }
 
         span {