locomotivecms 3.0.0.rc6 → 3.0.0.rc7

data/app/assets/stylesheets/locomotive/base/form/_toggle.scss

@@ -1,8 +1,8 @@
 .simple_form {
 
   fieldset .input.toggle {
-    @include display-flex;
-    @include justify-content(space-between);
+    display: flex;
+    justify-content: space-between;
 
     & > .form-wrapper {
       background: transparent;

data/app/assets/stylesheets/locomotive/components/_activity_feed.scss

@@ -1,67 +1,56 @@
-$activity_feed_icon_bg_color:     #59b9cc;
-$activity_feed_title_color:       #595959;
-$activity_feed_time_color:        #949999;
+$activity_feed_icon_bg_color: $brand-primary;
+$activity_feed_title_color: #595959;
+$activity_feed_time_color: #949999;
 
 .activity-feed {
-  list-style: none;
-  border-left: 1px solid #ddd;
   padding-top: 1px;
   padding-left: 50px;
-
   margin-left: 40px;
-
+  list-style: none;
+  border-left: 1px solid #ddd;
   > li {
     position: relative;
     margin-bottom: 30px;
-
     .icon {
       position: absolute;
-      font-size: 14px;
       top: -4px;
       left: -65px;
-
+      font-size: 14px;
       .fa-circle {
         color: $activity_feed_icon_bg_color;
       }
     }
-
     > p {
-      color: $activity_feed_title_color;
+      margin-bottom: 2px;
       font-size: 13px;
       font-weight: 600;
-      margin-bottom: 2px;
-
+      color: $activity_feed_title_color;
       img {
         margin-right: 10px;
         border: 1px solid $activity_feed_time_color;
       }
-
       span.time {
-        color: $activity_feed_time_color;
         font-weight: normal;
+        color: $activity_feed_time_color;
       }
-
       span.sentence {
         font-weight: normal;
       }
     }
-
     .additional-information {
       padding-left: 30px;
-
       ul.assets {
+        padding: 0;
+        margin: 0;
         list-style: none;
-        margin: 0px;
-        padding: 0px;
         li {
-          margin: 6px 10px 6px 0px;
           float: left;
+          margin: 6px 10px 6px 0;
           img {
             width: 30px;
           }
         }
       }
     }
-
   }
 }

data/app/assets/stylesheets/locomotive/components/_content_assets.scss

@@ -1,3 +1,9 @@
+body.live-editing .drawer {
+  .content-assets, .content-assets-list {
+    margin-left: $live_editing_expand_bar_width;
+  }
+}
+
 .content-assets {
 
   .updatable {
@@ -64,7 +70,7 @@
 
       background: $assets_dropzone_progress_background;
       height: $assets_dropzone_progress_size;
-      @include border-radius($assets_dropzone_progress_size / 2);
+      border-radius: $assets_dropzone_progress_size / 2;
       @include box-shadow(none);
 
       .progress-bar {
@@ -78,14 +84,13 @@
 
   margin-top: 10px;
 
-  @include display-flex;
-  @include flex-direction(row);
-  @include flex-wrap;
-  @include flex-align(left);
-  // @include flex-justify-content(center);
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: left;
 
   .asset {
-    @include border-radius($asset_border_radius);
+    border-radius: $asset_border_radius;
     background: $asset_background;
     padding: 10px 15px;
     margin: 0px 20px 20px 0px;
@@ -111,15 +116,15 @@
     .body {
       width: 100%;
       height: $asset_height - 106;
-      @include display-flex;
-      @include flex-align(center);
-      @include flex-justify-content(center);
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
 
     .small-thumbnail {
       display: inline-block;
       background: $asset_thumbnail_background;
-      @include border-radius($asset_thumbnail_border_radius);
+      border-radius: $asset_thumbnail_border_radius;
       padding: $asset_thumbnail_border_radius;
 
       img {

data/app/assets/stylesheets/locomotive/components/_developers.scss

@@ -25,7 +25,7 @@ body.developers-documentation {
     pre {
       background: #fff;
       border: 3px solid $developers_documentation_code_border;
-      @include border-radius($developers_documentation_code_radius);
+      border-radius: $developers_documentation_code_radius;
       padding: 0px;
     }
 

data/app/assets/stylesheets/locomotive/components/_list.scss

@@ -12,8 +12,8 @@
 
       min-height: $content_list_item_min_height;
 
-      @include display-flex;
-      @include flex-align(center);
+      display: flex;
+      align-items: center;
       position: relative;
 
       &:not(.hide):last-child {
@@ -99,7 +99,7 @@
         margin: $padding-base-horizontal 0px;
         background-color: $content_list_item_placeholder;
         height: $content_list_item_min_height - (2 * $padding-base-horizontal);
-        @include border-radius(($content_list_item_min_height - (2 * $padding-base-horizontal)) / 2);
+        border-radius: ($content_list_item_min_height - (2 * $padding-base-horizontal)) / 2;
       }
 
     }

data/app/assets/stylesheets/locomotive/components/_sites.scss

@@ -32,7 +32,7 @@ body.sites {
         background: $site_background;
         text-decoration: none;
 
-        @include border-radius(5px);
+        border-radius: 5px;
 
         padding: 10px;
 

data/app/assets/stylesheets/locomotive/components/_transitions.scss

@@ -1,11 +1,11 @@
 // Sidebar
 
 .sidebar {
-  @include transition(left 0.3s ease-in-out);
+  transition: left 0.3s ease-in-out;
 }
 
 .content {
-  @include transition(left 0.3s ease-in-out, right 0.3s ease-in-out);
+  transition: left 0.3s ease-in-out, right 0.3s ease-in-out;
 }
 
 body.sidebar-closed {
@@ -31,19 +31,19 @@ body.live-editing {
   // SIDEBAR
   .slide-sidebar {
     .bar {
-      @include transition(opacity 0.3s ease-in-out);
+      transition: opacity 0.3s ease-in-out;
     }
     .sidebar {
-      @include transform(translate3d(0, 0, 0));
-      @include transition(transform 0.2s ease-in-out);
+      transform: translate3d(0, 0, 0);
+      transition: transform 0.2s ease-in-out;
     }
 
     &:hover {
       .bar {
-        @include opacity(0);
+        opacity: 0;
       }
       .sidebar {
-        @include transform(translate3d($sidebar_width, 0, 0));
+        transform: translate3d($sidebar_width, 0, 0);
       }
     }
   }
@@ -52,21 +52,21 @@ body.live-editing {
   // STATE: SHRINKED
 
   .content {
-    @include transform(translate3d(0, 0, 0));
-    @include transition(transform 0.3s ease-in-out);
+    transform: translate3d(0, 0, 0);
+    transition: transform 0.3s ease-in-out;
 
     > .inner {
-      @include transition(opacity 0.0s ease-in-out);
+      transition: opacity 0.0s ease-in-out;
     }
 
     .close-button {
-      @include transition(opacity 0.0s ease-in-out);
+      transition: opacity 0.0s ease-in-out;
     }
   }
 
   .preview {
-    @include transform(translate3d(0, 0, 0));
-    @include transition(transform 0.3s ease-in-out, border-left-width 0.6s ease);
+    transform: translate3d(0, 0, 0);
+    transition: transform 0.3s ease-in-out, border-left-width 0.6s ease;
   }
 
   &.full-width-preview {
@@ -74,22 +74,22 @@ body.live-editing {
     // STATE: EXPANDED
 
     .content {
-      @include transform(translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0));
+      transform: translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0);
 
-      @include transition(transform 0.3s ease-in-out, background-color 0.1s ease-in-out 0.2s);
+      transition: transform 0.3s ease-in-out, background-color 0.1s ease-in-out 0.2s;
       > .inner {
-        @include transition(opacity 0.1s ease-in-out 0.2s);
+        transition: opacity 0.1s ease-in-out 0.2s;
       }
 
       .close-button {
-        @include transition(opacity 0.2s ease-in-out 0.2s);
+        transition: opacity 0.2s ease-in-out 0.2s;
       }
     }
 
     .preview {
-      @include transform(translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0));
+      transform: translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0);
       border-left-width: $live_editing_expand_bar_width;
-      @include transition(transform 0.3s ease-in-out);
+      transition: transform 0.3s ease-in-out;
     }
 
   }
@@ -99,7 +99,7 @@ body.live-editing {
 // Drawer
 
 .content > .overlay {
-  @include transition(all 0.5s ease-in-out);
+  transition: all 0.5s ease-in-out;
 }
 
 .content::after {
@@ -111,14 +111,14 @@ body.live-editing {
   width: 0px;
   height: 0px;
   background: $overlay_background;
-  @include opacity(0.0);
-  @include transition(opacity 0.3s ease-in-out, width 0.1s 0.3s, height 0.1s 0.3s);
+  opacity: 0.0;
+  transition: opacity 0.3s ease-in-out, width 0.1s 0.3s, height 0.1s 0.3s;
   content: '';
 }
 
 .drawer {
-  @include transition(all 0.3s ease-in-out);
-  @include transform(translate3d(100%, 0, 0));
+  transition: all 0.3s ease-in-out;
+  transform: translate3d(100%, 0, 0);
 }
 
 body.drawer-opened {
@@ -126,36 +126,24 @@ body.drawer-opened {
   .content::after {
     width: 100%;
     height: 100%;
-    @include opacity(0.3);
-    @include transition(opacity 0.3s ease-in-out);
+    opacity: 0.3;
+    transition: opacity 0.3s ease-in-out;
   }
 
   .drawer {
-    @include transform(translate3d(0, 0, 0));
+    transform: translate3d(0, 0, 0);
 
     > .inner > div {
-      @include transition(opacity 0.05s ease-in-out);
+      transition: opacity 0.05s ease-in-out;
 
       &.fadeout {
-        @include opacity(0);
+        opacity: 0;
       }
 
       &.fadein {
-        @include opacity(1);
+        opacity: 1;
       }
     }
   }
 
 }
-
-// body.inline-editing {
-
-//   .content {
-//     @include transition(left 0.3s ease-in-out, right 0.1s linear);
-//   }
-
-//   .drawer {
-//     @include transition(all 0.1s linear);
-//   }
-// }
-

data/app/assets/stylesheets/locomotive/components/header/_account.scss

@@ -1,57 +1,63 @@
-$header_dropdown_background_color:          #383838;
-$header_dropdown_hovered_background_color:  #2f2f2f;
-$header_dropdown_link_color:                #999;
-$header_dropdown_hovered_link_color:        #fff;
+$header_dropdown_background_color: #383838;
+$header_dropdown_hovered_background_color: #2f2f2f;
+$header_dropdown_link_color: #999;
+$header_dropdown_hovered_link_color: #fff;
 
 .account-menu-wrapper {
-
   > li.dropdown {
-
     & > a {
-      outline: none;
-      line-height: 20px;
-      font-size: $font-size-base - 1;
-
       font-family: $alt-font-family-sans-serif;
+      font-size: $font-size-base - 1;
+      line-height: 20px;
       color: rgba($header_default_color, 1.0);
+      outline: none;
 
-      &:hover, &:focus {
+      &:hover,
+      &:focus {
         color: rgba($header_default_color, 1.0);
       }
 
       img {
-        margin-right: 7px;
         width: 35px;
+        margin-right: 10px;
+      }
+
+      .caret {
+        margin-left: 10px;
       }
     }
 
-    &.open > a, &.open > a:hover, &.open > a:focus {
-      background: $navbar-default-bg;
+    &.open > a,
+    &.open > a:hover,
+    &.open > a:focus {
       color: rgba($header_default_color, 1.0) !important;
+      background: $navbar-default-bg;
     }
 
     ul.dropdown-menu {
-      right: 15px;
-
-      @include border-radius(3px);
       @include box-shadow(none);
+      right: 15px;
       background: $header_dropdown_background_color;
+      border-radius: 3px;
 
       li.divider {
         background-color: $header_dropdown_hovered_background_color;
       }
 
+      li:before {
+        right: 15px !important;
+        left: auto !important;
+      }
+
       a {
-        color: $header_dropdown_link_color;
         font-size: $font-size-base - 1;
+        color: $header_dropdown_link_color;
 
         &:hover {
-          background: $header_dropdown_hovered_background_color;
           color: $header_dropdown_hovered_link_color;
+          background: $header_dropdown_hovered_background_color;
         }
       }
     }
-
   }
-
 }

data/app/assets/stylesheets/locomotive/components/header/_base.scss

@@ -1,90 +1,66 @@
-$header_brand_color:          $header_default_color;
-$header_brand_font_size:      15px;
-$header_site_arrow_color:     #349cb0;
+$header_brand_color: $header_default_color;
+$header_brand_font_size: 15px;
+$header_site_arrow_color: lighten($brand-primary, 20);
 
 .navbar-header {
   width: 30%;
-
-  .navbar-brand, .navbar-site, .navbar-text {
-    margin-left: 0px;
-    margin-right: 0px;
+  .navbar-brand,
+  .navbar-site,
+  .navbar-text {
+    margin-right: 0;
+    margin-left: 0;
   }
-
   .navbar-site {
-    margin-top: 2px;
-    margin-bottom: 0px;
     width: 100%;
+    margin-top: 2px;
+    margin-bottom: 0;
     text-align: center;
   }
-
   .navbar-brand {
+    padding-top: 13px;
     font-size: $font-size-base + 2;
     color: $header_brand_color;
-
-    padding-top: 15px;
-    padding-bottom: 15px;
-
     img {
-      vertical-align: baseline;
-      width: 16px;
-      margin-right: 3px;
-    }
-
-    span.default, span.default a {
-      font-family: $alt-font-family-sans-serif;
-      color: rgba($header_brand_color, 1);
-      font-size: $font-size-base + 2;
-
-      &:hover {
-        text-decoration: none;
-      }
+      height: 13px;
     }
   }
-
 }
 
 .navbar-collapse {
-  padding: 0px;
-
+  padding: 0;
   .navbar-right {
     width: 30%;
-
     > li {
-      float: right
+      float: right;
     }
   }
-
   .navbar-nav > li > a {
-    line-height: 35px;
     padding-top: 8px;
     padding-bottom: 7px;
+    line-height: 35px;
   }
 }
 
 .navbar-site {
+  display: flex;
+  justify-content: center;
   width: 40%;
-  @include display-flex;
-  @include flex-justify-content(center);
 
   li {
     a {
       display: inline-block;
-
       &:first-child {
-        padding-right: 0px;
+        padding-right: 0;
       }
-
       span.arrow {
         position: relative;
         top: 1px;
-
         i {
           font-size: 14px;
           font-weight: bold;
           color: $header_site_arrow_color;
         }
       }
-
       &:hover {
         // TODO: cf Mathieu
       }
@@ -95,21 +71,18 @@ $header_site_arrow_color:     #349cb0;
 .navbar-default {
   .navbar-toggle {
     z-index: 10;
+    background-color: rgba(#000, .2);
     border-color: transparent;
-    background-color: rgba(#000, 0.2);
-
-    &:focus, &:active {
-      background-color: rgba(#000, 0.2);
+    &:focus,
+    &:active {
+      background-color: rgba(#000, .2);
     }
-
     .icon-bar {
-      background-color: rgba(#fff, 0.6);
-      @include transition(all 0.3s ease-in-out);
+      @include transition(all .3s ease-in-out);
+      background-color: rgba(#fff, .6);
     }
-
     &:hover {
-      background-color: rgba(#000, 0.2);
-
+      background-color: rgba(#000, .2);
       .icon-bar {
         background-color: #fff;
       }