diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 3ff1194bdd..793fa9234a 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -1,41 +1,4 @@ body.user-profile-page { - section.user-info { - // @extend .sidebar; - header { - @extend .clearfix; - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - padding: 0 lh(); - margin: 0 (-(lh())) lh(); - - section { - float: left; - width: flex-grid(2, 3); - margin-right: flex-gutter(3); - - h1 { - 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; - } - } - } - } section.questions { h1 { @@ -44,12 +7,11 @@ body.user-profile-page { } ul.sub-info { - border-top: 1px solid #ddd; + // border-top: 1px solid #ddd; margin-top: lh(); list-style: none; > li { - width: flex-grid(2.25, 9); display: table-cell; padding: (flex-gutter(9)/2); border-right: 1px solid #ddd; @@ -64,7 +26,21 @@ body.user-profile-page { padding-right: 0; } + &.votes-badges { + width: flex-grid(2,9); + + } + + &.answer-list { + width: flex-grid(4, 9); + } + + &.tags-list { + width: flex-grid(3,9); + } + h2 { + margin-bottom: 30px; margin-top: 0; } @@ -78,45 +54,67 @@ body.user-profile-page { &.user-stats-table { list-style: none; + + li { + padding: 10px 0 15px; + border-top: 1px solid #eee; + } } &.vote-buttons { list-style: none; + margin-bottom: 30px; li { - @include border-radius(4px); background-color: lighten(#F6EFD4, 3%); background-position: 10px center; background-repeat: no-repeat; + @include border-radius(4px); + display: inline-block; height: 20px; padding: 10px 10px 10px 40px; - display: inline-block; &.up { + background-color:#d1e3a8; background-image: url(/static/images/askbot/vote-arrow-up.png); margin-right: 6px; + + span.vote-count { + color: #3f6c3e; + } } &.down { background-image: url(/static/images/askbot/vote-arrow-down.png); + background-color:#eac6ad; + + span.vote-count { + color: $mit-red; + } + } } } &.badges { - @include border-radius(4px); - background-color: #e3e3e3; @include inline-block(); a { + background-color: #e3e3e3; border: 0; - background: none; - text-transform: uppercase; + @include border-radius(4px); color: #292309; + display: block; font-size: 12px; padding: 10px; + margin-bottom: 10px; text-shadow: 0 1px 0 #fff; - display: block; + text-transform: uppercase; + text-decoration: none; + + &:hover { + background-color: #cdcdcd; + } } } } diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 8a63e35582..1fe95c6efa 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -193,6 +193,64 @@ div.discussion-wrapper aside { } } + div.user-info, div.user-stats { + @extend div.question-stats; + overflow: hidden; + + div { + float: left; + display: block; + } + + div.karma { + background: #eee; + border: 1px solid #D3D3D3; + @include border-radius(3px); + @include box-sizing(border-box); + @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); + padding: lh(.4) 0; + text-align: center; + width: flex-grid(1, 3); + float: right; + + strong { + display: block; + font-style: 20px; + } + } + + div.meta { + width: flex-grid(2,3); + padding-right: flex-gutter(3)*0.5; + @include box-sizing(border-box); + + h2 { + border: 0; + @include box-shadow(none); + margin: 0 0 8px 0; + padding: 0; + } + + p { + color: #777; + font-size: 14px; + } + } + } + + div.user-stats { + overflow: visible; + + ul { + font-size: 14px; + + h2 { + margin:0 (-(lh())) 5px (-(lh())); + padding: lh(.5) lh(); + } + } + } + div.question-tips, div.markdown { ul { margin-left: 8%;