express_admin 1.7.16 → 1.7.17

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/express_admin/shared/_alerts.sass +47 -79
  3. data/app/components/express_admin/flash_messages.rb +5 -5
  4. data/lib/express_admin/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63f080163950a250f5fc3ba1ddb9743095288bbf
4
- data.tar.gz: 7da7e782099012d6c859c403b83388e113d6863d
3
+ metadata.gz: 0eaaae82f2148cb6943ecdfde604389811da1f06
4
+ data.tar.gz: ea5b54d2df3a06102dad13a9ccf07f6fb9f0ca77
5
5
  SHA512:
6
- metadata.gz: 8599cd323a0b3af53048f4e34926a5216a462c20df7cfa5fd6b83da8dee646d22790cb08bdffe4388a37e85b57fb45850d8434d4e867d5bbe8d3640bb28dc74b
7
- data.tar.gz: e5642f00f38abdf157177ae3f74feba37bfb982b3d3ca663e841932b979dda862c736b5d24c44f58246c0c4f3af1ae50f69faf05b4c47ad45239b44504ad6b26
6
+ metadata.gz: 1a77959c7d0aea0afb100afcd2ae74cfdc364fa581d71eb45b560a950071e5783b6c45aa79498b699534fecbe56c850589ba6b106c6082c7a5cfc0acf2c1b69c
7
+ data.tar.gz: d440136c7a263d993632f5902ad00398f27aa740fdf6901065c0037e45873566e4540abee6a201f4c69f855d53f2fb986addd7d38ab9085f095d5bd88152e437
data/app/assets/stylesheets/express_admin/shared/_alerts.sass CHANGED
@@ -1,84 +1,52 @@
1
1
  .flash-messages
2
- z-index: 999
3
2
  position: fixed
4
- left: 50%
5
3
  top: 5%
6
- -webkit-transform: translateX(-50%)
4
+ left: 50%
7
5
  transform: translateX(-50%)
8
- width: auto
9
-
10
- .success
11
- background-color: $success-color
12
- border-color: $success-color-alt
13
-
14
- .error
15
- background-color: $error-color
16
- border-color: $error-color-alt
17
-
18
- .notice
19
- background-color: $notice-color
20
- border-color: $notice-color-alt
21
- color: #4f4f4f
22
-
23
- .close
24
- color: #4f4f4f
25
-
26
- .alert
27
- background-color: $alert-color
28
- border-color: $alert-color-alt
29
-
30
- .alert-box
31
- color: #FFFFFF
32
- display: block
33
- font-size: .9rem
34
- line-height: 1.5em
35
- position: relative
36
- border:
37
- radius: 3px
38
- style: solid
39
- width: 1px
40
- margin: 0.5rem 0 1.11111rem 0
41
- padding: 1rem
42
- padding-right: 2rem
43
- transition: opacity 300ms ease-out
44
-
45
-
46
- .close
47
- font-weight: 700
48
- font-size: 1.5em
49
- text-decoration: none !important
50
- position: absolute
51
- top: 45%
52
- right: 0.5rem
53
- transform: translateY(-50%)
54
-
55
-
56
-
57
- a
58
- color: #fff
59
- opacity: 1 !important
60
- text-decoration: underline
61
-
62
- &:hover
63
- text-decoration: none
64
-
65
-
66
- &.warning
67
- h1
68
- font-size: 1.2rem
69
- color: white
70
-
71
- ul
72
- padding-left: 15px
73
- color: white
74
-
75
- a
76
- color: black
77
- text-decoration: underline
78
-
79
- .dot
80
- color: transparent
81
6
 
82
- @media only screen and (min-width: 320px) and (max-width: 480px)
83
- .flash-messages
84
- width: 300px
7
+ .ae-flash
8
+ display: flex
9
+ flex-flow: row nowrap
10
+ margin-bottom: 10px
11
+ padding: 5px
12
+ align-items: center
13
+ border: 1px solid rgba(0, 0, 0, 0.87)
14
+ border-radius: 2px
15
+
16
+ .ae-flash-message,
17
+ .ae-flash-close
18
+ margin: 10px
19
+ color: inherit
20
+
21
+ .ae-flash-message
22
+ flex-grow: 2
23
+
24
+ .ae-flash-close
25
+ flex-grow: 1
26
+ font-size: 1.5rem
27
+ font-weight: 700
28
+ margin-bottom: 13px
29
+ max-width: 50px
30
+ text-align: center
31
+ color: inherit
32
+ cursor: pointer
33
+ &:hover
34
+ color: inherit
35
+
36
+ .ae-flash-success,
37
+ .ae-flash-error,
38
+ .ae-flash-success,
39
+ .ae-flash-notice,
40
+ .ae-flash-alert
41
+ border: none
42
+ color: #fff
43
+
44
+ .ae-flash-success,
45
+ .ae-flash-notice
46
+ background-color: $success-color
47
+
48
+ .ae-flash-error
49
+ background-color: $error-color
50
+
51
+ .ae-flash-alert
52
+ background-color: $alert-color
data/app/components/express_admin/flash_messages.rb CHANGED
@@ -2,10 +2,10 @@ module ExpressAdmin
2
2
  class FlashMessages < ExpressTemplates::Components::Base
3
3
 
4
4
  contains -> {
5
- helpers.flash.each do |flash_message|
6
- div(class:"flash nav-alert alert-box #{flash_message[0]}", data: {alert: ''}) {
7
- span flash_message[1]
8
- a(class: 'close', href: "#") { "&times;".html_safe }
5
+ helpers.flash.each do |key, value|
6
+ div(class:"ae-flash ae-flash-#{key}") {
7
+ span(class: 'ae-flash-message') { value }
8
+ a(class: 'ae-flash-close') { "&times;".html_safe }
9
9
  }
10
10
  end
11
11
 
@@ -13,7 +13,7 @@ module ExpressAdmin
13
13
  script {
14
14
  %Q(
15
15
  $(function() {
16
- $('a.close').on('click', function(e){
16
+ $('.ae-flash-close').on('click', function(e){
17
17
  e.preventDefault();
18
18
  $(this).parents('.flash-messages').remove();
19
19
  });
data/lib/express_admin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ExpressAdmin
2
- VERSION = "1.7.16"
2
+ VERSION = "1.7.17"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: express_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.16
4
+ version: 1.7.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steven Talcott Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-03 00:00:00.000000000 Z
11
+ date: 2015-12-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: express_templates