Saving changes to main files and minor tag list tweaks

mailpile · Jan 3, 2014 · 69d9974 · 69d9974
1 parent d34baa2
commit 69d9974
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/static/default/css/default.css b/static/default/css/default.css
@@ -3864,14 +3864,14 @@ body {
 a,
 a:visited {
   font-size: 14px;
-  color: #a31304;
+  color: #4d4d4d;
   font-weight: bold;
   text-decoration: none;
   outline: 0;
 }
 a:hover,
 a:focus {
-  color: #710d03;
+  color: #a31304;
   text-decoration: none;
 }
 p a,
@@ -5768,6 +5768,21 @@ x:-o-prefocus,
   font-size: 18px;
 }
 /* Contact - View */
+#contact-view {
+  margin-bottom: 100px;
+}
+#contact-view .contact-avatar {
+  display: block;
+  margin-right: 20px;
+}
+#contact-view .contact-name {
+  margin-bottom: 5px;
+}
+#contact-view .contact-subname {
+  display: block;
+  float: left;
+  color: #b3b3b3;
+}
 /* FIXME: Belongs in the .css, here for testing */
 .tag_new_0 .navigation-attention-important {
   display: none;
@@ -6497,10 +6512,12 @@ a.compose-show-field {
 }
 /* Thread */
 #thread-messages .icon-encrypted,
+#thread-message .icon-encrypted,
 #thread-reply .icon-encrypted {
   color: #4b7945;
 }
 #thread-messages .icon-unencrypted,
+#thread-message .icon-unencrypted,
 #thread-reply .icon-unencrypted {
   color: #fbb03b;
 }
@@ -6530,10 +6547,11 @@ a.compose-show-field {
 }
 /* Thread Items */
 .thread-item {
-  padding: 10px 15px 15px 15px;
   border-bottom: 1px solid #b3b3b3;
 }
 .thread-item-from {
+  margin-top: 10px;
+  margin-left: 15px;
   display: inline-block;
 }
 .thread-item-from a.avatar {
@@ -6553,6 +6571,10 @@ a.compose-show-field {
   float: left;
   font-size: 14px;
 }
+.thread-item-details {
+  margin-top: 10px;
+  margin-right: 15px;
+}
 .thread-item-details span.datetime {
   display: block;
   text-align: right;
@@ -6578,10 +6600,22 @@ a.compose-show-field {
   color: #4d4d4d;
 }
 .thread-item-text {
+  margin-left: 15px;
+  margin-right: 15px;
   font-family: Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 18px;
 }
+#thread-message {
+  border-bottom: 1px solid #b3b3b3;
+}
+.thread-item-encrypted-data {
+  font-size: 11px;
+  font-family: Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  color: #4b7945;
+  text-transform: uppercase;
+}
 /* Thread Reply */
 #thread-reply {
   min-height: 225px;

diff --git a/static/default/html/tag/list.html b/static/default/html/tag/list.html
@@ -8,9 +8,9 @@
   {% for tag in result.tags %}
   {% if tag.display == "tag" %}
   <div class="tag-card" id="tag-card-{{tag.tid}}" data-count_not_tagged="{{tag.stats.not}}">
-    <span class="tag-card-name">{{tag.name}}</span>
+    <a class="tag-card-name" href="{{tag.url}}">{{tag.name}}</a>
     <div class="tag-card-numbers">
-      <div class="tag-card-stat">      
+      <div class="tag-card-stat">
         <span class="tag-card-label">{{_("Total")}}</span>
         <span class="tag-card-stat-count">{{tag.stats.all}}</span>
       </div>
@@ -20,12 +20,17 @@
         <span class="tag-card-stat-count">{{tag.stats.new}}</span>
         {% endif %}
       </div>
+      <div class="tag-card-view">
+        <span class="tag-card-label">{{_("View")}}</span>
+        <span class="icon-list"></span>
+      </div>
     </div>
-    <a class="tag-card-message-link" href="{{tag.url}}">{{_("View Messages")}}</a>
+    <a class="tag-card-message-link" href="{{tag.url}}"><span class="icon-inbox"></span> {{_("View Messages")}}</a>
+    <a href="/tag/{{tag.slug}}/"><span class="icon-settings"></span> {{_("Settings")}}</a>
   </div>
   {% endif %}
   {% endfor %}
-  
+
 </div>
 
 

diff --git a/static/default/less/config.less b/static/default/less/config.less
@@ -77,8 +77,8 @@
 
 	@link-font-size: 14px;
 	@link-font-wieght: bold;
-	@link-color: @red;
-	@link-color-hover: darken(@red, 10%);
+	@link-color: @grayDark;
+	@link-color-hover: @red;
 	@link-decoration: none;
 	@link-decoration-hover: none;