Fixed merge conflicts

application/helpers/view_helper.php

@@ -1,10 +1,15 @@
 <?php defined("BASEPATH") or exit("No direct script access allowed");
 
 // Checks the count and makes the string plural (well adds an s) if it's longer than 1 or 0.
-function determinePlurality($num, $str)
+function determinePlurality($num, $str, $show_num=true)
 {
     if ($num == 0) { return "No ". $str . "s"; }
-    return ($num > 1) ? $num . " " . $str . "s" : $num . " " . $str;
+    if ($show_num) {
+        return ($num > 1) ? $num . " " . $str . "s" : $num . " " . $str;
+    } else {
+        return ($num > 1) ? $str . "s" : $str;
+    }
+
 }
 
 

application/views/layouts/sidebar.php

@@ -22,7 +22,8 @@
     <div class="sidebar-block">
         <div class="sidebar-inner">
             <a href="javascript:(function()%7Bl%3D%22<?php print getFullUrl(); ?>%2Fmark%2Fadd%3Furl%3D%22%2BencodeURIComponent(window.location.href)%2B%22%26title%3D%22%2BencodeURIComponent(document.title)%2B%22%26v%3D1%26nowindow%3Dyes%26%22%3Bvar%20e%3Dwindow.open(l%2B%22noui%3D1%22%2C%22Unmark%22%2C%22location%3D0%2Clinks%3D0%2Cscrollbars%3D0%2Ctoolbar%3D0%2Cwidth%3D594%2Cheight%3D485%22)%3Breturn%20false%7D)()" class="btn">Unmark+</a>
-            <p class="clear sidenote">To add Marks, drag this button into your bookmark toolbar.  <a href="http://help.unmark.it/bookmarklet" target="_blank">Learn how</a>.</p>
+            <p class="clear sidenote">To add Marks, drag this button into your bookmark toolbar.
+                <br /> Checkout our <a href="https://chrome.google.com/webstore/detail/unmark/cdhnljlbeehjgddokagghpfgahhlifch" target="_blank">Chrome Plugin</a> or to see more tools in <a href="http://help.unmark.it/bookmarklet" target="_blank">our help docs.</a></p>
         </div>
     </div>
     <?php $this->load->view('layouts/sidebar/sidebar_notices'); ?>

application/views/layouts/sidebar/sidebar_notices.php

@@ -8,7 +8,7 @@
 <div class="sidebar-block">
     <div class="sidebar-inner">
         <p>Thanks for checking out Unmark. We hope you enjoy using it.</p>
-		<p>For usage tips follow us on Twitter! Please tell your friends about Unmark.</p>
+		<p>For usage tips <a target="_blank" href="https://twitter.com/unmarkit">follow us on Twitter</a>! Please tell your friends about Unmark.</p>
 		<p>
 			<a href="https://twitter.com/unmarkit" class="twitter-follow-button" data-show-count="false" data-size="large" data-dnt="true">Follow @unmarkit</a>
 			<span class="sidebar-spacer"></span>

application/views/marks/index.php

@@ -5,7 +5,7 @@
 
     // Variable Setup
     $heading = array();
-    $link_plural = " ".determinePlurality($total, "mark")." ";
+    $link_plural = " ".determinePlurality($total, "mark", false)." ";
     $search_term = (isset($_GET['q'])) ? $_GET['q'] : '';
     $label_name = (isset($active_label['label_name'])) ? $active_label['label_name'] : '';
     $tag_name = (isset($active_tag['tag_name'])) ? $active_tag['tag_name'] : '';

assets/css/unmark.scss

@@ -729,14 +729,16 @@ ul.nav-list {
                 width: auto;
                 box-sizing: border-box;
                 float: left;
+                color: $color_white;
+                text-decoration:none;
+            }
+            a {
+                color: $color_dark;
+                text-decoration: underline;
             }
             .sidenote {
                 padding: 10px 0 0 5px;
                 margin-bottom: 0;
-                a {
-                    color: $color_dark;
-                    text-decoration: underline;
-                }
             }
         }
     }