Round all profile images per #37

mbillow · mbillow · commit f2cf038e1e77 · 2016-08-23T16:51:13.000-04:00
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
@@ -7,11 +7,11 @@
     <div class="panel panel-default">
         <div class="panel-body dashboard-user">
             <div class="row">
-                <div class="col-md-2 col-sm-3 col-xs-12 vcenter">
+                <div class="col-md-2 col-sm-3 col-xs-12 vcenter profile-container">
                     <img class="profile-image" src="https://profiles.csh.rit.edu/image/{{username}}">
                 </div>
-                <div class="col-xs-12 col-sm-9 col-md-9 vcenter" style="padding-bottom:10px">
-                    <h2 class="username">{{name}}</h2>
+                <div class="col-xs-12 col-sm-9 col-md-9 vcenter profile-container">
+                    <h3 class="username">{{name}}</h3>
                     <h5 class="email">{{username}}@csh.rit.edu</h5>
                     <div class="profile-badges">
                         {% if active %}
diff --git a/frontend/stylesheets/pages/_dashboard.scss b/frontend/stylesheets/pages/_dashboard.scss
@@ -1,16 +1,16 @@
 .dashboard-user {
   .profile-image {
-    border-radius: 2px;
+    border-radius: 200px;
+    padding: 10px;
     width: 100%;
-    max-width: 200px;
+    max-width: 150px;
   }
   .panel-inner-padding {
     padding-right: 10px;
     padding-bottom: 10px;
     padding-left: 10px;
   }
   .username {
-    margin-top: 15px;
     margin-bottom: 5px;
   }
   .email {
@@ -27,3 +27,7 @@
     width: 49%;
   }
 }
+
+.profile-container {
+  padding: 0 0 0 15px;
+}
diff --git a/frontend/stylesheets/pages/_evals.scss b/frontend/stylesheets/pages/_evals.scss
@@ -14,7 +14,7 @@
 }
 
 .eval-user-img {
-  border-radius: 5px;
+  border-radius: 200px;
 }
 
 .eval-panel {
diff --git a/frontend/stylesheets/partials/_responsive.scss b/frontend/stylesheets/partials/_responsive.scss
@@ -15,9 +15,6 @@
 }
 
 @media(min-width: 768px) {
-  .profile-image {
-    float: right;
-  }
   hr {
     margin-top: 10px;
   }

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`.dashboard-user {`
`2`	`2`	`.profile-image {`
`3`		`- border-radius: 2px;`
	`3`	`+ border-radius: 200px;`
	`4`	`+ padding: 10px;`
`4`	`5`	`width: 100%;`
`5`		`- max-width: 200px;`
	`6`	`+ max-width: 150px;`
`6`	`7`	`}`
`7`	`8`	`.panel-inner-padding {`
`8`	`9`	`padding-right: 10px;`
`9`	`10`	`padding-bottom: 10px;`
`10`	`11`	`padding-left: 10px;`
`11`	`12`	`}`
`12`	`13`	`.username {`
`13`		`- margin-top: 15px;`
`14`	`14`	`margin-bottom: 5px;`
`15`	`15`	`}`
`16`	`16`	`.email {`
`@@ -27,3 +27,7 @@`
`27`	`27`	`width: 49%;`
`28`	`28`	`}`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+.profile-container {`
	`32`	`+ padding: 0 0 0 15px;`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`.eval-user-img {`
`17`		`- border-radius: 5px;`
	`17`	`+ border-radius: 200px;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`.eval-panel {`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,6 @@`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@media(min-width: 768px) {`
`18`		`- .profile-image {`
`19`		`- float: right;`
`20`		`- }`
`21`	`18`	`hr {`
`22`	`19`	`margin-top: 10px;`
`23`	`20`	`}`