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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 94648eedf5496e82cbc5b2162f1d736b48f73bc7
4
- data.tar.gz: 8781740443196720d4f4492d871e21227b985105
3
+ metadata.gz: 1afc77e11fbc4702be604028e68a8dae670d9a11
4
+ data.tar.gz: f0b7a1074da779e1d505be6968778737bbef7d36
5
5
  SHA512:
6
- metadata.gz: 38ba27b9a21af7e08ba2bf636df44a7d09fff9e22a5ecb58618f6d83e88dedd68136a287f79e30406faf5b074da82973c2435c7234b19379e3e9c6cdcb6a0313
7
- data.tar.gz: 6fc2e359ab825ff6ace2f2c34aa76f56d51e5df9277a15cb5acf2184c59e66b83e2696308a9dd512f398b793f80af666a9f2bf1c72e87368b1b6cec14ef42517
6
+ metadata.gz: 8e3211c0df1103a867e320265d6db0163859f559677f350d85ecef6be9b10c913a25135512a8b576424c774429256722f711ded08445998ff3309783f968844f
7
+ data.tar.gz: b9c1dabf55d2d40b4180dd2358b764621129adc4e83842013b320c3e80e3a5e6956aca899b7179800bcd1de0a0e0927811cd9732e68794863e7ff40ce8a0f951
@@ -33,3 +33,5 @@
33
33
  @import "lalala/modules/editor";
34
34
  @import "lalala/modules/editor-cheatsheet";
35
35
  @import "lalala/modules/grid";
36
+ @import "lalala/modules/scopes";
37
+
@@ -10,6 +10,7 @@
10
10
  -moz-user-select: none;
11
11
  user-select: none;
12
12
  }
13
+
13
14
  .chosen-container .chosen-drop {
14
15
  position: absolute;
15
16
  top: 100%;
@@ -14,7 +14,7 @@
14
14
  // Table default styles
15
15
  //
16
16
  #active_admin_content table {
17
- background-color: gray(130);
17
+ background-color: $blue;
18
18
  border-collapse: collapse;
19
19
  margin: 0;
20
20
  width: 100%;
@@ -23,7 +23,7 @@
23
23
  border: none;
24
24
 
25
25
  a {
26
- color: gray(188);
26
+ color: rgba(255,255,255,.5);
27
27
  font-weight: bold;
28
28
  }
29
29
 
@@ -167,4 +167,4 @@
167
167
  background: #ff8000 !important;
168
168
  box-shadow: none !important;
169
169
  border-radius: 3px !important;
170
- }
170
+ }
@@ -1,7 +1,7 @@
1
1
  .flashes {
2
2
  @include animation-name(flash-slide-up);
3
3
  @include animation-duration(500ms);
4
- @include animation-delay(1.5s);
4
+ @include animation-delay(0.75s);
5
5
  @include animation-fill-mode(forwards);
6
6
  left: 0;
7
7
  height: $top_nav_height;
@@ -31,6 +31,6 @@
31
31
  top: 0;
32
32
  }
33
33
  100% {
34
- top: 0 - $top_nav_height;
34
+ top: 0 - $top_nav_height - 1;
35
35
  }
36
36
  }
@@ -0,0 +1,51 @@
1
+ /*
2
+ * Scopes are fixed categories on a model
3
+ * You can find the scopes in an index-view, on top of the table
4
+ */
5
+ .table_tools {
6
+
7
+ .scopes {
8
+ @include border-radius(5px);
9
+ border: 1px solid gray(224);
10
+ margin: 0;
11
+ padding: 0;
12
+
13
+ .scope {
14
+ border-left: 1px solid gray(224);
15
+ margin: 0;
16
+ padding: 0;
17
+
18
+ a {
19
+ @include transition(color 150ms);
20
+ color: gray(200);
21
+ padding: 4px 6px !important;
22
+ text-decoration: none !important;
23
+
24
+ &:hover {
25
+ color: gray(150);
26
+ }
27
+ }
28
+
29
+ &.selected {
30
+ background-color: gray(224);
31
+
32
+ a {
33
+ color: gray(150);
34
+ font-weight: bold;
35
+ text-decoration: none;
36
+
37
+ span {
38
+ font-weight: normal;
39
+ }
40
+ }
41
+ }
42
+
43
+ // the first scope-element gets no border
44
+ &:first-child {
45
+ border-left: none;
46
+ }
47
+
48
+ }
49
+ }
50
+
51
+ }
@@ -20,6 +20,7 @@
20
20
 
21
21
  #titlebar_left {
22
22
  float: left;
23
+ padding: 0 0 0 19px;
23
24
  }
24
25
 
25
26
  #titlebar_right {
@@ -64,7 +65,7 @@
64
65
  .breadcrumb {
65
66
  color: gray(211);
66
67
  line-height: $top_nav_height;
67
- padding: 0 0 0 19px;
68
+ padding: 0;
68
69
  white-space: nowrap;
69
70
 
70
71
  li {
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "227"
3
+ BUILD = "229"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -1,5 +1,10 @@
1
1
  ActiveAdmin.register Article do
2
2
 
3
+ scope :all, :default => true
4
+ scope :catA
5
+ scope :catB
6
+ scope :catC
7
+
3
8
  form do |f|
4
9
  f.inputs do
5
10
  f.input :title
@@ -9,6 +9,11 @@ class Article < ActiveRecord::Base
9
9
  # Validations
10
10
  validates :title, presence: true
11
11
 
12
+ # Scopes
13
+ scope :catA, where(:category => "A")
14
+ scope :catB, where(:category => "B")
15
+ scope :catC, where(:category => "C")
16
+
12
17
  # Bindings
13
18
  has_and_belongs_to_many :tags
14
19
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.227
4
+ version: 4.0.0.dev.229
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -1346,6 +1346,7 @@ files:
1346
1346
  - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
1347
1347
  - app/assets/stylesheets/lalala/modules/_index-footer.css.scss
1348
1348
  - app/assets/stylesheets/lalala/modules/_login.css.scss
1349
+ - app/assets/stylesheets/lalala/modules/_scopes.css.scss
1349
1350
  - app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss
1350
1351
  - app/assets/stylesheets/lalala/modules/_table-tools.css.scss
1351
1352
  - app/assets/stylesheets/lalala/modules/_title-bar.css.scss