lalala 4.0.0.dev.275 → 4.0.0.dev.277

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 516beae401a055b6b4ff0e4be439d662e4724320
-  data.tar.gz: 23ff79bee97b10067c5c8d714ac75452e8b20523
+  metadata.gz: e278e14f0eb5c4746f3aa83df32fa07142d9cb70
+  data.tar.gz: 8f2ed2866f9b5d290a60cf0808005740b30be35b
 SHA512:
-  metadata.gz: ef962f9342106f776682ae780bc2b852ddfa9dd4e56ea01cc24795ea7388036bfa4e3743cf45d4707c4e31dc1d73402bc5e9466be8f8caaa8ab8bd99bca615d7
-  data.tar.gz: daf28c65cc9878acd86eeb389412677bc61ef941146452aed8e543f67d37dc42c706552349475691bdbda92c0306b6a25add0f855019a63d6d642ec6938f1c4e
+  metadata.gz: 61dfdecbf9aedd55b4234ef4638abf8e8e93aacd5ab94a2315b896025f874b42ea8b37ab0e7bab02e3ac6c0baa3db47c8c84107d64d683cec4ae11cba964c8d3
+  data.tar.gz: c510a027e73b58fd62493def9398a5319d59cbd176b12c8c89e1edd0e95c7539468d1931bcaf60d7c2fb1a91e711a621e44911866669fe5f697f18ef9d85c18d

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

@@ -38,7 +38,7 @@
   position: relative;
   display: block;
   overflow: hidden;
-  padding: 5px 6px 5px 8px;
+  padding: 7px 6px 7px 8px;
   border: 1px solid gray(220);
   border-radius: 5px;
   background-color: #fff;

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

@@ -122,6 +122,32 @@ select:focus {
   }
 }
 
+// actions
+.actions {
+
+  ol {
+    @include pie-clearfix;
+    border-top: 1px solid gray(220);
+    padding: 15px 0 15px $label_width;
+    margin: 15px 0 30px 0;
+
+    // float li items next to eachother
+    li {
+      float: left;
+      margin: 0 7px 0 0;
+
+      &.cancel {
+        // cancel (not an input, but a plain <a href>)
+        a {
+          @extend %btn;
+          @extend %btn.gray;
+          @include icon('bullet_orange', 'button');
+        }
+      }
+    }
+  }
+}
+
 // input line
 .input {
   position: relative;
@@ -131,6 +157,7 @@ select:focus {
     width: $label_width;
   }
 
+  a,
   input,
   textarea,
   select {

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

@@ -15,7 +15,7 @@ $icons: "accept", "add", "anchor", "application", "application_add", "applicatio
   background-repeat: no-repeat;
 
   @if $type == 'button' {
-    padding-left: 29px;
+    padding-left: 29px !important;
   }
 }
 

data/app/assets/stylesheets/lalala/modules/_filter-form.css.scss

@@ -36,6 +36,13 @@
     }
 
     &.filter_string.select_and_search {
+
+      // make a little bit bigger to fit input field
+      a.chosen-single {
+        padding: 7px 6px 8px 8px;
+        margin-top: -6px;
+      }
+
       input {
         margin: 0 0 0 10px;
         width: 60%;

data/app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss

@@ -1,11 +1,11 @@
 .sidebar_section {
-  @include border-radius(3px);
+  @include border-radius(5px);
   border: 1px solid gray(220);
   margin: 0 30px 20px 0;
   overflow: hidden;
 
   h3 {
-    background-color: gray(247);
+    background-color: gray(245);
     border-bottom: 1px solid gray(220);
     color: gray(70);
     font-size: 14px !important;
@@ -15,7 +15,7 @@
   }
 
   .panel_contents {
-    padding: 15px 20px 15px 20px;
+    padding: 15px 20px 10px 20px;
 
     // LALALA specific styling
     //

data/lib/lalala/version.rb

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

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

@@ -26,10 +26,10 @@ ActiveAdmin.register Article do
 
   end
 
-  sidebar "Actions", :only => [:edit] do
+  sidebar "Information", :only => [:edit] do
 
     div :class => "lalala sidebar message", :id => "lalala_sidebar_message" do
-      "This item has been updated last at <strong>Feb 14th, 2014</strong>".html_safe
+      "This item has been updated last at <strong>Feb 14th, 2014</strong> by <a href='#link-to-hans-profile'>Hans</a>.".html_safe
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.275
+  version: 4.0.0.dev.277
 platform: ruby
 authors:
 - Simon Menke