fixed merge conflict

mailpile · Oct 24, 2014 · cf55fb6 · cf55fb6
1 parent 55f28be
commit cf55fb6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/static/default/css/default.css b/static/default/css/default.css
diff --git a/static/default/html/message/index.html b/static/default/html/message/index.html
@@ -55,8 +55,7 @@
 {% endfor %}{# End for loop #}
 
 {% if loop_history|last not in ("edit draft", "edit message") %}
-  {# Give the user the option to reply to the last message in the thread
-     - unless we already did! #}
+  {# Give the user the option to reply to the last message in the thread unless we already did! #}
   {% set compose = mailpile('message/reply', 'all', 'ephemeral', '='+last_mid).result %}{# Gets Ephermal message #}
   {% if compose %}
     {% set mid = compose.message_ids.0 %}
@@ -90,6 +89,12 @@
     {% endfor %}
   </ul>
 </div>
+
+<script id="template-composer" type="text/template">
+{% set mid = 'reply-all-template' %}
+{% set editing_strings = { 'from_aids': [], 'to': '', 'to_aids': [], 'cc': '', 'cc_aids': [], 'bcc': '', 'bcc_aids': [], 'subject': '', 'body': '', 'attachments': [], 'encryption': '' } %}
+{% set editing_addresses = [] %}
+{% include("partials/compose.html") %}
 <script>
 $(document).ready(function() {
   Mailpile.Message.init();

diff --git a/static/default/html/partials/thread_message.html b/static/default/html/partials/thread_message.html
@@ -50,7 +50,6 @@
           <div class="thread-item-crypto-line left"></div>
         </div>
         {% endif %}
-
         {% autoescape false %}
         {% set part_text = part.data|nice_text|e|urlize|fix_urls(40, url_danger) %}
         {% if part.type in ("text", "pgpsignedtext") %}

diff --git a/static/default/html/partials/topbar.html b/static/default/html/partials/topbar.html
@@ -12,7 +12,7 @@
   </div>
   <div class="topbar-actions">
     <form id="form-search" class="form-search clearfix" action="/search/">
-		  <input id="search-query" class="typeahead" type="text" name="q" placeholder="" autocomplete="off" tabindex=1 alt="{{_("Search")}}" value="{% for t in result.search_terms %}{{ t }} {% endfor %}">
+		  <input id="search-query" class="typeahead" type="text" name="q" placeholder="search" autocomplete="off" tabindex=1 alt="{{_("Search")}}" value="{% for t in result.search_terms %}{{ t }} {% endfor %}">
 		  <button type="submit" class="submit"><span class="icon-search"></span></button>
 	  </form>
     <nav class="topbar-nav">

diff --git a/static/default/less/app/sidebar.less b/static/default/less/app/sidebar.less
@@ -92,19 +92,32 @@
 
 /* Sidebar - Subtags */
 
-  #sidebar ul li.sidebar-subtag { margin-top: 2px; margin-bottom: 2px; padding-top: 1px; padding-bottom: 1px; }
-  #sidebar ul li.sidebar-subtag a.sidebar-tag {
+  #sidebar ul.sidebar-subtags {
+    background: @white;
+    border: 1px solid @grayMid;
+    margin: 5px 0px;
+    border-radius: (@base-border-radius * 1.5);
+  }
+
+  #sidebar ul.sidebar-subtags li.sidebar-subtag {
+    margin-top: 2px;
+    margin-bottom: 2px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+  }
+
+  #sidebar ul.sidebar-subtags li.sidebar-subtag a.sidebar-tag {
     font-size: 16px;
     font-family: Helvetica, Arial, sans-serif;
   }
 
-  #sidebar ul li.sidebar-subtag a.sidebar-tag span.sidebar-name,
-  #sidebar ul li.sidebar-subtag a.sidebar-tag span.sidebar-notification {   
+  #sidebar ul.sidebar-subtags li.sidebar-subtag a.sidebar-tag span.sidebar-name,
+  #sidebar ul.sidebar-subtags li.sidebar-subtag a.sidebar-tag span.sidebar-notification {
     vertical-align: middle;
     font-family: @mailpile-text-font-family;
     font-weight: normal;
     font-size: 18px;
-    line-height: 24px;    
+    line-height: 24px;
   }