spina 0.11.1 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of spina might be problematic. Click here for more details.

Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +41 -12
  3. data/Rakefile +1 -0
  4. data/app/assets/fonts/spina/ics_spina.eot +0 -0
  5. data/app/assets/fonts/spina/ics_spina.svg +5 -3
  6. data/app/assets/fonts/spina/ics_spina.ttf +0 -0
  7. data/app/assets/fonts/spina/ics_spina.woff +0 -0
  8. data/app/assets/icons/spina/lock.svg +3 -0
  9. data/app/assets/icons/spina/preview/ics_spina-preview.html +16 -1
  10. data/app/assets/javascripts/spina/admin/application.coffee.erb +3 -25
  11. data/app/assets/javascripts/spina/admin/navigation.coffee +7 -0
  12. data/app/assets/javascripts/spina/admin/pages.coffee.erb +1 -13
  13. data/app/assets/javascripts/spina/admin/trix.coffee.erb +2 -1
  14. data/app/assets/stylesheets/spina/_admin_editing.sass +0 -4
  15. data/app/assets/stylesheets/spina/_buttons.sass +8 -8
  16. data/app/assets/stylesheets/spina/_configuration.sass +5 -1
  17. data/app/assets/stylesheets/spina/_custom_animations.sass +26 -26
  18. data/app/assets/stylesheets/spina/_fonts.sass +5 -1
  19. data/app/assets/stylesheets/spina/_forms.sass +66 -33
  20. data/app/assets/stylesheets/spina/_gallery.sass +32 -15
  21. data/app/assets/stylesheets/spina/_ics_spina.scss +1 -0
  22. data/app/assets/stylesheets/spina/_login.sass +10 -4
  23. data/app/assets/stylesheets/spina/_mixins.sass +5 -0
  24. data/app/assets/stylesheets/spina/_modal.sass +4 -4
  25. data/app/assets/stylesheets/spina/_notifications.sass +5 -5
  26. data/app/assets/stylesheets/spina/_sortable_lists.sass +9 -9
  27. data/app/assets/stylesheets/spina/_tables.sass +9 -9
  28. data/app/assets/stylesheets/spina/_wizard.sass +5 -5
  29. data/app/assets/stylesheets/spina/admin/application.sass +4 -1
  30. data/app/assets/stylesheets/spina/application.sass +0 -1
  31. data/app/assets/stylesheets/spina.sass +23 -27
  32. data/app/controllers/spina/admin/accounts_controller.rb +2 -7
  33. data/app/controllers/spina/admin/admin_controller.rb +8 -3
  34. data/app/controllers/spina/admin/attachments_controller.rb +0 -2
  35. data/app/controllers/spina/admin/navigations_controller.rb +3 -2
  36. data/app/controllers/spina/admin/pages_controller.rb +7 -8
  37. data/app/controllers/spina/admin/password_resets_controller.rb +49 -0
  38. data/app/controllers/spina/admin/photos_controller.rb +15 -34
  39. data/app/controllers/spina/admin/sessions_controller.rb +1 -1
  40. data/app/controllers/spina/admin/users_controller.rb +8 -9
  41. data/app/controllers/spina/application_controller.rb +3 -9
  42. data/app/controllers/spina/pages_controller.rb +3 -3
  43. data/app/helpers/spina/admin/pages_helper.rb +16 -23
  44. data/app/mailers/spina/user_mailer.rb +21 -0
  45. data/app/models/concerns/spina/optionable.rb +12 -0
  46. data/app/models/concerns/spina/part.rb +5 -1
  47. data/app/models/concerns/spina/partable.rb +20 -5
  48. data/app/models/concerns/spina/photo_collectable.rb +24 -0
  49. data/app/models/spina/account.rb +16 -6
  50. data/app/models/spina/layout_part.rb +1 -0
  51. data/app/models/spina/option.rb +17 -0
  52. data/app/models/spina/page.rb +36 -63
  53. data/app/models/spina/page_part.rb +1 -0
  54. data/app/models/spina/photo_collection.rb +1 -13
  55. data/app/models/spina/structure_item.rb +4 -8
  56. data/app/models/spina/structure_part.rb +2 -13
  57. data/app/models/spina/user.rb +1 -0
  58. data/app/presenters/spina/pages/menu_presenter.rb +18 -49
  59. data/app/views/layouts/spina/mail.html.erb +1 -0
  60. data/app/views/spina/admin/page_partables/{colors → options}/_form.html.haml +2 -3
  61. data/app/views/spina/admin/page_partables/photo_collections/_form.html.haml +7 -7
  62. data/app/views/spina/admin/page_partables/structures/_form.html.haml +7 -8
  63. data/app/views/spina/admin/pages/_form.html.haml +2 -2
  64. data/app/views/spina/admin/pages/_form_advanced.html.haml +2 -2
  65. data/app/views/spina/admin/password_resets/edit.html.haml +13 -0
  66. data/app/views/spina/admin/password_resets/new.html.haml +13 -0
  67. data/app/views/spina/admin/photos/_photo.html.haml +2 -1
  68. data/app/views/spina/admin/photos/{_wysihtml5_select.html.haml → _trix_select.html.haml} +2 -4
  69. data/app/views/spina/admin/photos/create.js.erb +3 -5
  70. data/app/views/spina/admin/photos/{wysihtml5_infinite_scroll.js.erb → trix_infinite_scroll.js.erb} +0 -2
  71. data/app/views/spina/admin/photos/{wysihtml5_insert.js.coffee → trix_insert.js.erb} +2 -2
  72. data/app/views/spina/admin/photos/trix_select.js.erb +3 -0
  73. data/app/views/spina/admin/sessions/new.html.haml +3 -1
  74. data/app/views/spina/admin/shared/_primary_navigation.html.haml +1 -1
  75. data/app/views/spina/admin/shared/_rich_text_field.html.haml +2 -1
  76. data/app/views/spina/admin/structure_items/_fields.html.haml +3 -3
  77. data/app/views/spina/admin/structure_partables/lines/_form.html.haml +5 -2
  78. data/app/views/spina/admin/structure_partables/options/_form.html.haml +7 -0
  79. data/app/views/spina/admin/structure_partables/photo_collections/_form.html.haml +12 -9
  80. data/app/views/spina/admin/structure_partables/photos/_form.html.haml +10 -7
  81. data/app/views/spina/admin/structure_partables/texts/_form.html.haml +5 -2
  82. data/app/views/spina/admin/users/_form.html.haml +1 -1
  83. data/app/views/spina/shared/_admin_bar.html.haml +1 -1
  84. data/app/views/spina/shared/_navigation.html.haml +1 -1
  85. data/app/views/spina/user_mailer/forgot_password.html.erb +1 -0
  86. data/app/views/spina/user_mailer/forgot_password.txt.erb +1 -0
  87. data/config/locales/en.yml +10 -0
  88. data/config/locales/nl.yml +2 -0
  89. data/config/routes.rb +5 -9
  90. data/db/migrate/1_create_spina_tables.rb +8 -7
  91. data/db/migrate/2_create_spina_translation_tables.rb +7 -26
  92. data/db/migrate/3_create_spina_navigations.rb +1 -1
  93. data/db/migrate/4_add_password_reset_token_to_spina_users.rb +6 -0
  94. data/db/migrate/5_remove_translated_columns.rb +11 -0
  95. data/db/migrate/6_create_spina_options.rb +8 -0
  96. data/lib/generators/spina/install_generator.rb +0 -22
  97. data/lib/generators/spina/templates/app/views/default/shared/_navigation.html.haml +1 -1
  98. data/lib/generators/spina/templates/app/views/demo/shared/_navigation.html.haml +1 -1
  99. data/lib/generators/spina/templates/config/initializers/themes/default.rb +9 -0
  100. data/lib/generators/spina/templates/config/initializers/themes/demo.rb +1 -9
  101. data/lib/spina/engine.rb +4 -3
  102. data/lib/spina/theme.rb +2 -1
  103. data/lib/spina/version.rb +1 -1
  104. data/lib/spina.rb +0 -23
  105. metadata +32 -69
  106. data/app/assets/images/spina/marker.png +0 -0
  107. data/app/assets/images/spina/mask.png +0 -0
  108. data/app/assets/images/spina/wheel.png +0 -0
  109. data/app/assets/stylesheets/spina/_cards.sass +0 -54
  110. data/app/assets/stylesheets/spina/_farbtastic.sass +0 -37
  111. data/app/assets/stylesheets/spina/_wysihtml5.sass +0 -79
  112. data/app/assets/stylesheets/spina/wysihtml5_textarea.sass +0 -14
  113. data/app/controllers/spina/admin/page_parts_controller.rb +0 -11
  114. data/app/helpers/spina/application_helper.rb +0 -30
  115. data/app/models/spina/ability.rb +0 -20
  116. data/app/models/spina/color.rb +0 -7
  117. data/app/presenters/spina/pages/breadcrumb.rb +0 -102
  118. data/app/views/layouts/spina/email.html.erb +0 -124
  119. data/app/views/spina/admin/layout_partables/colors/_form.html.haml +0 -4
  120. data/app/views/spina/admin/page_parts/_wysihtml5_link.html.haml +0 -12
  121. data/app/views/spina/admin/page_parts/insert_wysihtml5_link.js +0 -5
  122. data/app/views/spina/admin/page_parts/wysihtml5_link.js +0 -2
  123. data/app/views/spina/admin/photos/create_and_select.js.erb +0 -7
  124. data/app/views/spina/admin/photos/create_multiple.js.erb +0 -4
  125. data/app/views/spina/admin/photos/wysihtml5_select.js.erb +0 -3
  126. data/vendor/assets/javascripts/spina/jquery.farbtastic.js +0 -345
  127. data/vendor/assets/javascripts/spina/morris.js +0 -1767
  128. data/vendor/assets/javascripts/spina/raphael.js +0 -8111
  129. data/vendor/assets/javascripts/spina/wysihtml5.js +0 -269
  130. data/vendor/assets/javascripts/spina/wysihtml5_parser_rules.js +0 -551
  131. data/vendor/assets/stylesheets/spina/_morris.scss +0 -2
@@ -2,9 +2,9 @@
2
2
  .horizontal-form
3
3
  .horizontal-form-group
4
4
  border-bottom: 1px solid #eee
5
+ display: flex
5
6
  margin: 0 -20px
6
7
  padding: 20px 20px
7
- @include display(flex)
8
8
 
9
9
  &:first-child
10
10
  margin-top: -20px
@@ -15,14 +15,14 @@
15
15
 
16
16
  .horizontal-form-label
17
17
  color: #333
18
+ display: flex
19
+ flex-direction: column
18
20
  font-size: 13px
19
21
  font-weight: 600
22
+ justify-content: center
20
23
  line-height: 18px
21
24
  padding-right: 20px
22
25
  width: 240px
23
- @include justify-content(center)
24
- @include display(flex)
25
- @include flex-direction(column)
26
26
 
27
27
  small
28
28
  color: #666
@@ -31,8 +31,8 @@
31
31
  font-weight: normal
32
32
 
33
33
  .horizontal-form-content
34
- @include flex(1)
35
- @include align-self(flex-start)
34
+ align-self: flex-start
35
+ flex: 1
36
36
 
37
37
  .image
38
38
  border-radius: 5px
@@ -48,12 +48,12 @@
48
48
 
49
49
  // Sidebar form
50
50
  .sidebar-form
51
+ display: flex
51
52
  margin: 0 auto
52
53
  max-width: 960px
53
- @include display(flex)
54
54
 
55
55
  .sidebar-form-content
56
- @include flex(1)
56
+ flex: 1
57
57
 
58
58
  .well
59
59
  margin-right: 20px
@@ -65,9 +65,9 @@
65
65
 
66
66
  .sidebar-form-group
67
67
  border-bottom: 1px solid #eee
68
+ display: flex
68
69
  margin: 0 -20px
69
70
  padding: 0 20px
70
- @include display(flex)
71
71
 
72
72
  &:last-child
73
73
  border-bottom: none
@@ -80,9 +80,9 @@
80
80
  width: 180px
81
81
 
82
82
  .sidebar-form-control
83
+ flex: 1
83
84
  margin-right: -20px
84
85
  position: relative
85
- @include flex(1)
86
86
 
87
87
  .switch
88
88
  margin: 10px
@@ -96,6 +96,18 @@
96
96
  &:disabled
97
97
  background: none
98
98
 
99
+ &[data-form-prepend]
100
+ padding-left: 14px
101
+
102
+ &[data-form-prepend]:before
103
+ content: attr(data-form-prepend)
104
+ font-size: 14px
105
+ font-weight: 600
106
+ left: 10px
107
+ line-height: 50px
108
+ position: absolute
109
+ top: 0
110
+
99
111
  &[data-form-append]:after
100
112
  content: attr(data-form-append)
101
113
  font-size: 14px
@@ -147,8 +159,8 @@
147
159
  opacity: 0
148
160
  position: absolute
149
161
  top: 75%
162
+ transition: opacity .2s ease
150
163
  width: 100%
151
- @include transition(opacity .2s ease)
152
164
 
153
165
  &:hover .sidebar-form-image-overlay
154
166
  opacity: 1
@@ -164,7 +176,7 @@
164
176
  padding: 6px
165
177
  position: relative
166
178
  z-index: 1
167
- @include transition(opacity .2s ease)
179
+ transition: opacity .2s ease
168
180
 
169
181
  a img:first-child
170
182
  display: block
@@ -257,6 +269,7 @@
257
269
 
258
270
  .form-checkbox
259
271
  label
272
+ cursor: pointer
260
273
  display: block
261
274
  font-size: 13px
262
275
  font-weight: 600
@@ -274,9 +287,9 @@
274
287
  display: inline-block
275
288
  height: 20px
276
289
  margin-right: 10px
290
+ transition: all .2s ease
277
291
  vertical-align: middle
278
292
  width: 20px
279
- @include transition(all .2s ease)
280
293
 
281
294
  input[type="checkbox"]:checked + label:before
282
295
  background: tint($primary-color, 10%)
@@ -291,21 +304,21 @@
291
304
  position: absolute
292
305
  text-align: center
293
306
  top: 0px
307
+ transform: scale(0)
308
+ transition: all .2s ease
294
309
  vertical-align: middle
295
310
  width: 20px
296
311
  @extend .icon, .icon-large-check:before
297
- @include transform(scale(0))
298
- @include transition(all .2s ease)
299
312
 
300
313
  input[type="checkbox"]:checked + label:after
301
- @include transform(scale(1))
314
+ transform: scale(1)
302
315
 
303
316
  // Input groups
304
317
  .input-group
305
- @include display(flex)
318
+ display: flex
306
319
 
307
320
  #{$all-text-inputs}, .text-input, .select-dropdown
308
- @include flex(1)
321
+ flex: 1
309
322
 
310
323
  &:not(:first-child)
311
324
  border-bottom-left-radius: 0
@@ -325,8 +338,8 @@
325
338
  color: #333
326
339
  font-size: 14px
327
340
  padding: 10px
341
+ transition: border .2s ease
328
342
  width: 100%
329
- @include transition(border .2s ease)
330
343
 
331
344
  &.input-mini
332
345
  width: 75px
@@ -429,8 +442,8 @@ input.datepicker
429
442
  margin-bottom: 0
430
443
  padding: 3px
431
444
  position: relative
445
+ transition: background .4s ease
432
446
  width: 46px
433
- @include transition(background .4s ease)
434
447
 
435
448
  .knob
436
449
  background: #fff
@@ -445,7 +458,7 @@ input.datepicker
445
458
  background: $success-color
446
459
 
447
460
  &.active .knob
448
- @include transform(translate3d(17px, 0, 0))
461
+ transform: translate3d(17px, 0, 0)
449
462
 
450
463
  // Checkboxes
451
464
 
@@ -491,9 +504,9 @@ input.datepicker
491
504
  line-height: 18px
492
505
  text-align: center
493
506
  top: -2px
507
+ transition: opacity .1s ease
494
508
  opacity: 0
495
509
  position: absolute
496
- @include transition(opacity .1s ease)
497
510
 
498
511
  input[type="checkbox"]:checked + label:after, input[type="radio"]:checked + label:after
499
512
  opacity: 1
@@ -518,11 +531,27 @@ input.datepicker
518
531
  overflow: hidden
519
532
  padding: 0
520
533
  position: relative
534
+ transition: border .2s ease
521
535
  @extend .icon, .icon-caret-down
522
- @include transition(border .2s ease)
536
+
537
+ label
538
+ background: #f5f5f5
539
+ border-right: 1px solid #ddd
540
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .16)
541
+ color: #999
542
+ display: inline-block
543
+ height: 38px
544
+ line-height: 38px
545
+ font-family: $font-family
546
+ font-size: 13px
547
+ font-weight: 600
548
+ margin-right: -4px
549
+ padding: 0 11px
550
+
551
+ &:after
552
+ content: ":"
523
553
 
524
554
  &:hover
525
- // background: #f5f5f5
526
555
  border: 1px solid $primary-color
527
556
 
528
557
  &:before
@@ -553,14 +582,14 @@ input.datepicker
553
582
  position: relative
554
583
  width: 115%
555
584
  z-index: 2
556
- @include appearance(none)
585
+ -webkit-appearance: none
557
586
 
558
587
  // Structure form
559
588
 
560
589
  .structure-form
590
+ display: flex
561
591
  margin-left: -20px
562
592
  position: relative
563
- @include display(flex)
564
593
 
565
594
  .structure-form-menu
566
595
  box-sizing: content-box
@@ -577,18 +606,18 @@ input.datepicker
577
606
  position: relative
578
607
 
579
608
  ul:before, ul:after
609
+ background: linear-gradient(rgba(255, 255, 255, 0), #ddd)
580
610
  content: " "
581
611
  height: 40px
582
612
  position: absolute
583
613
  right: -1px
584
614
  top: -40px
585
615
  width: 1px
586
- @include linear-gradient(rgba(255, 255, 255, 0), #ddd)
587
616
 
588
617
  ul:after
618
+ background: linear-gradient(bottom, rgba(255, 255, 255, 0), #ddd)
589
619
  bottom: -40px
590
620
  top: auto
591
- @include linear-gradient(bottom, rgba(255, 255, 255, 0), #ddd)
592
621
 
593
622
  ul li
594
623
  overflow: hidden
@@ -671,6 +700,10 @@ input.datepicker
671
700
  .structure-form-part
672
701
  padding: 5px 0
673
702
 
703
+ .select-dropdown
704
+ select
705
+ width: auto
706
+
674
707
  // Custom file input
675
708
 
676
709
  .new_document
@@ -691,15 +724,15 @@ input.datepicker
691
724
  padding: 6px 0
692
725
  @extend .icon, .icon-upload-outline:before
693
726
  font-size: 28px
727
+ transition: color .2s ease
694
728
  vertical-align: middle
695
- @include transition(color .2s ease)
696
729
 
697
730
  &:after
731
+ animation: "rotate" 2s linear infinite
698
732
  color: #bbb
699
733
  @extend .icon, .icon-refresh:before
700
734
  display: none
701
735
  font-size: 36px
702
- @include animation("rotate" 2s linear infinite)
703
736
 
704
737
  .customfile.loading
705
738
  &:before
@@ -743,7 +776,7 @@ input.datepicker
743
776
  position: relative
744
777
 
745
778
  .image
746
- @include transition(all .3s ease)
779
+ transition: all .3s ease
747
780
 
748
781
  &:hover .button
749
782
  background: tint(#efefef, 20%)
@@ -760,8 +793,8 @@ input.datepicker
760
793
  position: absolute
761
794
  text-align: center
762
795
  top: 0
796
+ transition: opacity .2s ease
763
797
  width: 100%
764
- @include transition(opacity .2s ease)
765
798
 
766
799
  .placeholder
767
800
  color: #666
@@ -796,8 +829,8 @@ ul.sortable-grid
796
829
  height: 120px
797
830
  margin: 8px
798
831
  overflow: hidden
832
+ transition: box-shadow .3s ease
799
833
  width: 120px
800
- @include transition(box-shadow .3s ease)
801
834
 
802
835
  &:hover
803
836
  box-shadow: 0 0 20px rgba(0, 0, 0, .2)
@@ -36,17 +36,15 @@
36
36
  position: relative
37
37
  width: 100%
38
38
  z-index: 1
39
- @include transition(all .2s ease)
39
+ transition: all .2s ease
40
40
 
41
41
  .overlay
42
42
  height: 100%
43
43
  position: absolute
44
44
  text-align: center
45
+ transition: all .2s ease
45
46
  width: 100%
46
47
  z-index: 2
47
- @include linear-gradient(top, rgba(0, 0, 0, 0) 60%, rgba(0, 0, 0, .75))
48
- background-size: 200%
49
- @include transition(all .2s ease)
50
48
 
51
49
  input
52
50
  display: none
@@ -60,25 +58,44 @@
60
58
  letter-spacing: 2px
61
59
  line-height: 26px
62
60
  text-transform: uppercase
61
+ transition: all .2s ease
62
+ transform: translateY(100%)
63
63
  padding: 0 12px
64
64
  position: absolute
65
65
  z-index: 3
66
- @include transition(all .2s ease)
67
- @include transform(translateY(100%))
68
-
66
+
69
67
  a.edit-photo-link
70
68
  left: 0px
71
69
 
72
70
  a.delete-photo-link
73
71
  right: 0px
74
72
 
73
+ .photo-name
74
+ top: 0
75
+ color: #fff
76
+ display: block
77
+ font-size: 12px
78
+ font-weight: bold
79
+ left: 0
80
+ line-height: 15px
81
+ text-align: left
82
+ transition: all 0.2s ease
83
+ transform: translateY(-100%)
84
+ padding: 10px
85
+ position: absolute
86
+ word-break: break-word
87
+ z-index: 3
88
+
75
89
  &:hover
76
90
  .overlay
77
- background-size: 100%
91
+ background: rgba(0, 0, 0, 0.5)
78
92
 
79
93
  a
80
94
  opacity: 1
81
- @include transform(translateY(0%))
95
+ transform: translateY(0%)
96
+
97
+ .photo-name
98
+ transform: translateY(0%)
82
99
 
83
100
  form
84
101
  height: 100%
@@ -99,7 +116,7 @@
99
116
 
100
117
  form
101
118
  margin: 0
102
-
119
+
103
120
  .item
104
121
  border-radius: 5px
105
122
  cursor: pointer
@@ -108,8 +125,8 @@
108
125
  line-height: 150px
109
126
  margin: 8px
110
127
  position: relative
128
+ transition: all .3s ease
111
129
  width: 150px
112
- @include transition(all .3s ease)
113
130
 
114
131
  input
115
132
  display: none
@@ -121,13 +138,13 @@
121
138
  box-shadow: 0 0 20px rgba(0, 0, 0, .4)
122
139
 
123
140
  .item.selected:before
141
+ background: linear-gradient(135deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1))
124
142
  content: " "
125
143
  height: 100%
126
144
  position: absolute
127
145
  top: 0px
128
146
  width: 100%
129
147
  z-index: 2
130
- @include linear-gradient(135deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1))
131
148
 
132
149
  .item.selected:after
133
150
  color: #95e995
@@ -188,12 +205,13 @@
188
205
  display: block
189
206
  font-weight: normal
190
207
  line-height: 130px
208
+ transition: color .2s ease
191
209
  vertical-align: middle
192
210
  @extend .icon, .icon-upload-outline
193
211
  font-size: 42px
194
- @include transition(color .2s ease)
195
212
 
196
213
  &:after
214
+ animation: "rotate" 2s linear infinite
197
215
  color: #bbb
198
216
  display: block
199
217
  font-weight: normal
@@ -202,7 +220,6 @@
202
220
  @extend .icon, .icon-refresh:before
203
221
  display: none
204
222
  font-size: 42px
205
- @include animation("rotate" 2s linear infinite)
206
223
 
207
224
  .customfile.loading
208
225
  &:before
@@ -245,5 +262,5 @@
245
262
  position: absolute
246
263
  text-align: center
247
264
  text-transform: lowercase
265
+ transition: color .2s ease
248
266
  width: 100%
249
- @include transition(color .2s ease)
@@ -37,6 +37,7 @@
37
37
  .icon-large-check:before { content: "\f120"; }
38
38
  .icon-link:before { content: "\f121"; }
39
39
  .icon-list-ul:before { content: "\f122"; }
40
+ .icon-lock:before { content: "\f138"; }
40
41
  .icon-mail:before { content: "\f123"; }
41
42
  .icon-mail-outline:before { content: "\f124"; }
42
43
  .icon-media-library:before { content: "\f125"; }
@@ -10,17 +10,23 @@
10
10
  max-width: 280px
11
11
 
12
12
  .failed-to-login
13
+ animation-delay: .1s
13
14
  color: $danger-color
14
15
  margin-bottom: 20px
15
16
  text-align: center
16
- @include animation-delay(.1s)
17
17
 
18
18
  .login-fields input
19
19
  &:first-child
20
- @include animation-delay(.2s)
20
+ animation-delay: .2s
21
21
 
22
22
  &:last-child
23
- @include animation-delay(.4s)
23
+ animation-delay: .4s
24
+
25
+ .login-extra-links
26
+ animation-delay: .8s
27
+
28
+ .button
29
+ margin-right: 0
24
30
 
25
31
  img
26
32
  display: block
@@ -37,8 +43,8 @@
37
43
  width: 100%
38
44
 
39
45
  button
46
+ animation-delay: .6s
40
47
  padding: 12px 14px
41
- @include animation-delay(.6s)
42
48
 
43
49
  &:before
44
50
  font-size: 26px
@@ -0,0 +1,5 @@
1
+ @function shade($color, $percent)
2
+ @return mix(#000, $color, $percent)
3
+
4
+ @function tint($color, $percent)
5
+ @return mix(#fff, $color, $percent)
@@ -1,4 +1,5 @@
1
1
  #overlay
2
+ background: radial-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, .6))
2
3
  display: none
3
4
  height: 100%
4
5
  left: 0
@@ -6,9 +7,9 @@
6
7
  top: 0
7
8
  width: 100%
8
9
  z-index: 999
9
- @include background-image(radial-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, .6)))
10
10
 
11
11
  .modal
12
+ animation-duration: .4s
12
13
  background: #fff
13
14
  border-radius: 3px
14
15
  display: none
@@ -17,7 +18,6 @@
17
18
  min-height: 100px
18
19
  overflow: hidden
19
20
  position: relative
20
- @include animation-duration(.4s)
21
21
 
22
22
  @media screen and (max-width: 480px)
23
23
  margin: 0 10px
@@ -81,7 +81,7 @@
81
81
  font-size: 12px
82
82
  padding: 6px 10px
83
83
  text-decoration: none
84
- @include transition(color .2s ease-out)
84
+ transition: color .2s ease-out
85
85
 
86
86
  i.icon
87
87
  font-size: 8px
@@ -152,8 +152,8 @@
152
152
  font-weight: 600
153
153
  padding: 12px 0
154
154
  text-align: center
155
+ transition: color .2s ease-out
155
156
  width: 49%
156
- @include transition(color .2s ease-out)
157
157
 
158
158
  footer a.primary, footer a:hover, footer button.primary, footer button:hover
159
159
  color: #000
@@ -8,22 +8,22 @@ aside#notifications
8
8
  z-index: 100
9
9
 
10
10
  .notification
11
+ animation-duration: .4s
12
+ align-items: center
11
13
  background: $primary-color
12
14
  border-radius: 3px
13
15
  color: #fff
16
+ display: flex
14
17
  font-size: 16px
15
18
  line-height: 24px
16
19
  margin-top: 16px
17
20
  padding: 16px 0
18
21
  position: relative
19
22
  width: 400px
20
- @include animation-duration(.4s)
21
- @include align-items(center)
22
- @include display(flex)
23
23
 
24
24
  .notification-message
25
+ flex: 1
25
26
  overflow: hidden
26
- @include flex(1)
27
27
 
28
28
  .icon
29
29
  text-align: center
@@ -49,7 +49,7 @@ aside#notifications
49
49
  display: block
50
50
  font-size: 13px
51
51
  font-weight: normal
52
- margin-top: -4px
52
+ line-height: 20px
53
53
  opacity: .6
54
54
 
55
55
  &.notification-error
@@ -12,11 +12,11 @@
12
12
  cursor: move
13
13
 
14
14
  .dd-item-inner .sortable-link
15
- @include transform(translateX(-26px))
16
- @include transition(all .2s ease)
15
+ transform: translateX(-26px)
16
+ transition: all .2s ease
17
17
 
18
18
  .dd-item-inner.dd-handle .sortable-link
19
- @include transform(translateX(0))
19
+ transform: translateX(0)
20
20
 
21
21
  .dd-item-inner:before
22
22
  @extend .icon, .icon-bars
@@ -24,14 +24,14 @@
24
24
  display: inline-block
25
25
  height: 18px
26
26
  opacity: 0
27
+ transform: translateX(-26px)
28
+ transition: all .2s ease
27
29
  vertical-align: middle
28
30
  width: 26px
29
- @include transform(translateX(-26px))
30
- @include transition(all .2s ease)
31
31
 
32
32
  .dd-item-inner.dd-handle:before
33
33
  opacity: 1
34
- @include transform(translateX(0))
34
+ transform: translateX(0)
35
35
 
36
36
  .dd-list
37
37
  list-style: none
@@ -122,12 +122,12 @@
122
122
 
123
123
  .pull-right a
124
124
  opacity: 0
125
- @include transform(translateX(50px))
126
- @include transition(all .4s ease)
125
+ transform: translateX(50px)
126
+ transition: all .4s ease
127
127
 
128
128
  &:hover .pull-right a
129
129
  opacity: 1
130
- @include transform(translateX(10px))
130
+ transform: translateX(10px)
131
131
 
132
132
  .dd-dragel
133
133
  pointer-events: none
@@ -142,18 +142,18 @@ table.table.table-form
142
142
  .progress-bar
143
143
  border: 1px solid #9f9f9f
144
144
  border-radius: 6px
145
+ display: flex
145
146
  height: 12px
146
147
  overflow: hidden
147
148
  position: relative
148
- @include display(flex)
149
- @include transition(all .2s ease)
149
+ transition: all .2s ease
150
150
 
151
151
  .progress-bar-divider
152
152
  border-left: 1px solid #9f9f9f
153
+ flex: 1
153
154
  height: 10px
154
155
  opacity: .5
155
156
  position: relative
156
- @include flex(1)
157
157
 
158
158
  &:first-child
159
159
  border: none
@@ -178,16 +178,16 @@ table.table.table-form
178
178
  text-align: center
179
179
  text-transform: uppercase
180
180
  top: 2px
181
+ transition: all .2s ease
181
182
  width: 100%
182
- @include transition(all .2s ease)
183
183
 
184
184
  tr:hover .progress
185
185
  .progress-bar
186
- @include transform(translateY(-6px))
186
+ transform: translateY(-6px)
187
187
 
188
188
  .progress-label
189
189
  opacity: 1
190
- @include transform(translateY(9px))
190
+ transform: translateY(9px)
191
191
 
192
192
  .progress-bar-primary
193
193
  & .progress-bar
@@ -232,7 +232,7 @@ tr:hover .progress
232
232
 
233
233
  .table-clickable
234
234
  tbody tr
235
- @include transition(background .1s ease)
235
+ transition: background .1s ease
236
236
 
237
237
  tbody tr:hover
238
238
  background: #f5f5fa
@@ -283,10 +283,10 @@ tr:hover .progress
283
283
 
284
284
  // Information tables
285
285
  .information-tables
286
- @include display(flex)
286
+ display: flex
287
287
 
288
288
  .information-table
289
- @include flex(1)
289
+ flex: 1
290
290
 
291
291
  th, td
292
292
  color: #333