locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/assets/stylesheets/locomotive/base/_fonts.scss

@@ -5,13 +5,13 @@
   font-family: 'Noto Sans';
   font-style: normal;
   font-weight: 400;
-  src: local('Noto Sans'), local('NotoSans'), url(http://themes.googleusercontent.com/static/fonts/notosans/v4/LeFlHvsZjXu2c3ZRgBq9nLO3LdcAZYWl9Si6vvxL-qU.woff) format('woff');
+  src: local('Noto Sans'), local('NotoSans'), url("//themes.googleusercontent.com/static/fonts/notosans/v4/LeFlHvsZjXu2c3ZRgBq9nLO3LdcAZYWl9Si6vvxL-qU.woff") format('woff');
 }
 @font-face {
   font-family: 'Noto Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('Noto Sans Bold'), local('NotoSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/notosans/v4/PIbvSEyHEdL91QLOQRnZ16RDOzjiPcYnFooOUGCOsRk.woff) format('woff');
+  src: local('Noto Sans Bold'), local('NotoSans-Bold'), url("//themes.googleusercontent.com/static/fonts/notosans/v4/PIbvSEyHEdL91QLOQRnZ16RDOzjiPcYnFooOUGCOsRk.woff") format('woff');
 }
 
 // Muli
@@ -19,11 +19,11 @@
   font-family: 'Muli';
   font-style: normal;
   font-weight: 300;
-  src: local('Muli Light'), local('Muli-Light'), url(http://themes.googleusercontent.com/static/fonts/muli/v5/TgrecWq39GVsTOFonFwGXQLUuEpTyoUstqEm5AMlJo4.woff) format('woff');
+  src: local('Muli Light'), local('Muli-Light'), url("//themes.googleusercontent.com/static/fonts/muli/v5/TgrecWq39GVsTOFonFwGXQLUuEpTyoUstqEm5AMlJo4.woff") format('woff');
 }
 @font-face {
   font-family: 'Muli';
   font-style: normal;
   font-weight: 400;
-  src: local('Muli'), url(http://themes.googleusercontent.com/static/fonts/muli/v5/minRpKQdEvXRRS8oAbAtWvesZW2xOQ-xsNqO47m55DA.woff) format('woff');
-}
+  src: local('Muli'), url("//themes.googleusercontent.com/static/fonts/muli/v5/minRpKQdEvXRRS8oAbAtWvesZW2xOQ-xsNqO47m55DA.woff") format('woff');
+}

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

@@ -27,8 +27,16 @@
         text-transform: uppercase;
         color: $form_input_label_color;
 
+        .untranslated {
+          color: $form_input_label_untranslated_color;
+        }
+
+        .flag {
+          margin-right: 5px;
+        }
+
         abbr {
-          margin-left: 5px;
+          margin-right: 5px;
         }
       }
 

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

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

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

@@ -87,20 +87,33 @@
   .asset {
     @include border-radius($asset_border_radius);
     background: $asset_background;
-    padding: 15px;
+    padding: 10px 15px;
     margin: 0px 20px 20px 0px;
+    position: relative;
 
     width: $asset_width;
     height: $asset_height;
 
-    > .top {
-      min-height: $asset_height - 85;
-    }
-
     h2 {
       color: $asset_title_color;
       font-size: 14px;
-      margin: 8px 0px 20px 0px;
+      margin: 0px 0px 4px 0px;
+      text-align: right;
+    }
+
+    .size {
+      font-size: 11px;
+      text-align: right;
+      color: $asset_size_color;
+      margin-bottom: 10px;
+    }
+
+    .body {
+      width: 100%;
+      height: $asset_height - 106;
+      @include display-flex;
+      @include flex-align(center);
+      @include flex-justify-content(center);
     }
 
     .small-thumbnail {
@@ -140,8 +153,14 @@
       }
     }
 
-    a.remove {
-      color: $asset_remove_icon_color;
+    .actions {
+      position: absolute;
+      bottom: 10px;
+      right: 15px;
+
+      a.remove {
+        color: $asset_remove_icon_color;
+      }
     }
 
   }

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

@@ -0,0 +1,34 @@
+$developers_documentation_title_color: #666;
+$developers_documentation_title_border: #eee;
+$developers_documentation_code_border: #eee;
+$developers_documentation_code_radius: 3px;
+
+body.developers-documentation {
+
+  .documentation {
+
+    padding: 30px 0px;
+
+    h3 {
+      color: $developers_documentation_title_color;
+      font-size: 12px;
+      text-transform: uppercase;
+      border-bottom: 1px solid $developers_documentation_title_border;
+      padding-bottom: 10px;
+      margin: 40px 0px 20px 0px;
+    }
+
+    p {
+      margin: 20px 0px;
+    }
+
+    pre {
+      background: #fff;
+      border: 3px solid $developers_documentation_code_border;
+      @include border-radius($developers_documentation_code_radius);
+      padding: 0px;
+    }
+
+  }
+
+}

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

@@ -0,0 +1,37 @@
+$error_legend_color: #a2e4f1;
+
+h1 {
+  text-transform: capitalize;
+  font-size: $font-size-base + 2;
+  font-family: $alt-font-family-sans-serif;
+
+  img {
+    position: relative;
+    top: -2px;
+    width: 16px;
+  }
+
+  small {
+    display: block;
+    width: 100%;
+    text-align: center;
+    text-transform: lowercase;
+    color: $error_legend_color;
+    font-size: $font-size-base;
+    font-weight: 200;
+    margin-top: 10px;
+  }
+}
+
+h2 {
+  padding: 30px 0px;
+  width: 600px;
+  line-height: 40px;
+  text-justify: center;
+}
+
+p.next {
+  a {
+    color: #fff;
+  }
+}

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

@@ -50,6 +50,12 @@
           color: $content_list_item_link_color;
         }
 
+        .item-label {
+          a:first-child {
+            font-weight: bold;
+          }
+        }
+
         .stamp {
           margin-top: 5px;
           color: $content_list_item_stamp_color;

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

@@ -18,6 +18,10 @@
       p {
         margin: 0px;
       }
+
+      a {
+        margin-left: 5px;
+      }
     }
 
   }

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

@@ -1,2 +1,3 @@
 @import "misc/nav";
 @import "misc/notify";
+@import "misc/modal";

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

@@ -0,0 +1,13 @@
+#translations-list {
+
+  .item {
+    &:first-child {
+      border-top: none;
+    }
+
+    &.zero-done .completion i { color: $brand-danger; }
+    &.partially-done .completion i { color: $brand-warning; }
+    &.all-done .completion i { color: $brand-success; }
+  }
+
+}

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

@@ -18,7 +18,7 @@ $header_site_arrow_color:     #349cb0;
   }
 
   .navbar-brand {
-    font-size: $header_brand_font_size;
+    font-size: $font-size-base + 2;
     color: $header_brand_color;
 
     padding-top: 15px;
@@ -30,9 +30,14 @@ $header_site_arrow_color:     #349cb0;
       margin-right: 3px;
     }
 
-    span.default {
+    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;
+      }
     }
   }
 

data/app/assets/stylesheets/locomotive/components/misc/_modal.scss

@@ -0,0 +1,13 @@
+.modal-content {
+  @include border-radius(3px);
+}
+
+.modal-title {
+  color: $main_title_color;
+}
+
+.modal-body {
+  p {
+    line-height: 25px;
+  }
+}

data/app/assets/stylesheets/locomotive/components/misc/_notify.scss

@@ -10,7 +10,7 @@
   }
 }
 
-[data-notify="container"].alert-success, [data-notify="container"].alert-danger {
+[data-notify="container"].alert-success, [data-notify="container"].alert-danger, [data-notify="container"].alert-error {
    [data-notify="icon"], [data-notify="message"] {
     color: #fff;
   }
@@ -20,6 +20,6 @@
   background-color: $brand-success;
 }
 
-[data-notify="container"].alert-danger {
+[data-notify="container"].alert-danger, [data-notify="container"].alert-error {
   background-color: $brand-danger;
 }

data/app/assets/stylesheets/locomotive/components/not_logged_in/_sign_in_and_up.scss

@@ -1,6 +1,6 @@
 $sign_in_legend_color: #a2e4f1;
 
-body.sessions, body.registrations {
+body.sessions, body.registrations, body.passwords {
   .content {
     @include make-sm-column-offset(3);
     @include make-sm-column(6);
@@ -10,6 +10,16 @@ body.sessions, body.registrations {
   }
 
   h1 {
+    text-transform: capitalize;
+    font-size: $font-size-base + 2;
+    font-family: $alt-font-family-sans-serif;
+
+    img {
+      position: relative;
+      top: -2px;
+      width: 16px;
+    }
+
     small {
       display: block;
       width: 100%;

data/app/assets/stylesheets/locomotive/components/sidebar/_pages_tree.scss

@@ -2,7 +2,7 @@ $pt_icon_color:         #636666;
 $pt_border_color:       #4a4d4d;
 $pt_new_link_color:     #949999;
 $pt_placeholder_color:  #2f2f2f;
-$pt_warning_color:      #F89406;
+$pt_warning_color:      #f89406;
 
 .sidebar {
 
@@ -58,7 +58,7 @@ $pt_warning_color:      #F89406;
         .fold-unfold {
           @include user-select(none);
 
-          margin-left: 3px;
+          margin-left: 8px;
 
           i {
             color: $pt_icon_color;

data/app/assets/stylesheets/locomotive/error.scss

@@ -0,0 +1,12 @@
+@import "font-awesome-sprockets";
+@import "font-awesome";
+
+@import "./globals/bootstrap";
+@import "bootstrap";
+
+@import "./base/fonts";
+@import "./base/typography";
+
+@import "layouts/not_logged_in";
+
+@import "components/error";

data/app/assets/stylesheets/locomotive/globals/_bootstrap.scss

@@ -22,7 +22,7 @@
 $brand-primary:         #54b9cd !default;
 $brand-success:         #54cc68 !default;
 // $brand-info:            #5bc0de !default;
-// $brand-warning:         #f0ad4e !default;
+$brand-warning:         #f0ad4e !default;
 $brand-danger:          #d9684c !default;
 
 

data/app/assets/stylesheets/locomotive/globals/_mixins.scss

@@ -9,14 +9,18 @@
 
 @mixin display-flex
 {
-    display: flexbox;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
+  display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -ms-flexbox;      /* TWEENER - IE 10 */
+  display: -webkit-flex;     /* NEW - Chrome */
+  display: flex;             /* NEW, Spec - Opera 12.1, Firefox 20+ */
 }
 
 @mixin flex-justify-content($alignment)
 {
+           -webkit-box-pack: $alignment;
+              -moz-box-pack: $alignment;
+              -ms-flex-pack: $alignment;
     -webkit-justify-content: $alignment;
        -moz-justify-content: $alignment;
             justify-content: $alignment;