lalala 4.0.0.dev.227 → 4.0.0.dev.229

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94648eedf5496e82cbc5b2162f1d736b48f73bc7
-  data.tar.gz: 8781740443196720d4f4492d871e21227b985105
+  metadata.gz: 1afc77e11fbc4702be604028e68a8dae670d9a11
+  data.tar.gz: f0b7a1074da779e1d505be6968778737bbef7d36
 SHA512:
-  metadata.gz: 38ba27b9a21af7e08ba2bf636df44a7d09fff9e22a5ecb58618f6d83e88dedd68136a287f79e30406faf5b074da82973c2435c7234b19379e3e9c6cdcb6a0313
-  data.tar.gz: 6fc2e359ab825ff6ace2f2c34aa76f56d51e5df9277a15cb5acf2184c59e66b83e2696308a9dd512f398b793f80af666a9f2bf1c72e87368b1b6cec14ef42517
+  metadata.gz: 8e3211c0df1103a867e320265d6db0163859f559677f350d85ecef6be9b10c913a25135512a8b576424c774429256722f711ded08445998ff3309783f968844f
+  data.tar.gz: b9c1dabf55d2d40b4180dd2358b764621129adc4e83842013b320c3e80e3a5e6956aca899b7179800bcd1de0a0e0927811cd9732e68794863e7ff40ce8a0f951

data/app/assets/stylesheets/lalala/_base.css.scss

@@ -33,3 +33,5 @@
 @import "lalala/modules/editor";
 @import "lalala/modules/editor-cheatsheet";
 @import "lalala/modules/grid";
+@import "lalala/modules/scopes";
+

data/app/assets/stylesheets/lalala/components/_chosen-lalala.css.scss

@@ -10,6 +10,7 @@
   -moz-user-select: none;
   user-select: none;
 }
+
 .chosen-container .chosen-drop {
   position: absolute;
   top: 100%;

data/app/assets/stylesheets/lalala/components/_tables.css.scss

@@ -14,7 +14,7 @@
 // Table default styles
 //
 #active_admin_content table {
-  background-color: gray(130);
+  background-color: $blue;
   border-collapse: collapse;
   margin: 0;
   width: 100%;
@@ -23,7 +23,7 @@
     border: none;
 
     a {
-      color: gray(188);
+      color: rgba(255,255,255,.5);
       font-weight: bold;
     }
 

data/app/assets/stylesheets/lalala/lib/_pikaday.css

@@ -167,4 +167,4 @@
     background: #ff8000 !important;
     box-shadow: none !important;
     border-radius: 3px !important;
-}
+}

data/app/assets/stylesheets/lalala/modules/_flashes.css.scss

@@ -1,7 +1,7 @@
 .flashes {
   @include animation-name(flash-slide-up);
   @include animation-duration(500ms);
-  @include animation-delay(1.5s);
+  @include animation-delay(0.75s);
   @include animation-fill-mode(forwards);
   left: 0;
   height: $top_nav_height;
@@ -31,6 +31,6 @@
     top: 0;
   }
   100% {
-    top: 0 - $top_nav_height;
+    top: 0 - $top_nav_height - 1;
   }
 }

data/app/assets/stylesheets/lalala/modules/_scopes.css.scss

@@ -0,0 +1,51 @@
+/*
+ * Scopes are fixed categories on a model
+ * You can find the scopes in an index-view, on top of the table
+*/
+.table_tools {
+
+  .scopes {
+    @include border-radius(5px);
+    border: 1px solid gray(224);
+    margin: 0;
+    padding: 0;
+
+    .scope {
+      border-left: 1px solid gray(224);
+      margin: 0;
+      padding: 0;
+
+      a {
+        @include transition(color 150ms);
+        color: gray(200);
+        padding: 4px 6px !important;
+        text-decoration: none !important;
+
+        &:hover {
+          color: gray(150);
+        }
+      }
+
+      &.selected {
+        background-color: gray(224);
+
+        a {
+          color: gray(150);
+          font-weight: bold;
+          text-decoration: none;
+
+          span {
+            font-weight: normal;
+          }
+        }
+      }
+
+      // the first scope-element gets no border
+      &:first-child {
+        border-left: none;
+      }
+
+    }
+  }
+
+}

data/app/assets/stylesheets/lalala/modules/_title-bar.css.scss

@@ -20,6 +20,7 @@
 
   #titlebar_left {
     float: left;
+    padding: 0 0 0 19px;
   }
 
   #titlebar_right {
@@ -64,7 +65,7 @@
   .breadcrumb {
     color: gray(211);
     line-height: $top_nav_height;
-    padding: 0 0 0 19px;
+    padding: 0;
     white-space: nowrap;
 
     li {

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "227"
+  BUILD   = "229"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/app/admin/articles.rb

@@ -1,5 +1,10 @@
 ActiveAdmin.register Article do
 
+  scope :all, :default => true
+  scope :catA
+  scope :catB
+  scope :catC
+
   form do |f|
     f.inputs do
       f.input :title

data/test/dummy/app/models/article.rb

@@ -9,6 +9,11 @@ class Article < ActiveRecord::Base
   # Validations
   validates :title, presence: true
 
+  # Scopes
+  scope :catA, where(:category => "A")
+  scope :catB, where(:category => "B")
+  scope :catC, where(:category => "C")
+
   # Bindings
   has_and_belongs_to_many :tags
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.227
+  version: 4.0.0.dev.229
 platform: ruby
 authors:
 - Simon Menke
@@ -1346,6 +1346,7 @@ files:
 - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
 - app/assets/stylesheets/lalala/modules/_index-footer.css.scss
 - app/assets/stylesheets/lalala/modules/_login.css.scss
+- app/assets/stylesheets/lalala/modules/_scopes.css.scss
 - app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss
 - app/assets/stylesheets/lalala/modules/_table-tools.css.scss
 - app/assets/stylesheets/lalala/modules/_title-bar.css.scss