para 0.4.0 → 0.5.0

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 (133) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/para/admin/loading-spinner.gif +0 -0
  3. data/app/assets/javascripts/para/admin/theme_actions.coffee +0 -1
  4. data/app/assets/javascripts/para/lib/turbolinks-forms.coffee +23 -0
  5. data/app/assets/javascripts/para/lib/turbolinks-loading.coffee +25 -0
  6. data/app/assets/stylesheets/para/{overrides → admin/src}/datetimepicker.sass +1 -3
  7. data/app/assets/stylesheets/para/{overrides → admin/src}/fuelux.sass +5 -8
  8. data/app/assets/stylesheets/para/{overrides → admin/src}/jasny.bootstrap.sass +1 -2
  9. data/app/assets/stylesheets/para/admin/src/page-loading.sass +24 -0
  10. data/app/assets/stylesheets/para/{overrides → admin/src}/redactor.sass +5 -7
  11. data/app/assets/stylesheets/para/{overrides → admin/src}/selectize.sass +4 -6
  12. data/app/assets/stylesheets/para/{overrides → admin/src}/slider.sass +0 -1
  13. data/app/assets/stylesheets/para/admin/theme/_base.sass +5 -3
  14. data/app/assets/stylesheets/para/admin/theme/_breadcrumb.sass +54 -16
  15. data/app/assets/stylesheets/para/admin/theme/_buttons.sass +0 -1
  16. data/app/assets/stylesheets/para/admin/theme/_checkable.sass +5 -6
  17. data/app/assets/stylesheets/para/admin/theme/_commonds.sass +10 -16
  18. data/app/assets/stylesheets/para/admin/theme/_dropdown.sass +1 -4
  19. data/app/assets/stylesheets/para/admin/theme/_form.sass +11 -3
  20. data/app/assets/stylesheets/para/admin/theme/_list.sass +5 -6
  21. data/app/assets/stylesheets/para/admin/theme/_navigation.sass +105 -109
  22. data/app/assets/stylesheets/para/admin/theme/_navtabs.sass +35 -15
  23. data/app/assets/stylesheets/para/admin/theme/_orderable.sass +2 -5
  24. data/app/assets/stylesheets/para/admin/theme/_panel.sass +20 -50
  25. data/app/assets/stylesheets/para/admin/theme/_sorting.sass +5 -7
  26. data/app/assets/stylesheets/para/admin/theme/_tree.sass +2 -4
  27. data/app/assets/stylesheets/para/admin.sass +1 -0
  28. data/app/assets/stylesheets/para/lib/_variables.scss +12 -12
  29. data/app/assets/stylesheets/para/overrides/responsive.sass +1 -2
  30. data/app/assets/stylesheets/para/overrides/theme.sass +10 -17
  31. data/app/controllers/para/admin/base_controller.rb +16 -5
  32. data/app/controllers/para/admin/crud_resources_controller.rb +43 -2
  33. data/app/controllers/para/admin/main_controller.rb +1 -1
  34. data/app/controllers/para/admin/resources_controller.rb +1 -1
  35. data/app/controllers/para/admin/settings_component_controller.rb +1 -3
  36. data/app/controllers/para/application_controller.rb +3 -3
  37. data/app/decorators/para/component/crud_decorator.rb +6 -2
  38. data/app/decorators/para/component/singleton_resource_decorator.rb +5 -1
  39. data/app/helpers/para/admin/base_helper.rb +9 -4
  40. data/app/helpers/para/admin/components_helper.rb +7 -0
  41. data/app/helpers/para/form_helper.rb +10 -2
  42. data/app/helpers/para/tag_helper.rb +12 -0
  43. data/app/models/para/ability.rb +12 -0
  44. data/app/models/para/component/base.rb +15 -7
  45. data/app/models/para/component/crud.rb +3 -1
  46. data/app/models/para/component/singleton_resource.rb +1 -1
  47. data/app/views/para/admin/crud_resources/index.html.haml +4 -0
  48. data/app/views/para/admin/dashboard.html.haml +10 -8
  49. data/app/views/para/admin/resources/_actions.html.haml +7 -0
  50. data/app/views/para/admin/resources/_add_button.html.haml +1 -0
  51. data/app/views/para/admin/resources/_filters.html.haml +1 -1
  52. data/app/views/para/admin/resources/_imports_menu.html.haml +22 -0
  53. data/app/views/para/admin/resources/_list.html.haml +8 -5
  54. data/app/views/para/admin/resources/_subclassable_add_button.html.haml +10 -0
  55. data/app/views/para/admin/resources/_tree.html.haml +1 -1
  56. data/app/views/para/admin/resources/_tree_item.html.haml +1 -1
  57. data/app/views/para/admin/resources/new.html.haml +1 -1
  58. data/app/views/para/admin/shared/_breadcrumbs.html.haml +8 -0
  59. data/app/views/para/admin/shared/_header.html.haml +26 -24
  60. data/app/views/para/admin/shared/_navigation.html.haml +5 -3
  61. data/app/views/para/form/_tabs.html.haml +13 -0
  62. data/app/views/para/inputs/_nested_many.html.haml +2 -2
  63. data/app/views/para/inputs/_nested_many_container.html.haml +1 -3
  64. data/config/locales/en.yml +10 -0
  65. data/config/locales/fr.yml +30 -15
  66. data/db/migrate/20160304113055_add_json_equality_operator_patch_to_postgres.rb +38 -0
  67. data/lib/generators/para/component/component_generator.rb +9 -29
  68. data/lib/generators/para/component/crud/crud_generator.rb +41 -0
  69. data/lib/generators/para/component/templates/component.rb +1 -1
  70. data/lib/generators/para/component/templates/decorator.rb +3 -0
  71. data/lib/generators/para/component/templates/resources_controller.rb +4 -0
  72. data/lib/generators/para/exporter/templates/base_exporter.rb +2 -0
  73. data/lib/generators/para/exporter/templates/csv_exporter.rb +2 -0
  74. data/lib/generators/para/filters/filters_generator.rb +16 -0
  75. data/lib/generators/para/filters/templates/_filters.html.haml +9 -0
  76. data/lib/generators/para/importer/importer_generator.rb +20 -0
  77. data/lib/generators/para/importer/templates/base_importer.rb +5 -0
  78. data/lib/generators/para/install/install_generator.rb +6 -25
  79. data/lib/generators/para/nested_fields/nested_fields_generator.rb +9 -0
  80. data/lib/para/attribute_field/base.rb +28 -0
  81. data/lib/para/attribute_field/belongs_to.rb +2 -0
  82. data/lib/para/attribute_field/boolean.rb +2 -0
  83. data/lib/para/attribute_field/datetime.rb +2 -0
  84. data/lib/para/attribute_field/enum.rb +22 -0
  85. data/lib/para/attribute_field/file.rb +2 -0
  86. data/lib/para/attribute_field/has_many.rb +2 -0
  87. data/lib/para/attribute_field/image.rb +2 -0
  88. data/lib/para/attribute_field/nested_many.rb +3 -0
  89. data/lib/para/attribute_field/nested_one.rb +6 -6
  90. data/lib/para/attribute_field/password.rb +2 -0
  91. data/lib/para/attribute_field/redactor.rb +2 -0
  92. data/lib/para/attribute_field/translation.rb +2 -0
  93. data/lib/para/attribute_field.rb +19 -0
  94. data/lib/para/attribute_field_mappings.rb +15 -29
  95. data/lib/para/breadcrumbs/breadcrumb.rb +43 -0
  96. data/lib/para/breadcrumbs/controller.rb +39 -0
  97. data/lib/para/breadcrumbs/manager.rb +19 -0
  98. data/lib/para/breadcrumbs.rb +9 -0
  99. data/lib/para/component/importable.rb +25 -0
  100. data/lib/para/component/subclassable.rb +27 -0
  101. data/lib/para/component.rb +5 -3
  102. data/lib/para/components_configuration.rb +18 -2
  103. data/lib/para/config.rb +25 -1
  104. data/lib/para/exporter/base.rb +13 -0
  105. data/lib/para/exporter/csv.rb +1 -1
  106. data/lib/para/form_builder/tabs.rb +56 -0
  107. data/lib/para/form_builder.rb +2 -0
  108. data/lib/para/generators/component_helpers.rb +57 -0
  109. data/lib/para/generators.rb +1 -0
  110. data/lib/para/importer/base.rb +23 -0
  111. data/lib/para/importer.rb +10 -0
  112. data/lib/para/inputs/nested_one_input.rb +13 -3
  113. data/lib/para/markup/resources_table.rb +48 -24
  114. data/lib/para/markup/resources_tree.rb +36 -0
  115. data/lib/para/model_field_parsers/store.rb +23 -0
  116. data/lib/para/model_field_parsers.rb +1 -0
  117. data/lib/para/orderable.rb +6 -3
  118. data/lib/para/plugins/routes.rb +25 -0
  119. data/lib/para/plugins.rb +11 -0
  120. data/lib/para/routes.rb +2 -25
  121. data/lib/para/version.rb +1 -1
  122. data/lib/para.rb +4 -2
  123. data/lib/rails/routing_mapper.rb +64 -5
  124. metadata +50 -64
  125. data/app/controllers/para/admin/crud_component_controller.rb +0 -17
  126. data/app/controllers/para/admin/singleton_resource_component_controller.rb +0 -14
  127. data/app/views/para/admin/component_sections/_form.html.haml +0 -10
  128. data/app/views/para/admin/component_sections/edit.html.haml +0 -5
  129. data/app/views/para/admin/component_sections/new.html.haml +0 -5
  130. data/app/views/para/admin/components/_form.html.haml +0 -15
  131. data/app/views/para/admin/components/new.html.haml +0 -4
  132. data/app/views/para/admin/shared/_breadcrumb.html.haml +0 -3
  133. /data/app/views/para/admin/{singleton_resource_component → singleton_resources}/show.html.haml +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf91ced8ed0c3b19a7c6969a2b528ccc35ae1a3e
4
- data.tar.gz: 0368b7ddfaeff31415371ebe2cc9c7f23cbeef63
3
+ metadata.gz: c04310b282e123cc4d2f5329d495d6133aaf8bfd
4
+ data.tar.gz: 3f5658e207ad84fd1820dc4428bc4a65b95635a8
5
5
  SHA512:
6
- metadata.gz: 1d0717d4cc7da391e4fadba4fbda2720d6f7ccedaf208fd65f307275bc5f08897af5be6e10694200158de3e4daf58b2ad0739c31530015f4fe1909a2e7439c97
7
- data.tar.gz: b7c643c8c1d81d08f8c8eeb3129396eda89e39591363a9a8eddb6a8737abee4c06401557a94167c47f5a849328f703d9f7fc008a6a1c54e5514a7ee34fade9a7
6
+ metadata.gz: 2553622ee949ea75a6c1de1db3c08af4058a41e134cf7b4c5d453dc83b20c03ab14e78144b3f9fa95ce0ea66efa8c8082e50feee00e26d28f53f09070dc9c65e
7
+ data.tar.gz: 6031a27defab3bbd0254dead9a8620009e43efe10ad2af914cf5bef8bc0f989c45c11f10cb0c79c8163afcf96ebe6455faabd93c09cd13934ad6afc8001d5d4b
@@ -9,7 +9,6 @@ responsive_sidebar_navigation = ->
9
9
  scrollToComponentSection($activeItem)
10
10
 
11
11
  $('.component-item').on 'click', 'a', (e) ->
12
- console.log 'scroll to ', $(e.currentTarget).closest('.component-item')
13
12
  scrollToComponentSection($(e.currentTarget), 150)
14
13
 
15
14
  $(document).on 'page:change', ->
@@ -0,0 +1,23 @@
1
+ class Turbolinks.Form
2
+ constructor: (@$form) ->
3
+ @$form.on('submit', (e) => @submit(e))
4
+
5
+ submit: (e) ->
6
+ e.preventDefault()
7
+ @visit(@buildUrl())
8
+
9
+ buildUrl: ->
10
+ url = @$form.attr('action')
11
+ url += if url.indexOf('?') is -1 then '?' else '&'
12
+ url + @$form.serialize()
13
+
14
+ visit: (url) ->
15
+ Turbolinks.visit(url);
16
+
17
+
18
+ $(document).on "submit", "form[method='get']:not([data-no-turboform])", (e) ->
19
+ $form = $(e.currentTarget)
20
+ unless (turboform = $form.data('turboform-instance'))
21
+ turboform = new Turbolinks.Form($form)
22
+ $form.data('turboform-instance', turboform)
23
+ turboform.submit(e)
@@ -0,0 +1,25 @@
1
+ class Para.TurbolinksLoading
2
+ start: =>
3
+ @addLoadingMarkup()
4
+
5
+ stop: =>
6
+ @removeLoadingMarkup()
7
+
8
+ addLoadingMarkup: ->
9
+ $('<div/>', class: 'loading-overlay', 'data-loading-overlay': true)
10
+ .prependTo('body')
11
+ $('<div/>', class: 'loading-spinner', 'data-loading-spinner': true)
12
+ .prependTo('body')
13
+
14
+ removeLoadingMarkup: ->
15
+ $('[data-loading-overlay]').remove()
16
+ $('[data-loading-spinner]').remove()
17
+
18
+ # Global loading manager allowing to
19
+ Para.loadingManager = new Para.TurbolinksLoading()
20
+
21
+ $(document).on('page:fetch', Para.loadingManager.start)
22
+
23
+ $(document).on 'page:change', ->
24
+ Para.loadingManager.stop()
25
+ $('body').on('submit', '[data-para-form]', Para.loadingManager.start)
@@ -1,7 +1,5 @@
1
1
  @import "para/admin/theme/variables"
2
2
 
3
- @import "compass/css3/box-shadow"
4
-
5
3
  /* Bootstrap Datetimepiker */
6
4
  .xdsoft_datetimepicker
7
5
  .xdsoft_calendar td.xdsoft_default,
@@ -9,7 +7,7 @@
9
7
  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current,
10
8
  .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current
11
9
  background: $brand-primary
12
- +box-shadow(darken($brand-primary, 10%) 0px 1px 3px 0px inset)
10
+ box-shadow: darken($brand-primary, 10%) 0px 1px 3px 0px inset
13
11
 
14
12
  .xdsoft_calendar td:hover,
15
13
  .xdsoft_timepicker .xdsoft_time_box >div >div:hover,
@@ -1,8 +1,5 @@
1
1
  @import "para/admin/theme/variables"
2
2
 
3
- @import "compass/css3/box-shadow"
4
- @import "compass/css3/border-radius"
5
-
6
3
  input[type=number]::-webkit-inner-spin-button,
7
4
  input[type=number]::-webkit-outer-spin-button
8
5
  -webkit-appearance: none
@@ -22,7 +19,7 @@ input[type=number]::-webkit-outer-spin-button
22
19
  top: 0px
23
20
  margin-left: -1px !important
24
21
  border-color: $input-border
25
- +box-shadow(none)
22
+ box-shadow: none
26
23
  z-index: 2
27
24
  .fa
28
25
  font-size: 1em
@@ -32,12 +29,12 @@ input[type=number]::-webkit-outer-spin-button
32
29
  cursor: not-allowed
33
30
  &:hover,
34
31
  &:focus
35
- +box-shadow(none)
32
+ box-shadow: none
36
33
  .spinner-up,
37
34
  .spinbox-up
38
- +border-top-left-radius(0 !important)
39
- +border-top-right-radius($input-border-radius !important)
35
+ border-top-left-radius: 0 !important
36
+ border-top-right-radius: $input-border-radius !important
40
37
  .spinner-down,
41
38
  .spinbox-down
42
- +border-bottom-left-radius(0 !important)
39
+ border-bottom-left-radius: 0 !important
43
40
  padding: 3px 9px 2px 9px
@@ -1,7 +1,6 @@
1
1
  /* Jasny Bootstrap Fileupload overrides */
2
2
 
3
3
  @import "para/admin/theme/variables"
4
- @import "compass/css3/border-radius"
5
4
 
6
5
  .fileinput
7
6
  margin-bottom: 0
@@ -11,7 +10,7 @@
11
10
 
12
11
  .fileinput-new.input-group .btn-file
13
12
  .fileinput.input-group .btn-file
14
- +border-right-radius($border-radius-base)
13
+ border-right-radius: $border-radius-base
15
14
  border-color: $input-border
16
15
 
17
16
  .fileinput.input-group .input-group-btn
@@ -0,0 +1,24 @@
1
+ @import "para/admin/theme/variables"
2
+
3
+ $spinner-size: 32px
4
+
5
+ .loading-overlay
6
+ position: fixed
7
+ width: calc(100% - #{ $left-menu-width-open })
8
+ height: calc(100% - #{ $navbar-height })
9
+ top: $navbar-height
10
+ left: $left-menu-width-open
11
+ z-index: 999
12
+ opacity: .5
13
+ background: white
14
+
15
+ .loading-spinner
16
+ position: fixed
17
+ top: 50%
18
+ left: 50%
19
+ margin-left: ($left-menu-width-open / 2) - ($spinner-size / 2)
20
+ margin-top: $navbar-height - $spinner-size
21
+ width: $spinner-size
22
+ height: $spinner-size
23
+ z-index: 1000
24
+ background: image-url('para/admin/loading-spinner.gif')
@@ -1,6 +1,4 @@
1
1
  @import "para/admin/theme/variables"
2
- @import "compass/css3/border-radius"
3
- @import "compass/css3/box-shadow"
4
2
 
5
3
  .redactor-button-disabled
6
4
  &:hover,
@@ -21,8 +19,8 @@
21
19
  /* Override z-index because we don't whant */
22
20
  /* redactor_toolbar fixed somewhere or on top of everythink ..*/
23
21
  z-index: 1 !important
24
- +box-shadow(none)
25
- +border-radius($input-border-radius $input-border-radius 0 0)
22
+ box-shadow: none
23
+ border-radius: $input-border-radius $input-border-radius 0 0
26
24
  border: 1px solid $input-border
27
25
  li a
28
26
  &:hover,
@@ -34,7 +32,7 @@
34
32
  background-color: $input-bg
35
33
  border: 1px solid $input-border
36
34
  border-top-width: 0px
37
- +border-radius(0 0 $input-border-radius $input-border-radius)
35
+ border-radius: 0 0 $input-border-radius $input-border-radius
38
36
  &:focus
39
37
  border-color: $input-border-focus
40
38
  background: #FFF
@@ -73,11 +71,11 @@
73
71
  border-color: $input-border
74
72
  background-color: $input-bg
75
73
  color: $input-color
76
- +box-shadow(none)
74
+ box-shadow: none
77
75
  &:focus
78
76
  background-color: #fff
79
77
  border-color: $input-border-focus
80
- +box-shadow(none)
78
+ box-shadow: none
81
79
 
82
80
  footer
83
81
  button.redactor-modal-action-btn
@@ -1,20 +1,18 @@
1
1
  @import "para/admin/theme/variables"
2
- @import "compass/css3/border-radius"
3
- @import "compass/css3/box-shadow"
4
2
 
5
3
  .selectize-dropdown,
6
4
  .selectize-dropdown.form-control
7
- +border-radius($border-radius-base)
5
+ border-radius: $border-radius-base
8
6
 
9
7
  .selectize-input,
10
8
  .selectize-input.full
11
9
  border-color: $input-border
12
- +border-radius($input-border-radius)
10
+ border-radius: $input-border-radius
13
11
  &.focus
14
12
  border-color: $input-border-focus
15
- +box-shadow(none)
13
+ box-shadow: none
16
14
  &.dropdown-active
17
- +border-radius($input-border-radius)
15
+ border-radius: $input-border-radius
18
16
 
19
17
  .selectize-dropdown,
20
18
  .selectize-input,
@@ -1,6 +1,5 @@
1
1
  @import "para/admin/theme/variables"
2
2
 
3
-
4
3
  .form-group
5
4
  &.slider
6
5
  display: block
@@ -1,9 +1,6 @@
1
-
2
1
  @import url('//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,500,600,700&subset=latin,cyrillic-ext')
3
2
 
4
3
  @import "variables"
5
- @import "compass/css3/transition"
6
- @import "compass/css3/box-shadow"
7
4
 
8
5
  html *
9
6
  outline: 0!important
@@ -129,6 +126,11 @@ body, html
129
126
 
130
127
  // Top navigation fixed
131
128
  &.page-navigation-top-fixed
129
+ .breadcrumb
130
+ position: fixed
131
+ top: 0
132
+ left: $left-menu-width-open
133
+ right: 0
132
134
  .navigation-horizontal
133
135
  position: fixed
134
136
  top: 0
@@ -1,29 +1,67 @@
1
1
  @import 'variables'
2
- @import "compass/css3/border-radius"
3
2
 
4
3
  .breadcrumb
5
4
  width: 100%
6
- background: $breadcrumb-bg
7
5
  margin-bottom: 0px
8
- padding: 6px 15px 7px
9
- +border-radius(0)
6
+ padding: 0
7
+ border-radius: 0
8
+ overflow: hidden
9
+ border: none
10
+ border-bottom: 1px solid $gray-light
11
+ li + li:before
12
+ display: none
10
13
  li
11
- font-size: 11px
12
- line-height: 12px
13
- color: $breadcrumb-color
14
- text-decoration: none
14
+ &:first-child
15
+ padding-left: 27px
16
+ a
17
+ padding: 0
18
+ &:last-child
19
+ background-color: transparent !important
20
+ pointer-events: none
21
+ cursor: default
22
+ padding: 11px 10px 11px 30px
15
23
  a
16
- font-size: 11px
17
- line-height: 12px
24
+ font-size: 1em
18
25
  color: $breadcrumb-color
19
26
  text-decoration: none
27
+ display: block
28
+ position: relative
29
+ background-color: $breadcrumb-bg
30
+ padding: 11px 10px 11px 30px
20
31
  &:hover
21
- color: $breadcrumb-active-color
32
+ color: #000
33
+ background-color: $gray-light
34
+ &:after
35
+ border-left-color: $gray-light
36
+
37
+ &:after
38
+ content: " "
39
+ display: block
40
+ width: 0
41
+ height: 0
42
+ border-top: 30px solid transparent
43
+ border-bottom: 30px solid transparent
44
+ border-left: 15px solid $breadcrumb-bg
45
+ position: absolute
46
+ top: 50%
47
+ margin-top: -30px
48
+ left: 100%
49
+ z-index: 2
50
+ &:before
51
+ content: " "
52
+ display: block
53
+ width: 0
54
+ height: 0
55
+ border-top: 30px solid transparent
56
+ border-bottom: 30px solid transparent
57
+ border-left: 15px solid $brand-primary
58
+ position: absolute
59
+ top: 50%
60
+ margin-top: -30px
61
+ margin-left: 2px
62
+ left: 100%
63
+ z-index: 1
64
+
22
65
  &:hover, &:last-child
23
66
  color: $breadcrumb-active-color
24
- > li + li:before
25
- font-family: FontAwesome
26
- content: "\f105"
27
- color: $breadcrumb-color
28
- padding: 0 8px
29
67
 
@@ -1,5 +1,4 @@
1
1
  @import 'variables'
2
- @import "compass/css3/border-radius"
3
2
 
4
3
  .btn
5
4
  .fa, .glyphicon
@@ -1,5 +1,4 @@
1
1
  @import 'variables'
2
- @import "compass/css3/inline-block"
3
2
 
4
3
  @mixin fontAwesome
5
4
  font-family: FontAwesome
@@ -8,7 +7,7 @@
8
7
  text-decoration: inherit
9
8
  -webkit-font-smoothing: antialiased
10
9
  /* sprites.less reset */
11
- +inline-block
10
+ display: inline-block
12
11
  width: auto
13
12
  height: auto
14
13
  line-height: normal
@@ -29,7 +28,7 @@
29
28
  float: right
30
29
  line-height: 1
31
30
 
32
- .form-group.boolean
31
+ .form-group.boolean
33
32
  [class^="col-"] label
34
33
  margin-bottom: 0
35
34
  padding-top: 2px
@@ -66,7 +65,7 @@ input[type=checkbox]:focus + .checkbox-icon:before
66
65
  &:before
67
66
  +fontAwesome
68
67
  content: "\f096"
69
- color: $input-border
68
+ color: $input-color
70
69
 
71
70
  input[type=radio]:checked + label.radio_buttons:before,
72
71
  input[type=radio]:checked + .radio-icon:before
@@ -84,7 +83,7 @@ input[type=radio]:focus + .radio-icon:before
84
83
  &:before
85
84
  +fontAwesome
86
85
  content: "\f10c"
87
- color: $input-border
86
+ color: $input-color
88
87
 
89
88
  // INLINE OVERRIDE //
90
89
  .radio-inline,
@@ -99,7 +98,7 @@ input[type=radio]:focus + .radio-icon:before
99
98
  border: none
100
99
  background-color: transparent
101
100
  background: none
102
- +inline-block
101
+ display: inline-block
103
102
  &:hover
104
103
  cursor: pointer
105
104
  &:before
@@ -151,8 +151,6 @@
151
151
  background: #fcfbf4
152
152
  border: 1px dashed $gray-dark
153
153
  margin-bottom: 20px
154
- -moz-border-radius: 3px
155
- -webkit-border-radius: 3px
156
154
  border-radius: 3px
157
155
  float: left
158
156
  width: 100%
@@ -171,30 +169,26 @@
171
169
 
172
170
  // Social network color
173
171
  .twitter
174
- border-color: #1AB2E8!important
175
- color: #1AB2E8!important
172
+ border-color: #1AB2E8 !important
173
+ color: #1AB2E8 !important
176
174
  &:hover
177
- border-color: #48c2ed!important
178
- color: #48c2ed!important
175
+ border-color: #48c2ed !important
176
+ color: #48c2ed !important
179
177
 
180
178
  .facebook
181
- border-color: #3C599B!important
182
- color: #3C599B!important
179
+ border-color: #3C599B !important
180
+ color: #3C599B !important
183
181
  &:hover
184
- border-color: #4f70bb!important
185
- color: #4f70bb!important
182
+ border-color: #4f70bb !important
183
+ color: #4f70bb !important
186
184
 
187
185
  .resizable-helper
188
186
  border: 1px dashed $brand-primary
189
187
 
190
188
  .img-text
191
189
  border: 3px solid #FFF
192
- -moz-border-radius: 3px
193
- -webkit-border-radius: 3px
194
190
  border-radius: 3px
195
191
  margin: 0 10px 5px 0
196
- -moz-box-shadow: 1px 1px 0 0 rgba(0, 0, 0, 0.1)
197
- -webkit-box-shadow: 1px 1px 0 0 rgba(0, 0, 0, 0.1)
198
192
  box-shadow: 1px 1px 0 0 rgba(0, 0, 0, 0.1)
199
193
 
200
194
  .mail-checkall
@@ -207,7 +201,7 @@
207
201
  position: absolute
208
202
  top: 0
209
203
  left: 0
210
- display: block!important
204
+ display: block !important
211
205
  width: 100%
212
- height: 100%!important
206
+ height: 100% !important
213
207
  opacity: 0
@@ -1,9 +1,8 @@
1
1
  @import 'variables'
2
- @import "compass/css3/box-shadow"
3
2
 
4
3
  .dropdown-menu
5
4
  font-size: 12px
6
- +box-shadow(0 2px 1px 0 rgba(0, 0, 0, 0.1))
5
+ box-shadow: 0 2px 1px 0 rgba(0, 0, 0, 0.1)
7
6
  border: 1px solid $dropdown-border
8
7
  padding: 0
9
8
  margin: 8px 0 0
@@ -49,5 +48,3 @@
49
48
  margin: 0
50
49
  padding: 15px 0 0
51
50
  border-bottom: 1px solid $dropdown-border
52
-
53
-
@@ -1,11 +1,10 @@
1
1
  @import "variables"
2
- @import "compass/css3/box-shadow"
3
2
 
4
3
  .form-control
5
- +box-shadow(none)
4
+ box-shadow: none
6
5
  -webkit-appearance: none
7
6
  &:focus
8
- +box-shadow(none)
7
+ box-shadow: none
9
8
  border-color: $input-border-focus
10
9
  background: #FFF
11
10
  &[disabled], &[readonly]
@@ -15,6 +14,15 @@
15
14
  color: $gray-dark
16
15
  border-color: $gray-lighter
17
16
 
17
+ // File input
18
+ .fileinput
19
+ &.fileinput-new
20
+ .fileinput-placeholder
21
+ display: block
22
+ &.fileinput-exists
23
+ .fileinput-placeholder
24
+ display: none
25
+
18
26
  .input-group-addon
19
27
  font-size: 13px
20
28
  padding: 0 10px
@@ -1,5 +1,4 @@
1
1
  @import 'variables'
2
- @import "compass/css3/border-radius"
3
2
 
4
3
  // List with progress bar
5
4
  .progress-list
@@ -27,7 +26,7 @@
27
26
  float: left
28
27
  background: $btn-default-bg
29
28
  border: 1px solid $gray-lighter
30
- +border-radius(3px)
29
+ border-radius: 3px
31
30
  line-height: 23px
32
31
  font-size: 11px
33
32
  margin: 0 5px 5px 0
@@ -68,13 +67,13 @@
68
67
  .list-group-item
69
68
  border-left: 0
70
69
  border-right: 0
71
- +border-radius(0)
70
+ border-radius: 0
72
71
 
73
72
  .padding-0 .list-group
74
73
  border: 0
75
74
  .list-group-item
76
75
  border-width: 1px 0 0
77
- +border-radius(0)
76
+ border-radius: 0
78
77
  &:first-child
79
78
  border-top: 0
80
79
 
@@ -96,7 +95,7 @@ a.list-group-item
96
95
  padding: 10px
97
96
  img
98
97
  border: 2px solid $btn-default-bg
99
- +border-radius(50%)
98
+ border-radius: 50%
100
99
  width: 40px
101
100
  margin-right: 10px
102
101
  .contacts-title
@@ -128,7 +127,7 @@ a.list-group-item
128
127
  top: 15px
129
128
  width: 10px
130
129
  height: 10px
131
- +border-radius(50%)
130
+ border-radius: 50%
132
131
  content: " "
133
132
  &.status-online:after
134
133
  background: $brand-success