kuji-mercury-rails 0.3.2 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. data/app/views/mercury/modals/character.html +1 -1
  2. data/app/views/mercury/modals/htmleditor.html +1 -1
  3. data/app/views/mercury/modals/link.html +1 -1
  4. data/app/views/mercury/modals/media.html +1 -1
  5. data/app/views/mercury/modals/table.html +1 -1
  6. data/app/views/mercury/snippets/example/options.html.erb +1 -1
  7. data/config/engine.rb +1 -1
  8. data/features/loading/loading.feature +1 -1
  9. data/features/regions/editable/inserting_snippets.feature +7 -7
  10. data/spec/javascripts/mercury/page_editor_spec.js.coffee +9 -16
  11. data/spec/javascripts/mercury/panel_spec.js.coffee +4 -2
  12. data/spec/javascripts/mercury/regions/snippetable_spec.js.coffee +1 -1
  13. data/spec/javascripts/mercury/snippet_spec.js.coffee +2 -10
  14. data/spec/javascripts/mercury/uploader_spec.js.coffee +0 -16
  15. data/vendor/assets/javascripts/mercury.js +0 -4
  16. data/vendor/assets/javascripts/mercury/locales/da.locale.js.coffee +7 -7
  17. data/vendor/assets/javascripts/mercury/mercury.js.coffee +1 -1
  18. data/vendor/assets/javascripts/mercury/page_editor.js.coffee +4 -10
  19. data/vendor/assets/javascripts/mercury/panel.js.coffee +2 -2
  20. data/vendor/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee +2 -2
  21. data/vendor/assets/javascripts/mercury/snippet.js.coffee +4 -13
  22. data/vendor/assets/javascripts/mercury/toolbar.button.js.coffee +2 -2
  23. data/vendor/assets/javascripts/mercury/uploader.js.coffee +17 -35
  24. data/vendor/assets/stylesheets/mercury/dialog.css +0 -4
  25. data/vendor/assets/stylesheets/mercury/mercury.css +115 -1
  26. metadata +40 -80
  27. data/POST_INSTALL +0 -15
  28. data/features/regions/image/uploading_images.feature +0 -0
  29. data/features/regions/simple/basic_editing.feature +0 -5
  30. data/spec/javascripts/mercury/regions/image_spec.js.coffee +0 -34
  31. data/spec/javascripts/mercury/regions/simple_spec.js.coffee +0 -33
  32. data/spec/javascripts/templates/mercury/regions/image.html +0 -1
  33. data/spec/javascripts/templates/mercury/regions/simple.html +0 -3
  34. data/vendor/assets/javascripts/mercury/locales/ar.locale.js.coffee +0 -207
  35. data/vendor/assets/javascripts/mercury/regions/image.js.coffee +0 -114
  36. data/vendor/assets/javascripts/mercury/regions/simple.js.coffee +0 -325
  37. data/vendor/assets/stylesheets/mercury/form.css +0 -118
data/vendor/assets/stylesheets/mercury/form.css DELETED
@@ -1,118 +0,0 @@
1
- /*
2
- * Forms
3
- *---------------------------------------------------------------------------*/
4
- .mercury-form,
5
- .mercury-form ul,
6
- .mercury-form ol,
7
- .mercury-form li,
8
- .mercury-form fieldset,
9
- .mercury-form p {
10
- margin: 0;
11
- padding: 0;
12
- }
13
- .mercury-form abbr {
14
- border: 0;
15
- font-variant: normal;
16
- }
17
- .mercury-form fieldset {
18
- margin-bottom: 10px;
19
- background: #F6F6F6;
20
- border: 1px solid #CCC;
21
- border-radius: 7px;
22
- -moz-border-radius: 7px;
23
- }
24
- .mercury-form fieldset:last-child {
25
- margin-bottom: 0;
26
- }
27
- .mercury-form fieldset legend {
28
- font-weight: bold;
29
- margin-left: 10px;
30
- margin-bottom: -4px;
31
- }
32
- .mercury-form ol {
33
- margin: 12px 9px;
34
- }
35
- .mercury-form ol li {
36
- display: block;
37
- margin-bottom: 10px;
38
- }
39
- .mercury-form label {
40
- display: block;
41
- float: left;
42
- width: 23%;
43
- margin-right: 9px;
44
- text-align: right;
45
- line-height: 27px;
46
- font-size: 1.1em;
47
- overflow: hidden;
48
- text-overflow: ellipsis;
49
- white-space: nowrap;
50
- }
51
- .mercury-form label input {
52
- width: auto !important;
53
- margin: 0 5px 0 2px !important;
54
- }
55
- .mercury-form select,
56
- .mercury-form input[type=text],
57
- .mercury-form input[type=password],
58
- .mercury-form textarea,
59
- .mercury-form input.text {
60
- margin: 0;
61
- border: 2px solid #CCC;
62
- padding: 2px 4px;
63
- font-family: Arial, Geneva, sans-serif;
64
- font-size: 1.5em;
65
- width: 74%;
66
- box-sizing: border-box;
67
- -moz-box-sizing: border-box;
68
- -webkit-box-sizing: border-box;
69
- }
70
- .mercury-form li.boolean {
71
- margin-left: 23%;
72
- padding-left: 9px;
73
- }
74
- .mercury-form li.boolean label {
75
- width: auto;
76
- }
77
- .mercury-form fieldset.buttons {
78
- clear: both;
79
- padding: 0;
80
- background: none;
81
- border: none;
82
- text-align: left;
83
- }
84
- .mercury-form fieldset.buttons ol {
85
- margin: 0 -2px 0 0;
86
- float: right;
87
- }
88
- .mercury-form fieldset.buttons ol li {
89
- float: left;
90
- padding-left: 0.5em;
91
- padding-right: 0;
92
- }
93
- .mercury-form fieldset.buttons .commit {
94
- margin: 0;
95
- }
96
- .mercury-form fieldset.buttons .commit input {
97
- padding: 8px 14px 9px !important;
98
- font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
99
- font-size: 1.3em;
100
- background-color: #222;
101
- background-repeat: repeat-x;
102
- display: inline-block;
103
- color: #FFF;
104
- text-decoration: none;
105
- -moz-border-radius: 5px;
106
- -webkit-border-radius: 5px;
107
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
108
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
109
- text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);
110
- border: 0;
111
- border-bottom: 1px solid rgba(0, 0, 0, 0.25);
112
- position: relative;
113
- cursor: pointer;
114
- line-height: normal;
115
- }
116
- .mercury-form fieldset.buttons .commit input:hover {
117
- background-color: #000;
118
- }