fustrate-rails 0.3.3 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fustrate/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/fustrate/_module.coffee +14 -8
  4. data/vendor/assets/javascripts/fustrate/components/autocomplete.coffee +4 -4
  5. data/vendor/assets/javascripts/fustrate/components/file_picker.coffee +1 -0
  6. data/vendor/assets/javascripts/fustrate/components/flash.coffee +4 -4
  7. data/vendor/assets/javascripts/fustrate/components/modal.coffee +79 -19
  8. data/vendor/assets/javascripts/fustrate/components/pagination.coffee +5 -5
  9. data/vendor/assets/javascripts/fustrate/generic_form.coffee +4 -5
  10. data/vendor/assets/javascripts/fustrate/generic_page.coffee +6 -6
  11. data/vendor/assets/javascripts/fustrate/generic_table.coffee +2 -2
  12. data/vendor/assets/javascripts/fustrate/listenable.coffee +1 -1
  13. data/vendor/assets/stylesheets/_fustrate.sass +6 -6
  14. data/vendor/assets/stylesheets/awesomplete.sass +2 -1
  15. data/vendor/assets/stylesheets/fustrate/_colors.sass +3 -0
  16. data/vendor/assets/stylesheets/fustrate/_settings.sass +7 -7
  17. data/vendor/assets/stylesheets/fustrate/components/_components.sass +17 -17
  18. data/vendor/assets/stylesheets/fustrate/components/_functions.sass +9 -8
  19. data/vendor/assets/stylesheets/fustrate/components/alerts.sass +26 -18
  20. data/vendor/assets/stylesheets/fustrate/components/buttons.sass +17 -21
  21. data/vendor/assets/stylesheets/fustrate/components/disclosures.sass +5 -5
  22. data/vendor/assets/stylesheets/fustrate/components/dropdowns.sass +24 -19
  23. data/vendor/assets/stylesheets/fustrate/components/flash.sass +21 -16
  24. data/vendor/assets/stylesheets/fustrate/components/forms.sass +99 -92
  25. data/vendor/assets/stylesheets/fustrate/components/grid.sass +15 -23
  26. data/vendor/assets/stylesheets/fustrate/components/labels.sass +13 -12
  27. data/vendor/assets/stylesheets/fustrate/components/modals.sass +97 -49
  28. data/vendor/assets/stylesheets/fustrate/components/pagination.sass +41 -29
  29. data/vendor/assets/stylesheets/fustrate/components/panels.sass +30 -12
  30. data/vendor/assets/stylesheets/fustrate/components/popovers.sass +10 -6
  31. data/vendor/assets/stylesheets/fustrate/components/tables.sass +13 -9
  32. data/vendor/assets/stylesheets/fustrate/components/tabs.sass +6 -6
  33. data/vendor/assets/stylesheets/fustrate/components/tooltips.sass +12 -12
  34. data/vendor/assets/stylesheets/fustrate/components/typography.sass +140 -104
  35. metadata +5 -5
@@ -1,51 +1,36 @@
1
+ $modal-bg-color: #fff !default
2
+ $modal-title-color: #fff !default
3
+ $modal-border-color: #666 !default
4
+ $modal-overlay-color: rgba(0, 0, 0, .45) !default
5
+
1
6
  =modal-width($width: 80%)
2
7
  margin-left: -($width / 2)
3
8
  width: $width
4
9
 
5
10
  =fustrate-modals
6
11
  .modal-overlay
7
- position: fixed
12
+ background: $modal-overlay-color
13
+ display: none
8
14
  height: 120%
15
+ left: 0
16
+ position: fixed
17
+ top: 0
9
18
  width: 100%
10
- background: #000
11
- background: rgba(#000, .45)
12
19
  z-index: 9500
13
- display: none
14
- top: 0
15
- left: 0
16
20
 
17
21
  .modal
18
- visibility: hidden
22
+ background-color: $modal-bg-color
23
+ border: 0
24
+ box-shadow: 0 0 10px $modal-overlay-color
19
25
  display: none
20
- position: absolute
21
- z-index: 9501
22
- width: 100vw
23
- top: 0
24
26
  left: 0
25
- background-color: #fff
26
- padding: rem-calc(12)
27
- border: 1px solid #666
28
- box-shadow: 0 0 10px rgba(#000, .4)
29
27
  margin-bottom: 1rem
30
-
31
- @media #{$small-only}
32
- min-height: 100vh
33
-
34
- @media #{$medium-up}
35
- +modal-width
36
- top: rem-calc(100)
37
- left: 50%
38
-
39
- &.tiny
40
- +modal-width(30%)
41
- &.small
42
- +modal-width(40%)
43
- &.medium
44
- +modal-width(60%)
45
- &.large
46
- +modal-width(70%)
47
- &.xlarge
48
- +modal-width(95%)
28
+ padding: 0
29
+ position: absolute
30
+ top: 0
31
+ visibility: hidden
32
+ width: 100vw
33
+ z-index: 9501
49
34
 
50
35
  .column,
51
36
  .columns
@@ -53,30 +38,70 @@
53
38
 
54
39
  & > :first-child
55
40
  margin-top: 0
41
+
56
42
  & > :last-child,
57
43
  .modal-content form
58
44
  margin-bottom: 0
59
45
 
60
46
  .modal-title
61
- padding: 0 rem-calc(4) rem-calc(4)
62
- margin: 0 0 rem-calc(8)
63
- border-bottom: 1px solid #ddd
47
+ background: scale-color($blue, $lightness: -15%)
48
+ border: 1px solid scale-color($blue, $lightness: -40%)
49
+ color: $modal-title-color
64
50
  font-weight: bold
51
+ margin: 0
52
+ padding: rem-calc(6) rem-calc(12)
53
+ text-shadow: 0 1px 1px $black
65
54
 
66
55
  .modal-close
56
+ color: $modal-title-color
57
+ cursor: pointer
67
58
  font-size: rem-calc(24)
59
+ font-weight: bold
68
60
  line-height: 1
69
61
  position: absolute
70
- top: rem-calc(8)
71
62
  right: rem-calc(16)
72
- color: #aaa
73
- font-weight: bold
74
- cursor: pointer
63
+ top: rem-calc(5)
64
+
65
+ .modal-content
66
+ border: 1px solid $modal-border-color
67
+ border-width: 0 1px
68
+ margin: 0
69
+ padding: rem-calc(12)
70
+
71
+ .modal-buttons
72
+ background: scale-color($modal-bg-color, $lightness: -7%)
73
+ border: 1px solid $modal-border-color
74
+ border-top-color: scale-color($modal-border-color, $lightness: 70%)
75
+ padding: rem-calc(12)
76
+ text-align: right
77
+
78
+ &:empty
79
+ border-width: 0 0 1px
80
+ padding: 0
81
+
82
+ // The normal cancel button color is too light on a light grey background
83
+ .cancel
84
+ +button-style(#dadada)
85
+
86
+ &.success
87
+ .modal-title
88
+ background: scale-color($green, $lightness: -5%)
89
+ border: 1px solid scale-color($green, $lightness: -35%)
90
+
91
+ &.failure
92
+ .modal-title
93
+ background: $red
94
+ border: 1px solid scale-color($red, $lightness: -30%)
95
+
96
+ &.withdraw
97
+ .modal-title
98
+ background: #444
99
+ border: 1px solid scale-color(#444, $lightness: -30%)
75
100
 
76
101
  .picker
102
+ background: #fafafa
77
103
  height: 300px
78
104
  overflow-y: scroll
79
- background: #fafafa
80
105
  position: relative
81
106
 
82
107
  .section
@@ -85,35 +110,58 @@
85
110
 
86
111
  .title
87
112
  background: #e3e3e3
88
- padding: 2px rem-calc(8)
89
113
  border: 1px solid #ccc
90
114
  cursor: pointer
115
+ padding: 2px rem-calc(8)
91
116
 
92
117
  .count
93
118
  float: right
94
119
  font-size: rem-calc(12)
95
120
 
96
121
  .option
97
- cursor: pointer
98
122
  border: 1px solid #ccc
123
+ cursor: pointer
99
124
  margin-top: -1px
100
125
  padding: .5rem
101
126
 
102
127
  &:hover
103
128
  background: $info-color
104
- color: scale_color($info-color, $lightness: -65%)
105
- border-color: scale_color($info-color, $lightness: -20%)
106
- z-index: 9999
129
+ border-color: scale-color($info-color, $lightness: -20%)
130
+ color: scale-color($info-color, $lightness: -65%)
107
131
  position: relative
132
+ z-index: 9999
108
133
 
109
134
  .description
110
- font-size: .8rem
111
135
  color: #555
136
+ font-size: .8rem
112
137
  padding-left: .5rem
113
138
 
139
+ @media #{$small-only}
140
+ min-height: 100vh
141
+
142
+ @media #{$medium-up}
143
+ +modal-width
144
+ left: 50%
145
+ top: rem-calc(100)
146
+
147
+ &.tiny
148
+ +modal-width(30%)
149
+
150
+ &.small
151
+ +modal-width(40%)
152
+
153
+ &.medium
154
+ +modal-width(60%)
155
+
156
+ &.large
157
+ +modal-width(70%)
158
+
159
+ &.xlarge
160
+ +modal-width(95%)
114
161
 
115
162
  @media print
116
163
  .modal-overlay
117
164
  display: none !important
165
+
118
166
  .modal
119
- background: #fff !important
167
+ background: $white !important
@@ -1,57 +1,69 @@
1
- $pagination-active-color: $primary-color !default
1
+ $pagination-color: #222 !default
2
+ $pagination-link-color: #999 !default
3
+ $pagination-active-bg-color: $primary-color !default
4
+ $pagination-disabled-color: #999 !default
5
+ $pagination-active-color: #fff !default
6
+ $pagination-hover-bg-color: rgba(0, 0, 0, .08) !default
2
7
 
3
8
  =fustrate-pagination
4
- ul.pagination
9
+ .pagination
5
10
  display: block
6
- min-height: rem-calc(24)
7
11
  margin-left: rem-calc(-5)
12
+ min-height: rem-calc(24)
8
13
  text-align: center
9
14
 
10
15
  &:empty
11
16
  display: none
12
17
 
13
18
  li
14
- height: rem-calc(24)
15
- color: #222
19
+ color: $pagination-color
20
+ display: inline-block
16
21
  font-size: rem-calc(14)
22
+ height: rem-calc(24)
17
23
  margin-left: rem-calc(1)
18
- display: inline-block
19
24
 
20
- a, span
21
- display: block
22
- padding: rem-calc(1 10 1)
23
- color: #999
25
+ a,
26
+ span
24
27
  background: none
25
28
  border-radius: 4px
26
- font-weight: normal
29
+ color: $pagination-link-color
30
+ display: block
27
31
  font-size: 1em
32
+ font-weight: normal
28
33
  line-height: inherit
29
- +transition(background-color .3s ease-out)
34
+ padding: rem-calc(1 10 1)
35
+ transition: background-color .3s ease-out
36
+
37
+ &:focus
38
+ background: $pagination-hover-bg-color
30
39
 
31
- &:hover a,
32
- a:focus,
33
- &:hover span,
34
- span:focus
35
- background: scale-color(#fff, $lightness: -10%)
40
+ &:hover
41
+ a,
42
+ span
43
+ background: $pagination-hover-bg-color
36
44
 
37
45
  &.unavailable
38
- a, span
46
+ a,
47
+ span
48
+ color: $pagination-disabled-color
39
49
  cursor: default
40
- color: #999
41
50
 
42
- &:hover a,
43
- & a:focus,
44
- &:hover button,
45
- & button:focus
46
- background: transparent
51
+ &:focus
52
+ background: transparent
53
+
54
+ &:hover
55
+ a,
56
+ button
57
+ background: transparent
47
58
 
48
59
  &.current
49
- a, span
50
- background: $pagination-active-color
51
- color: #fff
52
- font-weight: bold
60
+ a,
61
+ span
62
+ background: $pagination-active-bg-color
63
+ color: $pagination-active-color
53
64
  cursor: default
65
+ font-weight: bold
54
66
 
55
67
  &:hover,
56
68
  &:focus
57
- background: $pagination-active-color
69
+ background: $pagination-active-bg-color
@@ -1,37 +1,53 @@
1
- $panel-bg: darken(#fff, 5%)
1
+ $panel-bg: #f2f2f2 !default
2
2
 
3
- $panel-margin-bottom: rem-calc(20)
4
- $panel-padding: rem-calc(16 20)
3
+ $panel-margin-bottom: rem-calc(20) !default
4
+ $panel-padding: rem-calc(16 20) !default
5
5
 
6
- $panel-font-color: #333
7
- $panel-font-color-alt: #fff
6
+ $panel-font-color: #333 !default
7
+ $panel-font-color-alt: #fff !default
8
8
 
9
9
  =panel-color($bg: $panel-bg)
10
- border: 1px solid darken($bg, 11%)
11
10
  background: $bg
11
+ border: 1px solid darken($bg, 11%)
12
12
 
13
13
  // We set the font color based on the darkness of the bg.
14
- h1, h2, h3, h4, h5, h6, p, li, dl
14
+ h1,
15
+ h2,
16
+ h3,
17
+ h4,
18
+ h5,
19
+ h6,
20
+ p,
21
+ li,
22
+ dl
15
23
  color: if(lightness($bg) >= 50%, $panel-font-color, $panel-font-color-alt)
16
24
 
17
25
  =fustrate-panels
18
26
  .panel
27
+ +panel-color
28
+ font-size: rem-calc(14)
19
29
  margin-bottom: $panel-margin-bottom
20
30
  padding: $panel-padding
21
- font-size: rem-calc(14)
22
- +panel-color
23
31
 
24
32
  // reset header line-heights for panels
25
- h1, h2, h3, h4, h5, h6
33
+ h1,
34
+ h2,
35
+ h3,
36
+ h4,
37
+ h5,
38
+ h6
26
39
  line-height: 1
27
40
  margin-bottom: rem-calc(20) / 2
28
41
 
29
- ul, ol, dl
42
+ ul,
43
+ ol,
44
+ dl
30
45
  font-size: inherit
31
46
 
32
47
  // Respect the padding, fool.
33
48
  & > :first-child
34
49
  margin-top: 0
50
+
35
51
  & > :last-child
36
52
  margin-bottom: 0
37
53
 
@@ -40,10 +56,12 @@ $panel-font-color-alt: #fff
40
56
 
41
57
  &.info
42
58
  +panel-color(lighten($info-color, 5%))
59
+
43
60
  &.success
44
61
  +panel-color(lighten($success-color, 20%))
62
+
45
63
  &.danger
46
- +panel-color(scale_color($danger-color, $lightness: 70%, $saturation: -20%))
64
+ +panel-color(scale-color($danger-color, $lightness: 70%, $saturation: -20%))
47
65
 
48
66
  &.small
49
67
  padding: $panel-padding / 2
@@ -1,15 +1,19 @@
1
+ $popover-bg-color: #f2f2f2 !default
2
+ $popover-border-color: #e0e0e0 !default
3
+
1
4
  =fustrate-popovers
2
5
  .popover
3
- background: scale_color(#fff, $lightness: -5%)
4
- border: 1px solid scale_color(#fff, $lightness: -12%)
6
+ background: $popover-bg-color
7
+ border: 1px solid $popover-border-color
8
+ box-shadow: 0 0 12px scale-color($grey, $lightness: 80%)
5
9
  display: inline-block
6
- z-index: 9001
7
- position: absolute
8
- box-shadow: 0 0 12px scale_color($grey, $lightness: 80%)
9
- padding: rem-calc(12 16)
10
10
  opacity: .9
11
+ padding: rem-calc(12 16)
12
+ position: absolute
13
+ z-index: 9001
11
14
 
12
15
  & > :first-child
13
16
  margin-top: 0
17
+
14
18
  & > :last-child
15
19
  margin-bottom: 0
@@ -1,5 +1,5 @@
1
- $table-border-color: #ccc
2
- $table-padding: .5em
1
+ $table-border-color: #ccc !default
2
+ $table-padding: .5em !default
3
3
 
4
4
  =fustrate-tables
5
5
  table
@@ -12,7 +12,7 @@ $table-padding: .5em
12
12
  border-left: 1px solid darken($table-border-color, 25%)
13
13
 
14
14
  &:first-child
15
- border-left: none
15
+ border-left: 0
16
16
 
17
17
  th
18
18
  border-bottom: 1px solid darken($table-border-color, 25%)
@@ -27,32 +27,36 @@ $table-padding: .5em
27
27
  .thumbnail
28
28
  max-width: initial
29
29
 
30
- tr, td, th
30
+ tr,
31
+ td,
32
+ th
31
33
  vertical-align: middle
32
34
 
33
35
  table table
34
36
  margin: 0
35
37
 
36
38
  td
37
- border-top: none
39
+ border-top: 0
38
40
  padding: $table-padding * .5
39
41
 
40
42
  .responsive-table
41
43
  overflow: visible
42
44
 
43
45
  tr.no-records
44
- text-align: center
45
46
  display: none
47
+ text-align: center
46
48
 
47
49
  tr.loading td
48
50
  text-align: center
49
- &:before
50
- +font-awesome("\f110", $spin: true)
51
+
52
+ &::before
53
+ +font-awesome('\f110', $spin: true)
51
54
 
52
55
  @media #{$small-only}
53
56
  .responsive-table
54
57
  table
55
58
  margin: 0 0 $table-padding
56
59
 
57
- th, td
60
+ th,
61
+ td
58
62
  padding: $table-padding * .5