active_material 1.4.2 → 1.5.2
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 +5 -5
- data/README.md +11 -7
- data/app/assets/javascripts/active_material.js +3 -0
- data/app/assets/javascripts/active_material/actions-toggle.js +36 -0
- data/app/assets/stylesheets/active_material/atoms/type.scss +5 -5
- data/app/assets/stylesheets/active_material/components/blank_slate.scss +1 -1
- data/app/assets/stylesheets/active_material/components/buttons.scss +1 -1
- data/app/assets/stylesheets/active_material/components/comments.scss +28 -0
- data/app/assets/stylesheets/active_material/components/forms.scss +21 -2
- data/app/assets/stylesheets/active_material/components/header.scss +1 -1
- data/app/assets/stylesheets/active_material/components/pagination.scss +20 -2
- data/app/assets/stylesheets/active_material/components/panels.scss +9 -0
- data/app/assets/stylesheets/active_material/components/scopes.scss +1 -1
- data/app/assets/stylesheets/active_material/components/select.scss +4 -0
- data/app/assets/stylesheets/active_material/components/tables.scss +27 -19
- data/app/assets/stylesheets/active_material/components/tabs.scss +2 -2
- data/app/assets/stylesheets/active_material/components/utility_nav.scss +36 -43
- data/app/assets/stylesheets/active_material/prototypes/button.scss +2 -2
- data/app/assets/stylesheets/active_material/prototypes/datepicker.scss +4 -3
- data/app/assets/stylesheets/active_material/prototypes/select.scss +4 -0
- data/app/assets/stylesheets/active_material/prototypes/subheader.scss +1 -1
- data/app/assets/stylesheets/active_material/prototypes/table.scss +4 -2
- data/app/assets/stylesheets/active_material/prototypes/tabs.scss +14 -3
- data/app/assets/stylesheets/active_material/prototypes/textfield.scss +7 -4
- data/app/assets/stylesheets/active_material/prototypes/toolbar.scss +3 -3
- data/app/assets/stylesheets/active_material/values/fonts.scss +13 -1
- data/lib/active_material/version.rb +1 -1
- metadata +27 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: ca3864bcf2764b20496dca32ba97717a95a635785d390cb592f1f157dfd85ba1
|
4
|
+
data.tar.gz: 12b62f11d7293fe15b20b4cc845c48db6a372049634564e502d9dcac3539e907
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e2cfd53f7e9745300daafeca924f57f71d81a663df55eb47831a98a6b07c0ed3c1879b25a378b53d06590871af9e8c411aec4b8b133607d38c3c1fade3a2dccf
|
7
|
+
data.tar.gz: d152695ac2fe97ea2ba97bf3a5bd8ad3258d784d8c3954eba81b64e22ca3df50340ca23b63f67840117010eb4258ee6323b42ce576c053fa39f8d32b1cf57730
|
data/README.md
CHANGED
@@ -14,7 +14,7 @@ An ActiveAdmin skin based on Google's Material Design.
|
|
14
14
|
Add this line to your application's Gemfile:
|
15
15
|
|
16
16
|
```ruby
|
17
|
-
gem "active_material",
|
17
|
+
gem "active_material", github: "vigetlabs/active_material"
|
18
18
|
```
|
19
19
|
|
20
20
|
And then execute:
|
@@ -39,6 +39,14 @@ with
|
|
39
39
|
|
40
40
|
`@import "active_material";`
|
41
41
|
|
42
|
+
Additionally, ActiveMaterial comes with an optional JavaScript bundle that adds a few additional features. It should be included right after the active_admin base script.
|
43
|
+
|
44
|
+
In app/assets/javascripts/active_admin.js, add:
|
45
|
+
|
46
|
+
```
|
47
|
+
//= require active_material
|
48
|
+
```
|
49
|
+
|
42
50
|
## Customization
|
43
51
|
|
44
52
|
Refer to the [Customization Guide](./docs/customization.md).
|
@@ -51,10 +59,6 @@ Refer to the [Customization Guide](./docs/customization.md).
|
|
51
59
|
4. Push to the branch (`git push origin my-new-feature`)
|
52
60
|
5. Create a new Pull Request
|
53
61
|
|
54
|
-
|
55
|
-
|
56
|
-
<a href="http://code.viget.com">
|
57
|
-
<img src="http://code.viget.com/github-banner.png" alt="Code At Viget">
|
58
|
-
</a>
|
62
|
+
### Issue and PR reviews
|
59
63
|
|
60
|
-
|
64
|
+
Another way you can help is by reviewing issues, trying to reproduce bugs, and providing feedback on PRs.
|
@@ -0,0 +1,36 @@
|
|
1
|
+
$(function() {
|
2
|
+
var actions = $("tbody .col-actions");
|
3
|
+
|
4
|
+
function waitForOutsideClick (el) {
|
5
|
+
|
6
|
+
$("body").on('click.toggle', function(e) {
|
7
|
+
if (el.contains(e.currentTarget) === false) {
|
8
|
+
actions.removeClass('active');
|
9
|
+
$("body").off("click.toggle");
|
10
|
+
}
|
11
|
+
});
|
12
|
+
}
|
13
|
+
|
14
|
+
// Make actions focusable
|
15
|
+
actions.attr('tabindex', 0).attr('role', 'button');
|
16
|
+
|
17
|
+
actions.on('click', function() {
|
18
|
+
$(this).addClass('active');
|
19
|
+
waitForOutsideClick(this);
|
20
|
+
});
|
21
|
+
|
22
|
+
actions.on('keydown', function(e) {
|
23
|
+
var space = 32;
|
24
|
+
var enter = 13;
|
25
|
+
var escape = 27;
|
26
|
+
|
27
|
+
if (e.keyCode == space || e.keyCode == enter) {
|
28
|
+
e.preventDefault();
|
29
|
+
$(this).addClass('active');
|
30
|
+
waitForOutsideClick(this);
|
31
|
+
} else if (e.keyCode == escape) {
|
32
|
+
e.preventDefault();
|
33
|
+
$(this).removeClass('active');
|
34
|
+
}
|
35
|
+
});
|
36
|
+
});
|
@@ -8,7 +8,7 @@
|
|
8
8
|
/// Applies rules for subheader text.
|
9
9
|
@mixin am-type-subheader {
|
10
10
|
@include am-font-size(16);
|
11
|
-
font-weight:
|
11
|
+
font-weight: $am-font-weight-regular;
|
12
12
|
line-height: am-sp(24);
|
13
13
|
letter-spacing: am-tracking(10);
|
14
14
|
}
|
@@ -16,7 +16,7 @@
|
|
16
16
|
/// Applies rules for heavier, more emphasized, body text.
|
17
17
|
@mixin am-type-body-2 {
|
18
18
|
@include am-font-size(14);
|
19
|
-
font-weight:
|
19
|
+
font-weight: $am-font-weight-semi-bold;
|
20
20
|
line-height: am-sp(24);
|
21
21
|
letter-spacing: am-tracking(10);
|
22
22
|
}
|
@@ -24,7 +24,7 @@
|
|
24
24
|
/// Applies rules for standard body text.
|
25
25
|
@mixin am-type-body-1 {
|
26
26
|
@include am-font-size(14);
|
27
|
-
font-weight:
|
27
|
+
font-weight: $am-font-weight-regular;
|
28
28
|
line-height: am-sp(20);
|
29
29
|
letter-spacing: am-tracking(10);
|
30
30
|
}
|
@@ -33,7 +33,7 @@
|
|
33
33
|
@mixin am-type-caption {
|
34
34
|
@include am-font-size(12);
|
35
35
|
font-style: normal;
|
36
|
-
font-weight:
|
36
|
+
font-weight: $am-font-weight-medium;
|
37
37
|
letter-spacing: am-tracking(20);
|
38
38
|
line-height: am-sp(12);
|
39
39
|
}
|
@@ -41,7 +41,7 @@
|
|
41
41
|
/// Applies rules for button text.
|
42
42
|
@mixin am-type-btn {
|
43
43
|
@include am-font-size(14);
|
44
|
-
font-weight:
|
44
|
+
font-weight: $am-font-weight-medium;
|
45
45
|
letter-spacing: am-tracking(10);
|
46
46
|
line-height: am-sp(12);
|
47
47
|
text-transform: uppercase;
|
@@ -0,0 +1,28 @@
|
|
1
|
+
/**
|
2
|
+
* Comments
|
3
|
+
* Active Admin comments
|
4
|
+
*/
|
5
|
+
|
6
|
+
div.active_admin_comment {
|
7
|
+
margin: 0 16px;
|
8
|
+
|
9
|
+
& + & {
|
10
|
+
border-top: 1px solid am-color(divider);
|
11
|
+
padding-top: am-unit(2);
|
12
|
+
}
|
13
|
+
}
|
14
|
+
|
15
|
+
.active_admin_comment_meta {
|
16
|
+
@include am-color(secondary-text);
|
17
|
+
@include am-type-caption;
|
18
|
+
}
|
19
|
+
|
20
|
+
.comments {
|
21
|
+
.pagination_information {
|
22
|
+
margin: 16px;
|
23
|
+
}
|
24
|
+
|
25
|
+
.empty {
|
26
|
+
margin: 16px;
|
27
|
+
}
|
28
|
+
}
|
@@ -25,31 +25,50 @@ fieldset.inputs {
|
|
25
25
|
|
26
26
|
&.string input,
|
27
27
|
&.stringish input,
|
28
|
-
&.
|
28
|
+
&.numeric input {
|
29
29
|
@include am-textfield-input;
|
30
|
+
|
31
|
+
&[disabled="disabled"] {
|
32
|
+
@include am-textfield-input-disabled;
|
33
|
+
}
|
30
34
|
}
|
31
35
|
|
32
36
|
&.email input {
|
33
37
|
@include am-textfield-input-email;
|
38
|
+
|
39
|
+
&[disabled="disabled"] {
|
40
|
+
@include am-textfield-input-disabled;
|
41
|
+
}
|
34
42
|
}
|
35
43
|
|
36
44
|
&.password input {
|
37
45
|
@include am-textfield-input-password;
|
46
|
+
|
47
|
+
&[disabled="disabled"] {
|
48
|
+
@include am-textfield-input-disabled;
|
49
|
+
}
|
38
50
|
}
|
39
51
|
|
40
52
|
&.datepicker input {
|
41
53
|
@include am-textfield-input-date;
|
54
|
+
|
55
|
+
&[disabled="disabled"] {
|
56
|
+
@include am-textfield-input-disabled;
|
57
|
+
}
|
42
58
|
}
|
43
59
|
|
44
60
|
&.text textarea {
|
45
61
|
@include am-textfield-input;
|
46
62
|
@include am-textfield-textarea;
|
63
|
+
|
64
|
+
&[disabled="disabled"] {
|
65
|
+
@include am-textfield-input-disabled;
|
66
|
+
}
|
47
67
|
}
|
48
68
|
|
49
69
|
select + input {
|
50
70
|
margin-top: am-unit(2);
|
51
71
|
}
|
52
|
-
|
53
72
|
}
|
54
73
|
|
55
74
|
.field_with_errors input {
|
@@ -8,20 +8,38 @@
|
|
8
8
|
clear: both;
|
9
9
|
|
10
10
|
.pagination_information,
|
11
|
-
.download_links
|
11
|
+
.download_links,
|
12
|
+
.pagination_per_page {
|
12
13
|
@include am-type-caption;
|
13
14
|
padding: am-unit(2);
|
14
15
|
}
|
15
16
|
|
16
|
-
.pagination_information
|
17
|
+
.pagination_information,
|
18
|
+
.pagination_per_page {
|
17
19
|
float: left;
|
18
20
|
}
|
19
21
|
|
22
|
+
.pagination_information {
|
23
|
+
clear: left;
|
24
|
+
}
|
25
|
+
|
20
26
|
.download_links {
|
21
27
|
line-height: am-unit(3);
|
22
28
|
float: right;
|
23
29
|
text-align: right;
|
24
30
|
}
|
31
|
+
|
32
|
+
.pagination_per_page {
|
33
|
+
border-bottom: 1px solid #efefef;
|
34
|
+
padding: am-unit(1) am-unit(2);
|
35
|
+
|
36
|
+
select {
|
37
|
+
@include am-select-input;
|
38
|
+
|
39
|
+
height: 34px;
|
40
|
+
line-height: 30px;
|
41
|
+
}
|
42
|
+
}
|
25
43
|
}
|
26
44
|
|
27
45
|
|
@@ -27,6 +27,15 @@ body.update #main_content > form {
|
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
|
+
.admin_dashboard #wrapper #main_content{
|
31
|
+
background-color: transparent;
|
32
|
+
border-radius: 0;
|
33
|
+
box-shadow: none;
|
34
|
+
.columns{
|
35
|
+
display: flex;
|
36
|
+
}
|
37
|
+
}
|
38
|
+
|
30
39
|
.panel {
|
31
40
|
& + & {
|
32
41
|
margin-top: 16px;
|
@@ -55,31 +55,39 @@
|
|
55
55
|
}
|
56
56
|
}
|
57
57
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
a {
|
69
|
-
@include am-menu-link;
|
70
|
-
}
|
71
|
-
}
|
58
|
+
// Styles for non-js actions
|
59
|
+
td.col-actions a {
|
60
|
+
padding: 0 4px
|
61
|
+
}
|
62
|
+
|
63
|
+
.am-js & {
|
64
|
+
|
65
|
+
td.col-actions {
|
66
|
+
@include am-table-cell-actions;
|
72
67
|
|
73
|
-
&:hover,
|
74
|
-
&:focus {
|
75
68
|
.table_actions {
|
76
|
-
@include am-menu-list
|
69
|
+
@include am-menu-list;
|
70
|
+
@include am-menu-list-right;
|
71
|
+
top: 50%;
|
72
|
+
margin-top: am-unit(-2);
|
73
|
+
margin-right: am-unit(2);
|
77
74
|
|
78
75
|
a {
|
79
|
-
@include am-menu-
|
76
|
+
@include am-menu-link;
|
80
77
|
}
|
81
78
|
}
|
82
|
-
}
|
83
79
|
|
80
|
+
&:hover,
|
81
|
+
&.active {
|
82
|
+
.table_actions {
|
83
|
+
@include am-menu-list-open;
|
84
|
+
|
85
|
+
a {
|
86
|
+
@include am-menu-item-open;
|
87
|
+
}
|
88
|
+
}
|
89
|
+
}
|
90
|
+
|
91
|
+
}
|
84
92
|
}
|
85
93
|
}
|
@@ -17,6 +17,7 @@
|
|
17
17
|
// Increase the hit region
|
18
18
|
&:before {
|
19
19
|
content: "";
|
20
|
+
cursor: pointer;
|
20
21
|
position: absolute;
|
21
22
|
width: 90px;
|
22
23
|
height: 50px;
|
@@ -28,57 +29,49 @@
|
|
28
29
|
color: #333;
|
29
30
|
}
|
30
31
|
|
31
|
-
|
32
|
-
|
32
|
+
> li {
|
33
|
+
&:first-child {
|
34
|
+
margin-top: 45px;
|
35
|
+
|
36
|
+
&:before {
|
37
|
+
content: "";
|
38
|
+
border: 7px solid transparent;
|
39
|
+
border-bottom-color: #fff;
|
40
|
+
top: -14px;
|
41
|
+
right: 12px;
|
42
|
+
position: absolute;
|
43
|
+
}
|
44
|
+
}
|
45
|
+
|
46
|
+
border-top: 1px solid #d9d9d9;
|
47
|
+
box-shadow: 0 1px 2px rgba(#000, 0.22);
|
48
|
+
width: 200px;
|
49
|
+
float: right;
|
50
|
+
border-bottom-left-radius: 2px;
|
51
|
+
border-bottom-right-radius: 2px;
|
52
|
+
background: #efefef;
|
53
|
+
text-align: right;
|
33
54
|
clip: rect(0, 0, 0, 0);
|
34
55
|
opacity: 0;
|
56
|
+
visibility: hidden;
|
35
57
|
transition: 0.28s all;
|
36
|
-
|
58
|
+
position: relative;
|
37
59
|
|
38
|
-
|
39
|
-
|
40
|
-
#logout {
|
41
|
-
clip: initial;
|
42
|
-
opacity: 1;
|
60
|
+
a {
|
61
|
+
@include am-btn;
|
43
62
|
}
|
44
63
|
}
|
45
|
-
}
|
46
64
|
|
47
|
-
#current_user {
|
48
|
-
|
49
|
-
|
50
|
-
border-top-right-radius: 2px;
|
51
|
-
border-top-left-radius: 2px;
|
52
|
-
padding: 16px;
|
53
|
-
height: 56px;
|
54
|
-
width: 200px;
|
55
|
-
position: absolute;
|
56
|
-
right: 0;
|
57
|
-
top: 48px;
|
58
|
-
|
59
|
-
&:before {
|
60
|
-
content: "";
|
61
|
-
border: 7px solid transparent;
|
62
|
-
border-bottom-color: #fff;
|
63
|
-
top: -14px;
|
64
|
-
right: 12px;
|
65
|
-
position: absolute;
|
65
|
+
#current_user {
|
66
|
+
background: #fff;
|
67
|
+
text-align: center;
|
66
68
|
}
|
67
|
-
}
|
68
|
-
|
69
|
-
#logout {
|
70
|
-
border-top: 1px solid #d9d9d9;
|
71
|
-
box-shadow: 0 1px 2px rgba(#000, 0.22);
|
72
|
-
position: absolute;
|
73
|
-
width: 200px;
|
74
|
-
right: 0;
|
75
|
-
top: 104px;
|
76
|
-
border-bottom-left-radius: 2px;
|
77
|
-
border-bottom-right-radius: 2px;
|
78
|
-
background: #efefef;
|
79
|
-
text-align: right;
|
80
69
|
|
81
|
-
|
82
|
-
|
70
|
+
&:hover {
|
71
|
+
> li {
|
72
|
+
clip: initial;
|
73
|
+
opacity: 1;
|
74
|
+
visibility: visible;
|
75
|
+
}
|
83
76
|
}
|
84
77
|
}
|
@@ -20,7 +20,7 @@ $am-btn-active-color: rgba(#999, 0.4) !default;
|
|
20
20
|
text-transform: uppercase;
|
21
21
|
transition: 0.25s all;
|
22
22
|
user-select: none;
|
23
|
-
vertical-align:
|
23
|
+
vertical-align: middle;
|
24
24
|
|
25
25
|
&:focus {
|
26
26
|
outline: none;
|
@@ -37,7 +37,7 @@ $am-btn-active-color: rgba(#999, 0.4) !default;
|
|
37
37
|
@include am-fill(primary);
|
38
38
|
@include am-color(white);
|
39
39
|
box-shadow: 0 0 2px rgba(#000, 0.12);
|
40
|
-
font-weight:
|
40
|
+
font-weight: $am-font-weight-semi-bold;
|
41
41
|
min-width: $am-btn-min-width;
|
42
42
|
|
43
43
|
&:focus,
|
@@ -17,6 +17,7 @@ $am-datepicker-cell-size: am-unit(4) !default;
|
|
17
17
|
background: white;
|
18
18
|
border-radius: $am-datepicker-border-radius;
|
19
19
|
box-shadow: $am-datepicker-shadow;
|
20
|
+
display: none;
|
20
21
|
padding: 0 am-unit(1.5) am-unit(1);
|
21
22
|
width: $am-datepicker-width;
|
22
23
|
}
|
@@ -30,7 +31,7 @@ $am-datepicker-cell-size: am-unit(4) !default;
|
|
30
31
|
|
31
32
|
@mixin am-datepicker-title {
|
32
33
|
@include am-font-size(14px);
|
33
|
-
font-weight:
|
34
|
+
font-weight: $am-font-weight-semi-bold;
|
34
35
|
}
|
35
36
|
|
36
37
|
@mixin am-datepicker-icon {
|
@@ -71,13 +72,13 @@ $am-datepicker-cell-size: am-unit(4) !default;
|
|
71
72
|
|
72
73
|
@mixin am-datepicker-calendar-heading {
|
73
74
|
@include am-color(secondary-text);
|
74
|
-
font-weight:
|
75
|
+
font-weight: $am-font-weight-medium;
|
75
76
|
padding: 0 0 am-type-unit(1);
|
76
77
|
}
|
77
78
|
|
78
79
|
@mixin am-datepicker-calendar-day {
|
79
80
|
height: $am-datepicker-cell-size;
|
80
|
-
font-weight:
|
81
|
+
font-weight: $am-font-weight-medium;
|
81
82
|
line-height: $am-datepicker-cell-size;
|
82
83
|
padding: 0;
|
83
84
|
width: $am-datepicker-cell-size;
|
@@ -21,7 +21,7 @@ $am-table-border-color: am-color(divider);
|
|
21
21
|
@include am-color(secondary-text);
|
22
22
|
@include am-font-size(13px);
|
23
23
|
border-bottom: 1px solid $am-table-border-color;
|
24
|
-
font-weight:
|
24
|
+
font-weight: $am-font-weight-semi-bold;
|
25
25
|
height: am-unit(6);
|
26
26
|
line-height: am-unit(2);
|
27
27
|
padding: am-unit(1) am-unit(2);
|
@@ -87,12 +87,14 @@ $am-table-border-color: am-color(divider);
|
|
87
87
|
@include am-color(text);
|
88
88
|
@include am-font-size(13px);
|
89
89
|
border-bottom: 1px solid $am-table-border-color;
|
90
|
-
font-weight:
|
90
|
+
font-weight: $am-font-weight-regular;
|
91
91
|
padding: am-unit(1) am-unit(2);
|
92
92
|
|
93
93
|
img {
|
94
94
|
display: block;
|
95
|
+
height: auto;
|
95
96
|
max-width: 320px;
|
97
|
+
width: 100%;
|
96
98
|
}
|
97
99
|
}
|
98
100
|
|
@@ -8,7 +8,10 @@ $am-tabs-background: am-color(primary) !default;
|
|
8
8
|
$am-tabs-border-width: 3px !default;
|
9
9
|
$am-tabs-color: rgba(#fff, 0.6) !default;
|
10
10
|
$am-tabs-color-focus: #fff !default;
|
11
|
-
$am-tabs-
|
11
|
+
$am-tabs-btn-background: inherit !default;
|
12
|
+
$am-tabs-btn-background-focus: inherit !default;
|
13
|
+
$am-tabs-btn-border-color: inherit !default;
|
14
|
+
$am-tabs-font: $am-font-weight-regular 14px/16px $am-font-sans !default;
|
12
15
|
|
13
16
|
@keyframes am-tabs-error-throb {
|
14
17
|
from {
|
@@ -37,10 +40,12 @@ $am-tabs-font: 400 14px/16px $am-font-sans !default;
|
|
37
40
|
|
38
41
|
@mixin am-tabs-list-item {
|
39
42
|
display: inline-block;
|
43
|
+
border-color: $am-tabs-btn-border-color;
|
40
44
|
}
|
41
45
|
|
42
46
|
@mixin am-tabs-btn {
|
43
|
-
|
47
|
+
background: $am-tabs-btn-background;
|
48
|
+
color: $am-tabs-color;
|
44
49
|
cursor: pointer;
|
45
50
|
display: block;
|
46
51
|
font: $am-tabs-font;
|
@@ -67,7 +72,7 @@ $am-tabs-font: 400 14px/16px $am-font-sans !default;
|
|
67
72
|
|
68
73
|
&:focus,
|
69
74
|
&:hover {
|
70
|
-
background:
|
75
|
+
background: $am-tabs-btn-background-focus;
|
71
76
|
outline: none;
|
72
77
|
text-decoration: none;
|
73
78
|
|
@@ -83,6 +88,7 @@ $am-tabs-font: 400 14px/16px $am-font-sans !default;
|
|
83
88
|
}
|
84
89
|
|
85
90
|
@mixin am-tabs-btn-active {
|
91
|
+
background: $am-tabs-btn-background-focus;
|
86
92
|
color: $am-tabs-color-focus;
|
87
93
|
|
88
94
|
&:after {
|
@@ -90,6 +96,11 @@ $am-tabs-font: 400 14px/16px $am-font-sans !default;
|
|
90
96
|
box-shadow: 0 -1px 1px rgba(#000, 0.1), inset 0 1px 1px rgba(#fff, 0.50);
|
91
97
|
transform: none;
|
92
98
|
}
|
99
|
+
|
100
|
+
&:focus,
|
101
|
+
&:hover {
|
102
|
+
background: $am-tabs-btn-background-focus;
|
103
|
+
}
|
93
104
|
}
|
94
105
|
|
95
106
|
@mixin am-tabs-btn-error {
|
@@ -7,7 +7,7 @@
|
|
7
7
|
/// Textfield input typography.
|
8
8
|
$am-textfield-input-type: normal am-sp(14)/24px $am-font-sans !default;
|
9
9
|
/// Textfield label typography.
|
10
|
-
$am-textfield-label-type:
|
10
|
+
$am-textfield-label-type: $am-font-weight-regular am-sp(12)/am-unit(2) $am-font-sans !default;
|
11
11
|
/// Textfield margin.
|
12
12
|
$am-textfield-margin: am-unit(1) 0 !default;
|
13
13
|
/// Textfield padding.
|
@@ -38,8 +38,7 @@ $am-textfield-date-icon: asset-url("active_material/icons/event.svg") !default;
|
|
38
38
|
border: 1px solid #d3d3d3;
|
39
39
|
box-shadow: inset 1px 1px 1px rgba(#222, 0.08);
|
40
40
|
display: block;
|
41
|
-
font
|
42
|
-
font-weight: normal;
|
41
|
+
font: $am-textfield-input-type;
|
43
42
|
line-height: 24px;
|
44
43
|
margin: 0;
|
45
44
|
padding: am-unit(1);
|
@@ -84,7 +83,7 @@ $am-textfield-date-icon: asset-url("active_material/icons/event.svg") !default;
|
|
84
83
|
@include am-color(secondary-text);
|
85
84
|
display: block;
|
86
85
|
line-height: 16px;
|
87
|
-
font
|
86
|
+
font: $am-textfield-label-type;
|
88
87
|
margin-bottom: 8px;
|
89
88
|
position: relative;
|
90
89
|
transition: 0.28s all;
|
@@ -121,6 +120,10 @@ $am-textfield-date-icon: asset-url("active_material/icons/event.svg") !default;
|
|
121
120
|
margin-left: 4px;
|
122
121
|
}
|
123
122
|
|
123
|
+
@mixin am-textfield-input-disabled {
|
124
|
+
background-color: #eeeeee;
|
125
|
+
}
|
126
|
+
|
124
127
|
@mixin am-textfield-inline {
|
125
128
|
align-items: center;
|
126
129
|
display: flex;
|
@@ -24,7 +24,7 @@ $am-toolbar-keyline-medium : $am-toolbar-keyline-small + 8px !default;
|
|
24
24
|
|
25
25
|
@mixin am-toolbar-title {
|
26
26
|
font-size: $am-toolbar-title-font-size;
|
27
|
-
font-weight:
|
27
|
+
font-weight: $am-font-weight-medium;
|
28
28
|
line-height: am-unit(2);
|
29
29
|
padding: am-unit(2);
|
30
30
|
width: 100%;
|
@@ -45,7 +45,7 @@ $am-toolbar-keyline-medium : $am-toolbar-keyline-small + 8px !default;
|
|
45
45
|
@include am-link-no-decoration;
|
46
46
|
@include am-color(text);
|
47
47
|
display: inline-block;
|
48
|
-
font-weight:
|
48
|
+
font-weight: $am-font-weight-medium;
|
49
49
|
line-height: am-unit(3);
|
50
50
|
margin: 0;
|
51
51
|
}
|
@@ -66,5 +66,5 @@ $am-toolbar-keyline-medium : $am-toolbar-keyline-small + 8px !default;
|
|
66
66
|
|
67
67
|
@mixin am-toolbar-item-primary-active {
|
68
68
|
@include am-color(accent);
|
69
|
-
font-weight:
|
69
|
+
font-weight: $am-font-weight-semi-bold;
|
70
70
|
}
|
@@ -5,6 +5,18 @@
|
|
5
5
|
/// The default sans-serif font
|
6
6
|
$am-font-sans: 'RobotoDraft', sans-serif !default;
|
7
7
|
|
8
|
+
/// The weight of bold type
|
9
|
+
$am-font-weight-bold: 700;
|
10
|
+
|
11
|
+
/// The weight of semi-bold type
|
12
|
+
$am-font-weight-semi-bold: 600;
|
13
|
+
|
14
|
+
/// The weight of medium type
|
15
|
+
$am-font-weight-medium: 500;
|
16
|
+
|
17
|
+
/// The weight of regular type
|
18
|
+
$am-font-weight-regular: 400;
|
19
|
+
|
8
20
|
$am-fonts: (
|
9
21
|
sans: $am-font-sans
|
10
|
-
)
|
22
|
+
);
|
metadata
CHANGED
@@ -1,14 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_material
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
-
-
|
8
|
-
|
7
|
+
- Nate Hunzaker
|
8
|
+
- David Eisinger
|
9
|
+
autorequire:
|
9
10
|
bindir: bin
|
10
11
|
cert_chain: []
|
11
|
-
date:
|
12
|
+
date: 2021-05-18 00:00:00.000000000 Z
|
12
13
|
dependencies:
|
13
14
|
- !ruby/object:Gem::Dependency
|
14
15
|
name: bundler
|
@@ -38,9 +39,24 @@ dependencies:
|
|
38
39
|
- - "~>"
|
39
40
|
- !ruby/object:Gem::Version
|
40
41
|
version: '10.0'
|
42
|
+
- !ruby/object:Gem::Dependency
|
43
|
+
name: sass-rails
|
44
|
+
requirement: !ruby/object:Gem::Requirement
|
45
|
+
requirements:
|
46
|
+
- - ">="
|
47
|
+
- !ruby/object:Gem::Version
|
48
|
+
version: '0'
|
49
|
+
type: :development
|
50
|
+
prerelease: false
|
51
|
+
version_requirements: !ruby/object:Gem::Requirement
|
52
|
+
requirements:
|
53
|
+
- - ">="
|
54
|
+
- !ruby/object:Gem::Version
|
55
|
+
version: '0'
|
41
56
|
description: ActiveAdmin skin based on Google's Material Design.
|
42
57
|
email:
|
43
|
-
-
|
58
|
+
- nate.hunzaker@viget.com
|
59
|
+
- david.eisinger@viget.com
|
44
60
|
executables: []
|
45
61
|
extensions: []
|
46
62
|
extra_rdoc_files: []
|
@@ -59,6 +75,7 @@ files:
|
|
59
75
|
- app/assets/images/active_material/icons/search.svg
|
60
76
|
- app/assets/images/active_material/icons/secret.svg
|
61
77
|
- app/assets/javascripts/active_material.js
|
78
|
+
- app/assets/javascripts/active_material/actions-toggle.js
|
62
79
|
- app/assets/javascripts/active_material/fonts.js
|
63
80
|
- app/assets/stylesheets/active_material.scss
|
64
81
|
- app/assets/stylesheets/active_material/atoms/clearfix.scss
|
@@ -76,6 +93,7 @@ files:
|
|
76
93
|
- app/assets/stylesheets/active_material/components/buttons.scss
|
77
94
|
- app/assets/stylesheets/active_material/components/checkbox.scss
|
78
95
|
- app/assets/stylesheets/active_material/components/clearfix.scss
|
96
|
+
- app/assets/stylesheets/active_material/components/comments.scss
|
79
97
|
- app/assets/stylesheets/active_material/components/date-select.scss
|
80
98
|
- app/assets/stylesheets/active_material/components/datepicker.scss
|
81
99
|
- app/assets/stylesheets/active_material/components/dialog.scss
|
@@ -128,11 +146,11 @@ files:
|
|
128
146
|
- app/assets/stylesheets/active_material/values/units.scss
|
129
147
|
- lib/active_material.rb
|
130
148
|
- lib/active_material/version.rb
|
131
|
-
homepage:
|
149
|
+
homepage: ''
|
132
150
|
licenses:
|
133
151
|
- MIT
|
134
152
|
metadata: {}
|
135
|
-
post_install_message:
|
153
|
+
post_install_message:
|
136
154
|
rdoc_options: []
|
137
155
|
require_paths:
|
138
156
|
- lib
|
@@ -147,10 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
147
165
|
- !ruby/object:Gem::Version
|
148
166
|
version: '0'
|
149
167
|
requirements: []
|
150
|
-
|
151
|
-
|
152
|
-
signing_key:
|
168
|
+
rubygems_version: 3.1.2
|
169
|
+
signing_key:
|
153
170
|
specification_version: 4
|
154
171
|
summary: ActiveAdmin skin based on Google's Material Design.
|
155
172
|
test_files: []
|
156
|
-
has_rdoc:
|