From a3e450985c94444c7a8457f2926e9302dbe68727 Mon Sep 17 00:00:00 2001
From: Melissa Wen <melissa.srw@gmail.com>
Date: Thu, 18 Jun 2015 13:56:17 -0300
Subject: [PATCH] Temp adjusts on blog posts and software pages button and articles

---
 style.css | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/style.css b/style.css
index 03d7131..bb27d3a 100644
--- a/style.css
+++ b/style.css
@@ -2883,16 +2883,64 @@ div.software-step-info div.current-step h3 {
   font-size: 12px !important;
 }
 
-<<<<<<< Updated upstream
-
 /************************* MAIN PAGE REVIEW *******************************/
 
 #content ul li.news-call .title {
     font-weight: 700;
     padding-right: 0px;
 }
-=======
-#search-header{
-  border: 1px solid red !important;
+
+/** Blog temporary adjusts**/
+
+#content .blog-posts{
+  margin-top: 0;
+}
+
+#content .blog-post{
+  background: none;
+}
+
+#content .blog-post h1.title {
+  margin-top: 0 !important;
+}
+
+#content .blog-post .publishing-info{
+  border-top: 1px solid #D7D7D7;
+  padding-top: 25px;
+  margin-top: 25px;
+  font-size: 12px;
+  color: #2C66CE;
+  font-family: arial;
+}
+
+#content .main-block .publishing-info a{
+  color: #2C66CE;
+  font-family: arial;
+}
+
+#content .main-content {
+  border: none;
+  box-shadow: none;
+}
+
+#content .main-block .blog-post p {
+  text-align: justify;
+}
+
+/** Software pages - temporary adjusts **/
+
+.controller-content_viewer.profile-homepage #article hr{
+  display: none;
+}
+
+#content .main-block #article p{
+  text-align: justify;
+}
+
+.action-cms-upload_files #content .main-block .button-bar .icon-add {
+  color: #fff;
+}
+
+.action-cms-upload_files #content .main-block .icon-add:before{
+  display: none;
 }
->>>>>>> Stashed changes
--
libgit2 0.21.2