arctic_admin 1.2.9 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/Readme.md +11 -7
  3. data/app/assets/javascripts/{arctic_admin.js → arctic_admin/base.js} +30 -33
  4. data/app/assets/stylesheets/{_base.scss → arctic_admin/_base.scss} +4 -1
  5. data/app/assets/stylesheets/{_common.scss → arctic_admin/_common.scss} +0 -0
  6. data/app/assets/stylesheets/{_fonts.scss → arctic_admin/_fonts.scss} +0 -0
  7. data/app/assets/stylesheets/arctic_admin/_grid.scss +4 -0
  8. data/app/assets/stylesheets/{_reset.scss → arctic_admin/_reset.scss} +0 -0
  9. data/app/assets/stylesheets/arctic_admin/components/_columns.scss +4 -0
  10. data/app/assets/stylesheets/{components → arctic_admin/components}/_comments.scss +0 -0
  11. data/app/assets/stylesheets/arctic_admin/components/_components.scss +12 -0
  12. data/app/assets/stylesheets/{components → arctic_admin/components}/_date_picker.scss +0 -0
  13. data/app/assets/stylesheets/{components → arctic_admin/components}/_dialogs.scss +0 -0
  14. data/app/assets/stylesheets/{components → arctic_admin/components}/_flash.scss +0 -0
  15. data/app/assets/stylesheets/{components → arctic_admin/components}/_form.scss +14 -3
  16. data/app/assets/stylesheets/{components → arctic_admin/components}/_inputs.scss +2 -2
  17. data/app/assets/stylesheets/{components → arctic_admin/components}/_pagination.scss +0 -0
  18. data/app/assets/stylesheets/{components → arctic_admin/components}/_panel_contents.scss +1 -7
  19. data/app/assets/stylesheets/{components → arctic_admin/components}/_status_tag.scss +0 -0
  20. data/app/assets/stylesheets/{components → arctic_admin/components}/_tables.scss +10 -8
  21. data/app/assets/stylesheets/{components → arctic_admin/components}/_tabs.scss +2 -3
  22. data/app/assets/stylesheets/{layouts → arctic_admin/layouts}/_filter.scss +0 -0
  23. data/app/assets/stylesheets/{layouts → arctic_admin/layouts}/_footer.scss +0 -0
  24. data/app/assets/stylesheets/{layouts → arctic_admin/layouts}/_header.scss +0 -0
  25. data/app/assets/stylesheets/{layouts → arctic_admin/layouts}/_main_content.scss +0 -0
  26. data/app/assets/stylesheets/{layouts → arctic_admin/layouts}/_sidebar.scss +0 -0
  27. data/app/assets/stylesheets/{mixins → arctic_admin/mixins}/_buttons_mixins.scss +0 -0
  28. data/app/assets/stylesheets/{mixins → arctic_admin/mixins}/_mixins.scss +0 -0
  29. data/app/assets/stylesheets/{mixins → arctic_admin/mixins}/_prefix_mixins.scss +0 -0
  30. data/app/assets/stylesheets/{pages → arctic_admin/pages}/_form.scss +6 -1
  31. data/app/assets/stylesheets/{pages → arctic_admin/pages}/_index.scss +5 -0
  32. data/app/assets/stylesheets/{pages → arctic_admin/pages}/_login.scss +0 -0
  33. data/app/assets/stylesheets/{pages → arctic_admin/pages}/_show.scss +0 -0
  34. data/app/assets/stylesheets/{variables → arctic_admin/variables}/_colors.scss +6 -4
  35. data/app/assets/stylesheets/arctic_admin/variables/_media_queries.scss +10 -0
  36. data/app/assets/stylesheets/{variables → arctic_admin/variables}/_size.scss +0 -0
  37. data/app/assets/stylesheets/{variables → arctic_admin/variables}/_variables.scss +0 -0
  38. data/lib/arctic_admin.rb +1 -1
  39. data/lib/arctic_admin/version.rb +1 -1
  40. metadata +37 -36
  41. data/app/assets/stylesheets/arctic_admin.scss +0 -2
  42. data/app/assets/stylesheets/components/_components.scss +0 -11
  43. data/app/assets/stylesheets/variables/_media_queries.scss +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c5d49c0c06fa86cc7032b01138e0bb948ad0bbc9
4
- data.tar.gz: 78832a27e6318d6c5844dec68b7dfd2531ac7852
3
+ metadata.gz: a4455243fcba4fdc5ce766fafa0a94d9d6da32c2
4
+ data.tar.gz: 67c5d72d9dab23275d022fcee1c148b40bb22b2c
5
5
  SHA512:
6
- metadata.gz: f5a1d0c1f38ae62b455d25053e152c0da2fd8740aec3b14984c1625340d73c4443645417b26d5891d69a14f490757e2aa0d774d2b5924f9f6505d917e4ec8968
7
- data.tar.gz: 39d7cc9950174513c2c5cd0534ac4243bee6467b2e8a88ca986f23b98cc314700be95fa2fbadf6bec561d4696fd23485238634bea1410e3488169aa816d472d2
6
+ metadata.gz: 58e1842c9208ca4ee9ea0f6f8504449cb22398f6307bb7f53cf1f8850c8e85a145e3fd5809fe11ac89935a1ac6d60d973f5ab7cdf61197222ece06c844c2e2ce
7
+ data.tar.gz: 40e2e11bf268fc34fe0de41d5d60f6b75bed678057ee65f3ecccf847c2079d1eb2bf38400d14002b8faeca298039b36da9486c1c8e9ab3c1744766eea42a2d3b
data/Readme.md CHANGED
@@ -29,18 +29,23 @@ In your `active_admin.css`, include the css file:
29
29
 
30
30
  ```css
31
31
  /*
32
- *= require arctic_admin
32
+ *= require arctic_admin/base
33
33
  */
34
34
  ```
35
+
36
+ **Remove the line `*= require active_admin/base`**
37
+
35
38
  Then restart your webserver if it was previously running.
36
39
 
37
40
  ### Sass Support
38
41
 
42
+ ![Remove the line @import "active_admin/base"](http://messages.hellobits.com/warning.svg?message=Remove%20the%20line%20%40import%20%22active_admin%2Fbase%22)
43
+
39
44
  If you prefer [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html), add this to your
40
45
  `active_admin.css.scss` file:
41
46
 
42
47
  ```scss
43
- @import "arctic_admin";
48
+ @import "arctic_admin/base";
44
49
  ```
45
50
 
46
51
  If you use the
@@ -48,7 +53,7 @@ If you use the
48
53
  add this to your `active_admin.css.sass` file:
49
54
 
50
55
  ```sass
51
- @import arctic_admin
56
+ @import arctic_admin/base
52
57
  ```
53
58
 
54
59
  ### JS
@@ -56,8 +61,7 @@ add this to your `active_admin.css.sass` file:
56
61
  In your `active_admin.js`, include the js file:
57
62
 
58
63
  ```js
59
- //= require active_admin/base
60
- //= require arctic_admin
64
+ //= require arctic_admin/base
61
65
  ```
62
66
 
63
67
  ### Customization
@@ -72,7 +76,7 @@ If you use the [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.htm
72
76
  ```scss
73
77
  $primary-color: #2dbb43;
74
78
 
75
- @import "arctic_admin";
79
+ @import "arctic_admin/base";
76
80
  ```
77
81
 
78
82
  If you use the
@@ -82,7 +86,7 @@ add this to your `active_admin.css.sass` file:
82
86
  ```sass
83
87
  $primary-color: #2dbb43
84
88
 
85
- @import arctic_admin
89
+ @import arctic_admin/base
86
90
  ```
87
91
 
88
92
  Then restart your webserver if it was previously running.
@@ -1,5 +1,6 @@
1
1
  //= require jquery
2
2
  //= require jquery_ujs
3
+ //= require active_admin/base
3
4
 
4
5
  $(function() {
5
6
  $('#sidebar').click(function (e) {
@@ -26,46 +27,42 @@ $(function() {
26
27
 
27
28
  var animationDone = true;
28
29
  $('#utility_nav').click(function (e) {
29
- if ($(window).width() < 960) {
30
- var position = $(this).position();
31
- var tabs = $('#tabs');
32
- var width = tabs.width() + 1;
30
+ var position = $(this).position();
31
+ var tabs = $('#tabs');
32
+ var width = tabs.width() + 1;
33
33
 
34
- if (e.pageX < (position.left + 40)) {
35
- if(animationDone == true) {
36
- animationDone = false;
37
- if (tabs.css('left') == '0px') {
38
- tabs.animate({
39
- left: "-="+width
40
- }, 400, function() {
41
- animationDone = true;
42
- });
43
- } else {
44
- tabs.animate({
45
- left: "+="+width
46
- }, 400, function() {
47
- animationDone = true;
48
- });
49
- }
34
+ if (e.pageX < (position.left + 40)) {
35
+ if(animationDone == true) {
36
+ animationDone = false;
37
+ if (tabs.css('left') == '0px') {
38
+ tabs.animate({
39
+ left: "-="+width
40
+ }, 400, function() {
41
+ animationDone = true;
42
+ });
43
+ } else {
44
+ tabs.animate({
45
+ left: "+="+width
46
+ }, 400, function() {
47
+ animationDone = true;
48
+ });
50
49
  }
51
50
  }
52
51
  }
53
52
  });
54
53
 
55
54
  $('body').click(function (e) {
56
- if ($(window).width() < 960) {
57
- var tabs = $('#tabs');
58
- var width = tabs.width() + 1;
59
- if (tabs.css('left') == '0px') {
60
- if (e.pageX > width && e.pageY > 60) {
61
- if(animationDone == true) {
62
- animationDone = false;
63
- tabs.animate({
64
- left: "-="+width
65
- }, 400, function() {
66
- animationDone = true;
67
- });
68
- }
55
+ var tabs = $('#tabs');
56
+ var width = tabs.width() + 1;
57
+ if (tabs.css('left') == '0px') {
58
+ if (e.pageX > width && e.pageY > 60) {
59
+ if(animationDone == true) {
60
+ animationDone = false;
61
+ tabs.animate({
62
+ left: "-="+width
63
+ }, 400, function() {
64
+ animationDone = true;
65
+ });
69
66
  }
70
67
  }
71
68
  }
@@ -1,3 +1,5 @@
1
+ @import "font-awesome";
2
+
1
3
  @import "reset";
2
4
  @import "fonts";
3
5
  @import "variables/variables";
@@ -5,6 +7,7 @@
5
7
  @import "mixins/mixins";
6
8
 
7
9
  @import "common";
10
+ @import "grid";
8
11
 
9
12
  @import "components/components";
10
13
 
@@ -28,4 +31,4 @@ body {
28
31
  a {
29
32
  color: $primary-color;
30
33
  text-decoration: none;
31
- }
34
+ }
@@ -0,0 +1,4 @@
1
+ .columns {
2
+ display: flex;
3
+ flex-wrap:wrap;
4
+ }
@@ -0,0 +1,4 @@
1
+ .columns {
2
+ display: flex;
3
+ flex-wrap: wrap;
4
+ }
@@ -0,0 +1,12 @@
1
+ @import "inputs";
2
+ @import "flash";
3
+ @import "tables";
4
+ @import "date_picker";
5
+ @import "status_tag";
6
+ @import "panel_contents";
7
+ @import "form";
8
+ @import "pagination";
9
+ @import "dialogs";
10
+ @import "comments";
11
+ @import "tabs";
12
+ @import "columns";
@@ -22,19 +22,30 @@
22
22
  border-bottom: 1px solid $body-background;
23
23
  }
24
24
 
25
- .field_with_errors {
26
- input {
25
+ .error {
26
+ input, select {
27
27
  border-color: $error;
28
28
  }
29
29
  }
30
30
 
31
- .inline-errors {
31
+ input, select {
32
+ &.error {
33
+ border-color: $error;
34
+ }
35
+ }
36
+
37
+ .inline-errors, label.error {
32
38
  color: $error;
33
39
  margin-top: 5px;
34
40
  margin-bottom: 20px;
35
41
  font-size: 14px;
36
42
  }
37
43
 
44
+ label.error {
45
+ display: block;
46
+ margin-left: 25%;
47
+ }
48
+
38
49
  .actions {
39
50
 
40
51
  .action {
@@ -15,7 +15,7 @@ input[type="number"], textarea {
15
15
  color: $text-color;
16
16
  background-color: #fff;
17
17
  background-image: none;
18
- border: 1px solid #e4eaec;
18
+ border: 1px solid $border-color;
19
19
  outline: 0;
20
20
  border-radius: $border-radius;
21
21
  @include transition(border-color ease-in-out .15s);
@@ -85,7 +85,7 @@ input[type="radio"] {
85
85
  select {
86
86
  background-color: #fff;
87
87
  background-image: none;
88
- border: 1px solid #e4eaec;
88
+ border: 1px solid $border-color;
89
89
  outline: 0;
90
90
  border-radius: $border-radius;
91
91
  @include transition(border-color ease-in-out .15s);
@@ -1,10 +1,4 @@
1
1
  .panel_contents {
2
- .attributes_table {
3
- th {
4
- border-top: 1px solid #e4eaec;
5
- }
6
- }
7
-
8
2
  .paginated_collection {
9
3
  #index_footer {
10
4
  margin: 10px;
@@ -17,4 +11,4 @@
17
11
  text-align: left;
18
12
  padding: 8px;
19
13
  }
20
- }
14
+ }
@@ -1,13 +1,18 @@
1
1
  table {
2
2
  width: 100%;
3
+ border-collapse: collapse;
3
4
 
4
5
  &:not(.index_table) {
5
- @include box-shadow(0 0 4px 0 rgba(0, 0, 0, 0.1));
6
6
  border-radius: $border-radius;
7
7
  margin-bottom: 10px;
8
8
  }
9
9
  }
10
10
 
11
+ thead tr {
12
+ border: 1px solid $border-color;
13
+ background-color: $border-color;
14
+ }
15
+
11
16
  thead th {
12
17
  font-size: 12px;
13
18
  text-align: left;
@@ -34,12 +39,10 @@ thead th {
34
39
  }
35
40
 
36
41
  tbody tr {
37
- &:nth-of-type(odd) {
38
- background-color: rgba(243,247,249,.3);
39
- }
40
-
42
+ border: 1px solid $border-color;
43
+
41
44
  &:hover {
42
- background-color: #f3f7f9;
45
+ background-color: rgba(228, 234, 236, 0.3);
43
46
  }
44
47
 
45
48
  th {
@@ -49,7 +52,6 @@ tbody tr {
49
52
  td {
50
53
  padding: 4px;
51
54
  vertical-align: middle;
52
- border-top: 1px solid #e4eaec;
53
55
  color: #7A8392;
54
56
  font-size: 12px;
55
57
 
@@ -61,4 +63,4 @@ tbody tr {
61
63
  padding: 8px;
62
64
  }
63
65
  }
64
- }
66
+ }
@@ -1,10 +1,9 @@
1
1
  .tabs.ui-tabs {
2
- @include box-shadow(0 0 4px 0 rgba(0,0,0,.1));
3
- border-radius: $border-radius;
2
+ border: 1px solid $border-color;
4
3
 
5
4
  .nav {
6
5
  text-align: center;
7
- border-bottom: 1px solid $body-background;
6
+ border-bottom: 1px solid $border-color;
8
7
 
9
8
  li {
10
9
  display: inline-block;
@@ -34,6 +34,11 @@ body.logged_in {
34
34
  &[type='radio'] {
35
35
  width: 15px;
36
36
  }
37
+
38
+ &[type='checkbox'] {
39
+ width: 15px;
40
+ margin: 0 5px -2px 0;
41
+ }
37
42
  }
38
43
 
39
44
  .select2-container {
@@ -54,7 +59,7 @@ body.logged_in {
54
59
 
55
60
  .fragment {
56
61
  margin-right: 10px;
57
-
62
+
58
63
  label {
59
64
  padding-right: 5px;
60
65
  }
@@ -1,4 +1,9 @@
1
1
  body.index {
2
+
3
+ .resource_selection_toggle_cell, .resource_selection_cell {
4
+ display: flex;
5
+ }
6
+
2
7
  .table_tools {
3
8
  margin-bottom: 20px;
4
9
  font-size: 14px;
@@ -4,10 +4,12 @@ $green: #00897B;
4
4
  $blue: #4bacfe;
5
5
  $black: #36393D;
6
6
 
7
- $error: #f96868;
8
- $warning: #f2a654;
9
- $success: #46be8a;
10
- $info: #57c7d4;
7
+ $error: #f96868 !default;
8
+ $warning: #f2a654 !default;
9
+ $success: #46be8a !default;
10
+ $info: #57c7d4 !default;
11
+
12
+ $border-color: #e4eaec;
11
13
 
12
14
  // body
13
15
  $body-background: #eee !default;
@@ -0,0 +1,10 @@
1
+ $sm-width: 576px !default;
2
+ $md-width: 768px !default;
3
+ $lg-width: 992px !default;
4
+ $x-lg-width: 1400px !default;
5
+
6
+ // <576px Extra small
7
+ // ≥576px Small
8
+ // ≥768px Medium
9
+ // ≥992px Large
10
+ // ≥1400px Extra large
@@ -7,4 +7,4 @@ module ArcticAdmin
7
7
  class Engine < ::Rails::Engine
8
8
  end
9
9
  end
10
- end
10
+ end
@@ -1,3 +1,3 @@
1
1
  module ArcticAdmin
2
- VERSION = "1.2.9"
2
+ VERSION = "1.3.0"
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: 1.2.9
4
+ version: 1.3.0
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: 2017-07-16 00:00:00.000000000 Z
11
+ date: 2017-09-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -90,40 +90,41 @@ files:
90
90
  - app/assets/fonts/Lato-Regular.ttf
91
91
  - app/assets/fonts/Lato-Regular.woff
92
92
  - app/assets/fonts/Lato-Regular.woff2
93
- - app/assets/javascripts/arctic_admin.js
94
- - app/assets/stylesheets/_base.scss
95
- - app/assets/stylesheets/_common.scss
96
- - app/assets/stylesheets/_fonts.scss
97
- - app/assets/stylesheets/_reset.scss
98
- - app/assets/stylesheets/arctic_admin.scss
99
- - app/assets/stylesheets/components/_comments.scss
100
- - app/assets/stylesheets/components/_components.scss
101
- - app/assets/stylesheets/components/_date_picker.scss
102
- - app/assets/stylesheets/components/_dialogs.scss
103
- - app/assets/stylesheets/components/_flash.scss
104
- - app/assets/stylesheets/components/_form.scss
105
- - app/assets/stylesheets/components/_inputs.scss
106
- - app/assets/stylesheets/components/_pagination.scss
107
- - app/assets/stylesheets/components/_panel_contents.scss
108
- - app/assets/stylesheets/components/_status_tag.scss
109
- - app/assets/stylesheets/components/_tables.scss
110
- - app/assets/stylesheets/components/_tabs.scss
111
- - app/assets/stylesheets/layouts/_filter.scss
112
- - app/assets/stylesheets/layouts/_footer.scss
113
- - app/assets/stylesheets/layouts/_header.scss
114
- - app/assets/stylesheets/layouts/_main_content.scss
115
- - app/assets/stylesheets/layouts/_sidebar.scss
116
- - app/assets/stylesheets/mixins/_buttons_mixins.scss
117
- - app/assets/stylesheets/mixins/_mixins.scss
118
- - app/assets/stylesheets/mixins/_prefix_mixins.scss
119
- - app/assets/stylesheets/pages/_form.scss
120
- - app/assets/stylesheets/pages/_index.scss
121
- - app/assets/stylesheets/pages/_login.scss
122
- - app/assets/stylesheets/pages/_show.scss
123
- - app/assets/stylesheets/variables/_colors.scss
124
- - app/assets/stylesheets/variables/_media_queries.scss
125
- - app/assets/stylesheets/variables/_size.scss
126
- - app/assets/stylesheets/variables/_variables.scss
93
+ - app/assets/javascripts/arctic_admin/base.js
94
+ - app/assets/stylesheets/arctic_admin/_base.scss
95
+ - app/assets/stylesheets/arctic_admin/_common.scss
96
+ - app/assets/stylesheets/arctic_admin/_fonts.scss
97
+ - app/assets/stylesheets/arctic_admin/_grid.scss
98
+ - app/assets/stylesheets/arctic_admin/_reset.scss
99
+ - app/assets/stylesheets/arctic_admin/components/_columns.scss
100
+ - app/assets/stylesheets/arctic_admin/components/_comments.scss
101
+ - app/assets/stylesheets/arctic_admin/components/_components.scss
102
+ - app/assets/stylesheets/arctic_admin/components/_date_picker.scss
103
+ - app/assets/stylesheets/arctic_admin/components/_dialogs.scss
104
+ - app/assets/stylesheets/arctic_admin/components/_flash.scss
105
+ - app/assets/stylesheets/arctic_admin/components/_form.scss
106
+ - app/assets/stylesheets/arctic_admin/components/_inputs.scss
107
+ - app/assets/stylesheets/arctic_admin/components/_pagination.scss
108
+ - app/assets/stylesheets/arctic_admin/components/_panel_contents.scss
109
+ - app/assets/stylesheets/arctic_admin/components/_status_tag.scss
110
+ - app/assets/stylesheets/arctic_admin/components/_tables.scss
111
+ - app/assets/stylesheets/arctic_admin/components/_tabs.scss
112
+ - app/assets/stylesheets/arctic_admin/layouts/_filter.scss
113
+ - app/assets/stylesheets/arctic_admin/layouts/_footer.scss
114
+ - app/assets/stylesheets/arctic_admin/layouts/_header.scss
115
+ - app/assets/stylesheets/arctic_admin/layouts/_main_content.scss
116
+ - app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss
117
+ - app/assets/stylesheets/arctic_admin/mixins/_buttons_mixins.scss
118
+ - app/assets/stylesheets/arctic_admin/mixins/_mixins.scss
119
+ - app/assets/stylesheets/arctic_admin/mixins/_prefix_mixins.scss
120
+ - app/assets/stylesheets/arctic_admin/pages/_form.scss
121
+ - app/assets/stylesheets/arctic_admin/pages/_index.scss
122
+ - app/assets/stylesheets/arctic_admin/pages/_login.scss
123
+ - app/assets/stylesheets/arctic_admin/pages/_show.scss
124
+ - app/assets/stylesheets/arctic_admin/variables/_colors.scss
125
+ - app/assets/stylesheets/arctic_admin/variables/_media_queries.scss
126
+ - app/assets/stylesheets/arctic_admin/variables/_size.scss
127
+ - app/assets/stylesheets/arctic_admin/variables/_variables.scss
127
128
  - app/views/layouts/active_admin_logged_out.html.erb
128
129
  - lib/arctic_admin.rb
129
130
  - lib/arctic_admin/active_admin/views/pages/bases.rb
@@ -1,2 +0,0 @@
1
- @import "font-awesome";
2
- @import "base";
@@ -1,11 +0,0 @@
1
- @import "components/inputs";
2
- @import "components/flash";
3
- @import "components/tables";
4
- @import "components/date_picker";
5
- @import "components/status_tag";
6
- @import "components/panel_contents";
7
- @import "components/form";
8
- @import "components/pagination";
9
- @import "components/dialogs";
10
- @import "components/comments";
11
- @import "components/tabs";
@@ -1,10 +0,0 @@
1
- $sm-width: 576px;
2
- $md-width: 768px;
3
- $lg-width: 992px;
4
- $x-lg-width: 1400px;
5
-
6
- // <576px Extra small
7
- // ≥576px Small
8
- // ≥768px Medium
9
- // ≥992px Large
10
- // ≥1400px Extra large