Просмотр исходного кода

Small changes after review meeting

Header margin, "Move idea" text, Tag description header grammatical number
Unknown 7 лет назад
Родитель
Сommit
b4b091f8df
3 измененных файлов с 15 добавлено и 7 удалено
  1. 3 2
      canvas/css/canvas.css
  2. 3 4
      canvas/index.php
  3. 9 1
      canvas/js/canvas.js

+ 3 - 2
canvas/css/canvas.css

@@ -34,7 +34,7 @@ a.logo img {
 
 .form-header {
     width: 100%;
-    margin: 0 auto 2.14em auto;
+    margin: 0 auto 1.14em auto;
     /* background-color:#546e7a; */
     background-color: #eceff1;
     border-radius: 0 0 5px 5px;
@@ -97,7 +97,7 @@ a.logo img {
 
 .saved-tags {
     width: 100%;
-    margin: -1.14em auto 1.14em auto;
+    margin: -1.14em auto 1.04em auto;
     background-color: #eceff1;
     border-radius: 5px;
     padding: 1em 1em 1em 1em;
@@ -962,6 +962,7 @@ div.dialog-content {
     /* Form Header */
     .form-header {
         width: 100%;
+        margin: 0 auto 2.14em auto;
         padding-bottom: 2em;
     }
     .form-header h1 {

+ 3 - 4
canvas/index.php

@@ -739,8 +739,7 @@
                     <button type="button" class="close" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
-                    <h2>Move idea</h2>
-                    <p>Please select a category to move this&nbsp;idea&nbsp;to...</p>
+                    <h2>Move idea to...</h2>
                     <ul>
                         <li>
                             <a href="#">1.&nbsp;&nbsp;Individuals Affected</a>
@@ -772,7 +771,7 @@
                     </ul>
                     <!--
                     <h2 id="tag-description">
-                        My description of this tag
+                        Tag description
                     </h2>
                     <textarea rows="4" cols="50" maxlength="200" id="tag-description">Please enter a description...</textarea><br />
                     <p class="chars-count">
@@ -795,7 +794,7 @@
                         <span aria-hidden="true">&times;</span>
                     </button>
                     <h2 id="tag-description">
-                        My description of this tag
+                        Tag description
                     </h2>
                     <textarea rows="4" cols="50" maxlength="200" id="tag-description">Please enter a description...</textarea><br />
                     <p class="chars-count">

+ 9 - 1
canvas/js/canvas.js

@@ -215,7 +215,7 @@ $(document).ready(function() {
         // If the user has scrolled down to "Jump To..."
         else {
             // Set the new scroll position
-            scrollPositionNew = chosenFieldPosition - 57;
+            scrollPositionNew = chosenFieldPosition - 58;
             
             // Toggle the menu
             $("div.jump-to-list").slideToggle(300);
@@ -341,8 +341,16 @@ $(document).ready(function() {
                 var loopCounter = 0;
                 var text = $(this).text();
                 
+                // instanceCounter = $(text + ":contains('test')").length;
+                
+                // $('#parentDiv').find(":contains('No Records Found')").length
+                
+                // console.log(instanceCounter);
+                
                 // For every tag in the database that belongs to the active user
                 for(t in tags) {
+                    // instanceCounter = ($(this).text().match(/aaa/g) || []).length;
+                    
                     // Apply the tag for every instance of the current term
                     // instanceCounter = text.indexOf(tags[loopCounter]);