From c8ed33fdea1472f998460f4d126b0b96656eb2da Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 14 Jan 2016 16:17:44 -0300
Subject: [PATCH] Improve text colors

---
 src/app/components/noosfero-articles/article/article.html           | 36 +++++++++++++++++++-----------------
 src/app/components/noosfero-articles/article/article.scss           | 22 ++++++++++++----------
 src/app/components/noosfero-articles/blog/blog.html                 | 26 ++++++++++++++------------
 src/app/components/noosfero-articles/blog/blog.scss                 | 24 +++++++++++++-----------
 src/app/components/noosfero-blocks/link-list/link-list.html         | 10 ++++++----
 src/app/components/noosfero-blocks/link-list/link-list.scss         |  7 +++++++
 src/app/components/noosfero-blocks/profile-image/profile-image.html | 14 +++++---------
 src/app/components/noosfero-blocks/profile-image/profile-image.scss |  6 +++---
 src/app/components/noosfero/profile-image/profile-image.html        |  4 ++--
 src/app/components/noosfero/profile-image/profile-image.scss        |  3 +++
 src/app/index.scss                                                  |  6 ++++++
 11 files changed, 90 insertions(+), 68 deletions(-)
 create mode 100644 src/app/components/noosfero/profile-image/profile-image.scss

diff --git a/src/app/components/noosfero-articles/article/article.html b/src/app/components/noosfero-articles/article/article.html
index ab4d1d7..be3cbee 100644
--- a/src/app/components/noosfero-articles/article/article.html
+++ b/src/app/components/noosfero-articles/article/article.html
@@ -1,21 +1,23 @@
-<div class="page-header">
-  <h3 ng-bind="vm.article.title"></h3>
-</div>
+<div class="article">
+  <div class="page-header">
+    <h3 ng-bind="vm.article.title"></h3>
+  </div>
 
-<div class="sub-header clearfix">
-  <div class="page-info pull-right small text-muted">
-    <span class="time">
-      <i class="fa fa-clock-o"></i> <span am-time-ago="vm.article.created_at"></span>
-    </span>
-    <span class="author" ng-if="vm.article.author">
-      <i class="fa fa-user"></i>
-      <a ui-sref="main.profile({profile: vm.article.author.identifier})">
-        <span class="author-name" ng-bind="vm.article.author.name"></span>
-      </a>
-    </span>
+  <div class="sub-header clearfix">
+    <div class="page-info pull-right small text-muted">
+      <span class="time">
+        <i class="fa fa-clock-o"></i> <span am-time-ago="vm.article.created_at"></span>
+      </span>
+      <span class="author" ng-if="vm.article.author">
+        <i class="fa fa-user"></i>
+        <a ui-sref="main.profile({profile: vm.article.author.identifier})">
+          <span class="author-name" ng-bind="vm.article.author.name"></span>
+        </a>
+      </span>
+    </div>
   </div>
-</div>
 
-<div class="page-body">
-  <div ng-bind-html="vm.article.body"></div>
+  <div class="page-body">
+    <div ng-bind-html="vm.article.body"></div>
+  </div>
 </div>
diff --git a/src/app/components/noosfero-articles/article/article.scss b/src/app/components/noosfero-articles/article/article.scss
index e747702..59b91e2 100644
--- a/src/app/components/noosfero-articles/article/article.scss
+++ b/src/app/components/noosfero-articles/article/article.scss
@@ -1,15 +1,17 @@
-.page-info {
-  .author {
-    a {
-      color: #b4bcc2;
+.article {
+  .page-info {
+    .author {
+      a {
+        color: #b4bcc2;
+      }
     }
   }
-}
 
-.page-header {
-    margin-bottom: 5px;
-}
+  .page-header {
+      margin-bottom: 5px;
+  }
 
-.sub-header {
-  margin-bottom: 20px;
+  .sub-header {
+    margin-bottom: 20px;
+  }
 }
diff --git a/src/app/components/noosfero-articles/blog/blog.html b/src/app/components/noosfero-articles/blog/blog.html
index c7f432f..336fc09 100644
--- a/src/app/components/noosfero-articles/blog/blog.html
+++ b/src/app/components/noosfero-articles/blog/blog.html
@@ -1,17 +1,19 @@
-<div class="blog-cover" ng-show="vm.article.image">
-  <img ng-src="{{vm.article.image.url}}" class="img-responsive">
-  <h3 ng-bind="vm.article.title"></h3>
-</div>
+<div class="blog">
+  <div class="blog-cover" ng-show="vm.article.image">
+    <img ng-src="{{vm.article.image.url}}" class="img-responsive">
+    <h3 ng-bind="vm.article.title"></h3>
+  </div>
 
-<div class="page-header" ng-show="!vm.article.image">
-  <h3 ng-bind="vm.article.title"></h3>
-</div>
+  <div class="page-header" ng-show="!vm.article.image">
+    <h3 ng-bind="vm.article.title"></h3>
+  </div>
 
-<div>
-  <div ng-repeat="child in vm.article.children | orderBy: 'created_at':true">
-    <div class="page-header">
-      <a ui-sref="main.profile.page({profile: vm.profile.identifier, page: child.path})"><h4 ng-bind="child.title"></h4></a>
-      <div ng-bind-html="child.body | truncate: 500: '...'"></div>
+  <div>
+    <div ng-repeat="child in vm.article.children | orderBy: 'created_at':true">
+      <div class="page-header">
+        <a class="title" ui-sref="main.profile.page({profile: vm.profile.identifier, page: child.path})"><h4 ng-bind="child.title"></h4></a>
+        <div class="post-lead" ng-bind-html="child.body | truncate: 500: '...'"></div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/components/noosfero-articles/blog/blog.scss b/src/app/components/noosfero-articles/blog/blog.scss
index 9c78d8b..8d59d13 100644
--- a/src/app/components/noosfero-articles/blog/blog.scss
+++ b/src/app/components/noosfero-articles/blog/blog.scss
@@ -1,13 +1,15 @@
-.blog-cover {
-  margin: -15px;
-  position: relative;
-  h3 {
-    position: absolute;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.4);
-    color: white;
-    padding: 10px 15px;
-    margin: 0;
-    width: 100%;
+.blog {
+  .blog-cover {
+    margin: -15px;
+    position: relative;
+    h3 {
+      position: absolute;
+      bottom: 0;
+      background-color: rgba(0, 0, 0, 0.4);
+      color: white;
+      padding: 10px 15px;
+      margin: 0;
+      width: 100%;
+    }
   }
 }
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.html b/src/app/components/noosfero-blocks/link-list/link-list.html
index c89975a..327bb37 100644
--- a/src/app/components/noosfero-blocks/link-list/link-list.html
+++ b/src/app/components/noosfero-blocks/link-list/link-list.html
@@ -1,5 +1,7 @@
-<div ng-repeat="link in vm.links">
-  <a ng-href="{{link.address | noosferoTemplateFilter:{profile: vm.owner.identifier} }}">
-    <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
-  </a>
+<div class="link-list-block">
+  <div ng-repeat="link in vm.links">
+    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: vm.owner.identifier} }}">
+      <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
+    </a>
+  </div>
 </div>
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.scss b/src/app/components/noosfero-blocks/link-list/link-list.scss
index f18c73c..bd60824 100644
--- a/src/app/components/noosfero-blocks/link-list/link-list.scss
+++ b/src/app/components/noosfero-blocks/link-list/link-list.scss
@@ -25,3 +25,10 @@
 .icon-save {
   @extend .fa-save;
 }
+
+.link-list-block {
+  a i {
+    line-height: 25px;
+    color: #949494;
+  }
+}
diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.html b/src/app/components/noosfero-blocks/profile-image/profile-image.html
index 2217706..3636a39 100644
--- a/src/app/components/noosfero-blocks/profile-image/profile-image.html
+++ b/src/app/components/noosfero-blocks/profile-image/profile-image.html
@@ -1,10 +1,6 @@
-<div class="center-block text-center">
-  <div class="profile-image">
-    <a ui-sref="main.profile.info({profile: vm.owner.identifier})">
-      <noosfero-profile-image profile="vm.owner"></noosfero-profile-image>
-    </a>
-  </div>
-  <div class='admin-link'>
-    <a target="_self" ui-sref="main.profile.settings({profile: vm.owner.identifier})">Control panel</a>
-  </div>
+<div class="center-block text-center profile-image-block">
+  <a ui-sref="main.profile.info({profile: vm.owner.identifier})">
+    <noosfero-profile-image profile="vm.owner"></noosfero-profile-image>
+  </a>
+  <a class="settings-link" target="_self" ui-sref="main.profile.settings({profile: vm.owner.identifier})">Control panel</a>
 </div>
diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.scss b/src/app/components/noosfero-blocks/profile-image/profile-image.scss
index 4971ae3..a609250 100644
--- a/src/app/components/noosfero-blocks/profile-image/profile-image.scss
+++ b/src/app/components/noosfero-blocks/profile-image/profile-image.scss
@@ -1,5 +1,5 @@
-.profile-image {
-  i {
-    color: rgb(44, 62, 80);  
+.profile-image-block {
+  .settings-link {
+    display: block;
   }
 }
diff --git a/src/app/components/noosfero/profile-image/profile-image.html b/src/app/components/noosfero/profile-image/profile-image.html
index df143c4..32cfbf1 100644
--- a/src/app/components/noosfero/profile-image/profile-image.html
+++ b/src/app/components/noosfero/profile-image/profile-image.html
@@ -1,2 +1,2 @@
-<img ng-if="vm.profile.image" ng-src="{{vm.profile.image.url}}" class="img-responsive">
-<i ng-if="!vm.profile.image" class="fa {{vm.defaultIcon}} fa-5x"></i>
+<img ng-if="vm.profile.image" ng-src="{{vm.profile.image.url}}" class="img-responsive profile-image">
+<i ng-if="!vm.profile.image" class="fa {{vm.defaultIcon}} fa-5x profile-image"></i>
diff --git a/src/app/components/noosfero/profile-image/profile-image.scss b/src/app/components/noosfero/profile-image/profile-image.scss
new file mode 100644
index 0000000..f2f8fb8
--- /dev/null
+++ b/src/app/components/noosfero/profile-image/profile-image.scss
@@ -0,0 +1,3 @@
+i.profile-image {
+  color: rgb(44, 62, 80);  
+}
diff --git a/src/app/index.scss b/src/app/index.scss
index 772c2ee..389493d 100644
--- a/src/app/index.scss
+++ b/src/app/index.scss
@@ -9,6 +9,8 @@ $fa-font-path: "../../bower_components/font-awesome/fonts";
 
 $navbar-height: 50px;
 $brand-success: #1E96D0;
+$text-color: #676767;
+$panel-default-text: rgb(44, 62, 80);
 $link-color: #007EBB;
 $body-bg: #f5f8fa;
 $page-header-border-color: #eee;
@@ -36,6 +38,10 @@ $page-header-border-color: #eee;
   }
 }
 
+h1, h2, h3, h4, h5 {
+  color: #237394;
+}
+
 /**
  *  Do not remove the comments below. It's the markers used by gulp-inject to inject
  *  all your sass files automatically
--
libgit2 0.21.2