redactor-rails 0.4 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +12 -2
  3. data/app/controller/redactor_rails/documents_controller.rb +9 -1
  4. data/app/controller/redactor_rails/pictures_controller.rb +9 -1
  5. data/lib/redactor-rails/helper.rb +1 -4
  6. data/lib/redactor-rails/orm/active_record.rb +1 -1
  7. data/lib/redactor-rails/version.rb +1 -1
  8. data/vendor/assets/javascripts/redactor-rails/index.js +1 -1
  9. data/vendor/assets/javascripts/redactor-rails/langs/ar.js +3 -2
  10. data/vendor/assets/javascripts/redactor-rails/langs/ba.js +3 -2
  11. data/vendor/assets/javascripts/redactor-rails/langs/bg.js +3 -2
  12. data/vendor/assets/javascripts/redactor-rails/langs/by.js +4 -3
  13. data/vendor/assets/javascripts/redactor-rails/langs/cs.js +3 -2
  14. data/vendor/assets/javascripts/redactor-rails/langs/da.js +4 -3
  15. data/vendor/assets/javascripts/redactor-rails/langs/de.js +4 -3
  16. data/vendor/assets/javascripts/redactor-rails/langs/en.js +3 -2
  17. data/vendor/assets/javascripts/redactor-rails/langs/eo.js +3 -2
  18. data/vendor/assets/javascripts/redactor-rails/langs/es.js +4 -3
  19. data/vendor/assets/javascripts/redactor-rails/langs/fa.js +3 -2
  20. data/vendor/assets/javascripts/redactor-rails/langs/fi.js +3 -2
  21. data/vendor/assets/javascripts/redactor-rails/langs/fr.js +4 -3
  22. data/vendor/assets/javascripts/redactor-rails/langs/hr.js +3 -2
  23. data/vendor/assets/javascripts/redactor-rails/langs/hu.js +3 -2
  24. data/vendor/assets/javascripts/redactor-rails/langs/id.js +3 -2
  25. data/vendor/assets/javascripts/redactor-rails/langs/it.js +3 -2
  26. data/vendor/assets/javascripts/redactor-rails/langs/ja.js +4 -3
  27. data/vendor/assets/javascripts/redactor-rails/langs/ko.js +3 -2
  28. data/vendor/assets/javascripts/redactor-rails/langs/lv.js +4 -3
  29. data/vendor/assets/javascripts/redactor-rails/langs/nl.js +3 -2
  30. data/vendor/assets/javascripts/redactor-rails/langs/pl.js +4 -3
  31. data/vendor/assets/javascripts/redactor-rails/langs/pt_br.js +3 -2
  32. data/vendor/assets/javascripts/redactor-rails/langs/ro.js +3 -2
  33. data/vendor/assets/javascripts/redactor-rails/langs/ru.js +3 -2
  34. data/vendor/assets/javascripts/redactor-rails/langs/sk.js +3 -2
  35. data/vendor/assets/javascripts/redactor-rails/langs/sq.js +3 -2
  36. data/vendor/assets/javascripts/redactor-rails/langs/sr-cir.js +3 -2
  37. data/vendor/assets/javascripts/redactor-rails/langs/sr-lat.js +3 -2
  38. data/vendor/assets/javascripts/redactor-rails/langs/sv.js +3 -2
  39. data/vendor/assets/javascripts/redactor-rails/langs/tr.js +3 -2
  40. data/vendor/assets/javascripts/redactor-rails/langs/ua.js +4 -3
  41. data/vendor/assets/javascripts/redactor-rails/langs/vi.js +3 -2
  42. data/vendor/assets/javascripts/redactor-rails/langs/zh_cn.js +3 -2
  43. data/vendor/assets/javascripts/redactor-rails/langs/zh_tw.js +74 -66
  44. data/vendor/assets/javascripts/redactor-rails/redactor.js +1114 -539
  45. data/vendor/assets/javascripts/redactor-rails/redactor.min.js +3 -3
  46. data/vendor/assets/stylesheets/redactor-rails/css/redactor-iframe.css +3 -2
  47. data/vendor/assets/stylesheets/redactor-rails/css/redactor.css +56 -43
  48. metadata +3 -3
@@ -28,6 +28,29 @@ body .redactor_box_fullscreen {
28
28
  padding: 0;
29
29
  }
30
30
 
31
+ .redactor-link-tooltip {
32
+ position: absolute;
33
+ z-index: 3000;
34
+ padding: 10px;
35
+ line-height: 1;
36
+ display: inline-block;
37
+ background-color: #000;
38
+ color: #555 !important;
39
+ }
40
+ .redactor-link-tooltip,
41
+ .redactor-link-tooltip a {
42
+ font-size: 12px;
43
+ font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
44
+ }
45
+ .redactor-link-tooltip a {
46
+ color: #ccc;
47
+ margin: 0 5px;
48
+ text-decoration: none;
49
+ }
50
+ .redactor-link-tooltip a:hover {
51
+ color: #fff;
52
+ }
53
+
31
54
  .redactor_box textarea, .redactor_box textarea:focus {
32
55
  position: relative;
33
56
  z-index: 1004;
@@ -61,7 +84,8 @@ body .redactor_box_fullscreen {
61
84
  .redactor_editor h2,
62
85
  .redactor_editor h3,
63
86
  .redactor_editor h4,
64
- .redactor_editor h5 {
87
+ .redactor_editor h5,
88
+ .redactor_editor h6 {
65
89
  font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
66
90
  }
67
91
 
@@ -80,8 +104,8 @@ body .redactor_box_fullscreen {
80
104
  .redactor_editor dl,
81
105
  .redactor_editor blockquote,
82
106
  .redactor_editor pre {
83
- font-size: 15px !important;
84
- line-height: 1.5em;
107
+ font-size: 15px;
108
+ line-height: 1.5rem;
85
109
  }
86
110
 
87
111
  .redactor_editor,
@@ -196,7 +220,8 @@ body .redactor_box_fullscreen {
196
220
  .redactor_editor h2,
197
221
  .redactor_editor h3,
198
222
  .redactor_editor h4,
199
- .redactor_editor h5 {
223
+ .redactor_editor h5,
224
+ .redactor_editor h6 {
200
225
  margin-top: 0 !important;
201
226
  margin-right: 0 !important;
202
227
  margin-left: 0;
@@ -254,6 +279,9 @@ body .redactor_box_fullscreen {
254
279
  border: 1px solid #e4e4e4 !important;
255
280
  background-color: #fff !important;
256
281
  }
282
+ .redactor_editor_wym blockquote:before {
283
+ content: '';
284
+ }
257
285
  .redactor_editor_wym div {
258
286
  border: 1px dotted #aaa !important;
259
287
  }
@@ -450,7 +478,11 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
450
478
  .redactor_format_pre {
451
479
  font-family: monospace, sans-serif;
452
480
  }
453
- .redactor_format_h1, .redactor_format_h2, .redactor_format_h3, .redactor_format_h4 {
481
+ .redactor_format_h1,
482
+ .redactor_format_h2,
483
+ .redactor_format_h3,
484
+ .redactor_format_h4,
485
+ .redactor_format_h5 {
454
486
  font-weight: bold;
455
487
  }
456
488
  .redactor_format_h1 {
@@ -469,6 +501,11 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
469
501
  font-size: 16px;
470
502
  line-height: 26px;
471
503
  }
504
+ .redactor_format_h5 {
505
+ font-size: 14px;
506
+ line-height: 23px;
507
+ }
508
+
472
509
 
473
510
  /*
474
511
  DROPDOWN
@@ -480,9 +517,8 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
480
517
  z-index: 2004;
481
518
  padding: 10px;
482
519
  width: 200px;
483
- border: 1px solid #ccc;
484
520
  background-color: #fff;
485
- box-shadow: 0 2px 4px #ccc;
521
+ box-shadow: 0 1px 5px #bbb;
486
522
  font-size: 13px;
487
523
  font-family: Helvetica, Arial, Verdana, Tahoma, sans-serif;
488
524
  line-height: 21px;
@@ -505,27 +541,6 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
505
541
  text-decoration: none;
506
542
  }
507
543
 
508
- /* ColorPicker */
509
- .redactor_color_link {
510
- float: left !important;
511
- padding: 0 !important;
512
- width: 15px !important;
513
- height: 15px !important;
514
- border: 2px solid #fff !important;
515
- border-radius: 4px !important;
516
- box-shadow: 0 1px 2px rgba(0, 0, 0, .2) inset !important;
517
- font-size: 0;
518
- }
519
- .redactor_color_none {
520
- display: block;
521
- clear: both;
522
- padding: 4px 0 !important;
523
- font-size: 11px;
524
- line-height: 1;
525
- }
526
-
527
-
528
-
529
544
  /* MODAL */
530
545
  #redactor_modal_overlay {
531
546
  position: fixed;
@@ -538,7 +553,6 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
538
553
 
539
554
  background-color: #333 !important;
540
555
  opacity: 0.50;
541
-
542
556
  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
543
557
  filter:alpha(opacity=50);
544
558
  }
@@ -550,15 +564,7 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
550
564
  z-index: 50001;
551
565
  padding: 0;
552
566
  border-radius: 3px;
553
- background: #f7f7f7;
554
- background: -moz-linear-gradient(top, #f7f7f7 0%, #e2e2e2 100%);
555
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(100%,#e2e2e2));
556
- background: -webkit-linear-gradient(top, #f7f7f7 0%,#e2e2e2 100%);
557
- background: -o-linear-gradient(top, #f7f7f7 0%,#e2e2e2 100%);
558
- background: -ms-linear-gradient(top, #f7f7f7 0%,#e2e2e2 100%);
559
- background: linear-gradient(to bottom, #f7f7f7 0%,#e2e2e2 100%);
560
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#e2e2e2',GradientType=0 );
561
-
567
+ background: #f5f5f5;
562
568
  box-shadow: 0px 5px 60px #000;
563
569
  color: #000;
564
570
  text-shadow: 0 1px 0 #fff;
@@ -604,9 +610,6 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
604
610
  width: 99%;
605
611
  font-size: 14px;
606
612
  }
607
-
608
-
609
-
610
613
  .redactor_modal_box {
611
614
  overflow: auto;
612
615
  margin-bottom: 10px;
@@ -725,8 +728,6 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
725
728
  }
726
729
  .redactor_modal_btn:hover {
727
730
  color: #555;
728
- }
729
- .redactor_modal_btn:hover {
730
731
  background: none;
731
732
  background: #f3f3f3;
732
733
  text-decoration: none;
@@ -773,6 +774,18 @@ body .redactor_toolbar li a.redactor_btn_pre { background-position: -875px;
773
774
 
774
775
  /* =Progress
775
776
  -----------------------------------------------------------------------------*/
777
+ #redactor-progress-drag {
778
+ position: fixed;
779
+ top: 50%;
780
+ left: 50%;
781
+ width: 200px;
782
+ margin-left: -130px;
783
+ margin-top: -35px;
784
+ z-index: 10000;
785
+ padding: 30px;
786
+ background: rgba(0, 0, 0, .7);
787
+ box-shadow: none;
788
+ }
776
789
  .redactor-progress {
777
790
  height: 12px;
778
791
  overflow: hidden;
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redactor-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.4'
4
+ version: 0.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sammy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-29 00:00:00.000000000 Z
11
+ date: 2013-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mime-types
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
156
156
  version: '0'
157
157
  requirements: []
158
158
  rubyforge_project:
159
- rubygems_version: 2.0.0
159
+ rubygems_version: 2.0.6
160
160
  signing_key:
161
161
  specification_version: 4
162
162
  summary: ''