diff --git a/main.html b/main.html
index 567f41b1db..4652fa7046 100644
--- a/main.html
+++ b/main.html
@@ -1,7 +1,7 @@
- <%block name="title">MITx 6.002
+ <%block name="title">MITx 6.002x
diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss
index 1bed0076f4..75ced3d66e 100644
--- a/sass/discussion/_askbot-original.scss
+++ b/sass/discussion/_askbot-original.scss
@@ -107,9 +107,9 @@
// height: 0;
// visibility: hidden; }
-.badges a {
- color: #763333;
- text-decoration: underline; }
+// .badges a {
+// color: #763333;
+// text-decoration: underline; }
// a:hover {
// text-decoration: underline; }
@@ -1846,27 +1846,27 @@ body.anon #searchbar {
// width: 270px;
// margin-bottom: 15px; }
-a {
- &.medal {
- font-size: 17px;
- line-height: 250%;
- margin-right: 5px;
- color: #333;
- text-decoration: none;
- background: url(../images/medala.gif) no-repeat;
- border-left: 1px solid #eee;
- border-top: 1px solid #eee;
- border-bottom: 1px solid #ccc;
- border-right: 1px solid #ccc;
- padding: 4px 12px 4px 6px; }
- &:hover.medal {
- color: #333;
- text-decoration: none;
- background: url(../images/medala_on.gif) no-repeat;
- border-left: 1px solid #e7e296;
- border-top: 1px solid #e7e296;
- border-bottom: 1px solid #d1ca3d;
- border-right: 1px solid #d1ca3d; } }
+// a {
+// &.medal {
+// font-size: 17px;
+// line-height: 250%;
+// margin-right: 5px;
+// color: #333;
+// text-decoration: none;
+// background: url(../images/medala.gif) no-repeat;
+// border-left: 1px solid #eee;
+// border-top: 1px solid #eee;
+// border-bottom: 1px solid #ccc;
+// border-right: 1px solid #ccc;
+// padding: 4px 12px 4px 6px; }
+// &:hover.medal {
+// color: #333;
+// text-decoration: none;
+// background: url(../images/medala_on.gif) no-repeat;
+// border-left: 1px solid #e7e296;
+// border-top: 1px solid #e7e296;
+// border-bottom: 1px solid #d1ca3d;
+// border-right: 1px solid #d1ca3d; } }
#award-list .user {
float: left;
diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss
index f1dbe1be91..394107a57a 100644
--- a/sass/discussion/_profile.scss
+++ b/sass/discussion/_profile.scss
@@ -1,9 +1,35 @@
body.user-profile-page {
section.user-info {
// @extend .sidebar;
- h1 {
- @extend h2;
- margin-top: 0;
+ header {
+ @extend .clearfix;
+ section {
+ float: left;
+ width: flex-grid(2, 3);
+ margin-right: flex-gutter(3);
+
+ h1 {
+ @extend h2;
+ margin-top: 0;
+ }
+ }
+
+ p.karma {
+ float: left;
+ width: flex-grid(1, 3);
+ border: 1px solid #D3D3D3;
+ @include border-radius(3px);
+ @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff);
+ background: #eee;
+ text-align: center;
+ padding: lh(.5) 0;
+
+
+ strong {
+ display: block;
+ font-style: 20px;
+ }
+ }
}
}
@@ -37,10 +63,58 @@ body.user-profile-page {
h2 {
margin-top: 0;
}
+
+ span.tag-number {
+ display: none;
+ }
}
- ul.user-stats-table {
+ ul {
list-style: none;
+
+ &.user-stats-table {
+ list-style: none;
+ }
+
+ &.vote-buttons {
+ list-style: none;
+
+ li {
+ @include border-radius(4px);
+ background-color: lighten(#F6EFD4, 3%);
+ background-position: 10px center;
+ background-repeat: no-repeat;
+ height: 20px;
+ padding: 10px 10px 10px 40px;
+ display: inline-block;
+
+ &.up {
+ background-image: url(/static/images/askbot/vote-arrow-up.png);
+ margin-right: 6px;
+ }
+
+ &.down {
+ background-image: url(/static/images/askbot/vote-arrow-down.png);
+ }
+ }
+ }
+
+ &.badges {
+ @include border-radius(4px);
+ background-color: #e3e3e3;
+ @include inline-block();
+
+ a {
+ border: 0;
+ background: none;
+ text-transform: uppercase;
+ color: #292309;
+ font-size: 12px;
+ padding: 10px;
+ text-shadow: 0 1px 0 #fff;
+ display: block;
+ }
+ }
}
}
}