arctic_admin 3.0.0 → 3.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/arctic_admin/base.js +22 -19
  3. data/app/assets/stylesheets/arctic_admin/_common.scss +6 -1
  4. data/app/assets/stylesheets/arctic_admin/components/_status_tag.scss +7 -7
  5. data/app/assets/stylesheets/arctic_admin/components/_tabs.scss +1 -1
  6. data/app/assets/stylesheets/arctic_admin/layouts/_filter.scss +1 -1
  7. data/app/assets/stylesheets/arctic_admin/layouts/_header.scss +2 -2
  8. data/app/assets/stylesheets/arctic_admin/pages/_index.scss +5 -2
  9. data/lib/arctic_admin/version.rb +1 -1
  10. metadata +14 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a7cfc06e17629bbafe98f4b1c994d3f81ea2ce41
4
- data.tar.gz: 6bb0720dd1bbe4096ebb7e1cecdff72312f9afab
3
+ metadata.gz: 662f93d8cc9afd1ae66a5453928eeecb8b1fd246
4
+ data.tar.gz: 86592eff04ac9165207e51eb65e76529eb261804
5
5
  SHA512:
6
- metadata.gz: 415e20f92ee1bcacc8d322c96cbb8b06ce204c316320fa4a2980aa2c661ee9c890e2f63c9b9f46d2c62488395e377b1dc47f8f977fb8eeaf7c6b084722b5d61a
7
- data.tar.gz: 9c20857840ef64b120cb688d68eda5a7da221e9ebbc5e2c874b37f7de80d823c89002dd2241020b95d8c47a5a408be6711a9de49aa8fa7243ff2531b6c73b579
6
+ metadata.gz: bf494c1eb7546dad124cfc84056ab020f84f2ff5e75f03847eaed7685cb76d5696dd5d6baa3559fbe61d07566d9a9a3135539b9fdd7fcc8bda45467297120e04
7
+ data.tar.gz: f768ed34cb5859391a65ee636531b31e5082a44500fdc3bc4e59b66030eb52b00c476ff9b33c6d522c4cb03d04760a4c189c94d25b339bc6e86fe5785da21038
data/app/assets/javascripts/arctic_admin/base.js CHANGED
@@ -3,26 +3,29 @@
3
3
  //= require active_admin/base
4
4
 
5
5
  $(function() {
6
+ var animationFilterDone = true;
6
7
  $(document).on('click touchstart', '#sidebar', function(e) {
7
- var position = $(this).position();
8
- var width = $(this).width();
9
- var target = e.target;
10
- if ((e.pageX < position.left) && (target.tagName != 'SELECT') && (target.tagName != 'OPTION')) {
11
- if ($(this).css('right') == '0px') {
12
- $(this).css('position', 'fixed');
13
- $(this).animate({
14
- right: "-="+width
15
- }, 600, function() {
16
- $(this).removeAttr('style');
17
- animationFilterDone = true;
18
- });
19
- } else {
20
- $(this).animate({
21
- right: "+="+width
22
- }, 600, function() {
23
- $(this).css('position', 'absolute');
24
- animationFilterDone = true;
25
- });
8
+ if(animationFilterDone == true) {
9
+ var position = $(this).position();
10
+ var width = $(this).width();
11
+ var target = e.target;
12
+ if ((e.pageX < position.left) && (target.tagName != 'SELECT') && (target.tagName != 'OPTION')) {
13
+ if ($(this).css('right') == '0px') {
14
+ $(this).css('position', 'fixed');
15
+ $(this).animate({
16
+ right: "-="+width
17
+ }, 600, function() {
18
+ $(this).removeAttr('style');
19
+ animationFilterDone = true;
20
+ });
21
+ } else {
22
+ $(this).animate({
23
+ right: "+="+width
24
+ }, 600, function() {
25
+ $(this).css('position', 'absolute');
26
+ animationFilterDone = true;
27
+ });
28
+ }
26
29
  }
27
30
  }
28
31
  });
data/app/assets/stylesheets/arctic_admin/_common.scss CHANGED
@@ -2,6 +2,11 @@ code {
2
2
  display: block;
3
3
  background-color: #272822;
4
4
  padding: 5px;
5
- margin: 10px 0;
6
5
  color: white;
7
6
  }
7
+
8
+ hr {
9
+ border: 1px solid $border-color;
10
+ color: $primary-color;
11
+ margin: 10px auto 25px auto;
12
+ }
data/app/assets/stylesheets/arctic_admin/components/_status_tag.scss CHANGED
@@ -6,12 +6,12 @@
6
6
  padding: 3px 5px 2px 5px;
7
7
  font-size: 0.8em;
8
8
  border-radius: $border-radius;
9
- }
10
9
 
11
- .status_tag.ok, .status_tag.published, .status_tag.complete, .status_tag.completed, .status_tag.green {
12
- background-color: $status-tag-background-valid-color;
13
- }
10
+ &.ok, &.published, &.complete, &.completed, &.green, &.yes {
11
+ background-color: $status-tag-background-valid-color;
12
+ }
14
13
 
15
- .status_tag.cancel, .status_tag.red {
16
- background-color: $status-tag-background-error-color;
17
- }
14
+ &.cancel, &.red, &.no {
15
+ background-color: $status-tag-background-error-color;
16
+ }
17
+ }
data/app/assets/stylesheets/arctic_admin/components/_tabs.scss CHANGED
@@ -2,11 +2,11 @@
2
2
  border: 1px solid $border-color;
3
3
 
4
4
  .nav {
5
- text-align: center;
6
5
  border-bottom: 1px solid $border-color;
7
6
 
8
7
  li {
9
8
  display: inline-block;
9
+ text-align: center;
10
10
  @include outline();
11
11
 
12
12
  a {
data/app/assets/stylesheets/arctic_admin/layouts/_filter.scss CHANGED
@@ -22,7 +22,7 @@
22
22
  }
23
23
 
24
24
  .input {
25
- margin-bottom: 15px;
25
+ margin-bottom: 10px;
26
26
 
27
27
  input, select {
28
28
  height: 30px;
data/app/assets/stylesheets/arctic_admin/layouts/_header.scss CHANGED
@@ -14,11 +14,11 @@ body.active_admin.logged_in {
14
14
  }
15
15
 
16
16
  #active_admin_content {
17
- padding: 30px 0;
17
+ padding: 20px 0;
18
18
  @include clear-fix();
19
19
 
20
20
  @media screen and (min-width: $lg-width) {
21
- padding: 30px 25px;
21
+ padding: 20px 25px;
22
22
  }
23
23
  }
24
24
  }
data/app/assets/stylesheets/arctic_admin/pages/_index.scss CHANGED
@@ -76,13 +76,16 @@ body.index {
76
76
  }
77
77
 
78
78
  .table_actions {
79
+ margin-bottom: -4px;
80
+
79
81
  .member_link {
80
82
  @include primary-button($primary-color, white);
81
- padding: 2px 9px;
83
+ padding: 4px 8px;
82
84
  margin-right: 4px;
85
+ margin-bottom: 4px;
83
86
  }
84
87
  }
85
-
88
+
86
89
  .scopes {
87
90
  .scope {
88
91
  @include group-button($primary-color);
data/lib/arctic_admin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ArcticAdmin
2
- VERSION = "3.0.0"
2
+ VERSION = "3.1.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arctic_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Clément Prod'homme
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-01 00:00:00.000000000 Z
11
+ date: 2020-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -42,16 +42,22 @@ dependencies:
42
42
  name: activeadmin
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: 1.1.0
48
+ - - "<"
46
49
  - !ruby/object:Gem::Version
47
- version: '2.0'
50
+ version: '3.0'
48
51
  type: :runtime
49
52
  prerelease: false
50
53
  version_requirements: !ruby/object:Gem::Requirement
51
54
  requirements:
52
- - - "~>"
55
+ - - ">="
56
+ - !ruby/object:Gem::Version
57
+ version: 1.1.0
58
+ - - "<"
53
59
  - !ruby/object:Gem::Version
54
- version: '2.0'
60
+ version: '3.0'
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: jquery-rails
57
63
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
72
78
  requirements:
73
79
  - - "~>"
74
80
  - !ruby/object:Gem::Version
75
- version: 5.6.1
81
+ version: '5.0'
76
82
  type: :runtime
77
83
  prerelease: false
78
84
  version_requirements: !ruby/object:Gem::Requirement
79
85
  requirements:
80
86
  - - "~>"
81
87
  - !ruby/object:Gem::Version
82
- version: 5.6.1
88
+ version: '5.0'
83
89
  description: A responsive theme for Active Admin
84
90
  email:
85
91
  executables: []