Pārlūkot izejas kodu

Fixes focus in Feedback and makes animation configurable.

j8
yanas 8 gadus atpakaļ
vecāks
revīzija
2d2915967c

+ 2
- 2
css/_variables.scss Parādīt failu

@@ -48,7 +48,7 @@ $dominantSpeakerBg: #165ecc;
48 48
 $raiseHandBg: #D6D61E;
49 49
 
50 50
 $rateStarDefault: #ccc;
51
-$rateStarActivity: #f6c342;
51
+$rateStarActivity: #165ecc;
52 52
 $rateStarLabelColor: #333;
53 53
 
54 54
 /**
@@ -64,7 +64,7 @@ $toolbarZ: 900;
64 64
 $overlayZ: 800;
65 65
 
66 66
 /**
67
- * Font Colors TODO: change according the design
67
+ * Font Colors TODO: Change colors when general dialogs are implemented.
68 68
  */
69 69
 $defaultFontColor: #777;
70 70
 $defaultLightFontColor: #F1F1F1;

+ 1
- 1
css/modals/feedback/_feedback.scss Parādīt failu

@@ -102,8 +102,8 @@
102 102
     &__details {
103 103
         text-align: left;
104 104
         textarea {
105
-            resize: vertical;
106 105
             min-height: 100px;
106
+            width: 100%;
107 107
         }
108 108
     }
109 109
 }

+ 3
- 1
interface_config.js Parādīt failu

@@ -38,5 +38,7 @@ var interfaceConfig = {
38 38
     LOCAL_THUMBNAIL_RATIO_WIDTH: 16,
39 39
     LOCAL_THUMBNAIL_RATIO_HEIGHT: 9,
40 40
     REMOTE_THUMBNAIL_RATIO_WIDTH: 1,
41
-    REMOTE_THUMBNAIL_RATIO_HEIGHT: 1
41
+    REMOTE_THUMBNAIL_RATIO_HEIGHT: 1,
42
+    // Enables feedback star animation.
43
+    ENABLE_FEEDBACK_ANIMATION: false
42 44
 };

+ 13
- 6
modules/UI/feedback/FeedbackWindow.js Parādīt failu

@@ -48,12 +48,17 @@ let constructDetailedFeedbackHtml = function() {
48 48
  * @returns {string} the contructed html string
49 49
  */
50 50
 let createRateFeedbackHTML = function (Feedback) {
51
-    var rateExperience = APP.translation.translateString('dialog.rateExperience'),
51
+    let rateExperience
52
+            = APP.translation.translateString('dialog.rateExperience'),
52 53
         feedbackHelp = APP.translation.translateString('dialog.feedbackHelp'),
53 54
         feedbackQuestion = (Feedback.feedbackScore < 0)
54 55
         ? `<p><br/>${APP.translation.translateString('dialog.feedbackQuestion')}</p>`
55 56
         : '';
56 57
 
58
+    let starClassName = (interfaceConfig.ENABLE_FEEDBACK_ANIMATION)
59
+                            ? "icon-star shake-rotate"
60
+                            : "icon-star";
61
+
57 62
     return `
58 63
         <div class="aui-dialog2-content feedback__content">
59 64
             ${feedbackQuestion}
@@ -63,19 +68,19 @@ let createRateFeedbackHTML = function (Feedback) {
63 68
                     <p class="star-label">&nbsp;</p>
64 69
                     <div id="stars" class="feedback-stars">
65 70
                         <a class="star-btn">
66
-                            <i class="icon-star shake-rotate"></i>
71
+                            <i class=${ starClassName }></i>
67 72
                         </a>
68 73
                         <a class="star-btn">
69
-                            <i class="icon-star shake-rotate"></i>
74
+                            <i class=${ starClassName }></i>
70 75
                         </a>
71 76
                         <a class="star-btn">
72
-                            <i class="icon-star shake-rotate"></i>
77
+                            <i class=${ starClassName }></i>
73 78
                         </a>
74 79
                         <a class="star-btn">
75
-                            <i class="icon-star shake-rotate"></i>
80
+                            <i class=${ starClassName }></i>
76 81
                         </a>
77 82
                         <a class="star-btn">
78
-                            <i class="icon-star shake-rotate"></i>
83
+                            <i class=${ starClassName }></i>
79 84
                         </a>
80 85
                     </div>
81 86
                     <p>&nbsp;</p>
@@ -140,6 +145,8 @@ let onLoadDetailedFunction = function(Feedback) {
140 145
             Feedback.hide();
141 146
         });
142 147
     }
148
+
149
+    $('#feedbackTextArea').focus();
143 150
 };
144 151
 
145 152
 /**

Notiek ielāde…
Atcelt
Saglabāt