Merge pull request #35 from WDI-HK-7/homefeedbranch

fix profile page styling and fix profile link bug in issue #34
WDI-HK-7 · May 27, 2015 · bf2c92f · bf2c92f
2 parents 9a81e23 + 338e074
commit bf2c92f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss
@@ -1,5 +1,4 @@
 #profile-posts {
-  font-size: 18px;
   width: auto;
   height: auto;
 }
@@ -15,6 +14,9 @@
   height: 150px;
 }
 
+.avatar-container {
+  border-right: 1px solid black;
+}
 
 .user-profile-info {
   margin: 0 auto;

diff --git a/app/assets/templates/users/profile.html b/app/assets/templates/users/profile.html
@@ -43,7 +43,7 @@
           <div class="user-profile-info col-xs-12 col-sm-8 col-sm-offset-2" ng-controller="GetProfileInfoCtrl">
             <div class="col-xs-12">
               <div class="avatar-container col-xs-4">
-                <img ng-src="{{ profile.avatar }}" class="img-responsive" id="profile-avatar">
+                <img ng-src="{{ profile.avatar }}" class="img-responsive img-rounded" id="profile-avatar">
               </div>
               <div class="profile-name-content col-xs-8">
                 Name: 
@@ -54,7 +54,7 @@
                 {{ profile.username }}
                 <br>
                 <br>
-                Description: <br>
+                Summary: <br>
                 {{ profile.content }}
                 <br>
               </div>