Commit ff1f0907 by Kyle Fiedler

Added more fixes for askbot also fixed some of the extra padding

parent 0804ff7a
...@@ -10,7 +10,6 @@ div.book-wrapper { ...@@ -10,7 +10,6 @@ div.book-wrapper {
font-size: em(14); font-size: em(14);
.chapter-number { .chapter-number {
} }
.chapter { .chapter {
...@@ -81,9 +80,8 @@ div.book-wrapper { ...@@ -81,9 +80,8 @@ div.book-wrapper {
section.book { section.book {
@extend .content; @extend .content;
padding-bottom: 0;
padding-right: 0; padding-right: 0;
padding-top: 0; padding-left: lh();
nav { nav {
@extend .clearfix; @extend .clearfix;
......
...@@ -12,10 +12,13 @@ h1.top-header { ...@@ -12,10 +12,13 @@ h1.top-header {
@include box-shadow(inset 0 1px 0 #fff); @include box-shadow(inset 0 1px 0 #fff);
color: #666; color: #666;
cursor: pointer; cursor: pointer;
font: normal $body-font-size $body-font-family; font: 400 $body-font-size $body-font-family;
@include linear-gradient(#fff, lighten(#888, 40%)); @include linear-gradient(#fff, lighten(#888, 40%));
padding: 4px 8px; padding: 4px 8px;
text-decoration: none; text-decoration: none;
text-shadow: none;
text-transform: none;
letter-spacing: 0;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
&:hover, &:focus { &:hover, &:focus {
...@@ -28,7 +31,7 @@ h1.top-header { ...@@ -28,7 +31,7 @@ h1.top-header {
.content { .content {
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
padding: lh(); padding-right: lh();
vertical-align: top; vertical-align: top;
width: flex-grid(9) + flex-gutter(); width: flex-grid(9) + flex-gutter();
......
...@@ -12,7 +12,8 @@ div.course-wrapper { ...@@ -12,7 +12,8 @@ div.course-wrapper {
section.course-content { section.course-content {
@extend .content; @extend .content;
@include border-radius(0 4px 4px 0); padding-right: 0;
padding-left: lh();
h1 { h1 {
margin: 0 0 lh(); margin: 0 0 lh();
......
...@@ -7,9 +7,16 @@ div.answer-controls { ...@@ -7,9 +7,16 @@ div.answer-controls {
padding-left: flex-grid(1.1); padding-left: flex-grid(1.1);
width: 100%; width: 100%;
div.answer-count { div.answer-count {
display: inline-block; display: inline-block;
float: left; float: left;
h1 {
margin-bottom: 0;
font-size: em(24);
font-weight: 100;
}
} }
div.answer-sort { div.answer-sort {
...@@ -18,7 +25,7 @@ div.answer-controls { ...@@ -18,7 +25,7 @@ div.answer-controls {
nav { nav {
float: right; float: right;
margin-top: 34px; margin-top: 10px;
a { a {
&.on span{ &.on span{
...@@ -44,8 +51,9 @@ div.answer-block { ...@@ -44,8 +51,9 @@ div.answer-block {
width: 100%; width: 100%;
img.answer-img-accept { img.answer-img-accept {
margin: 10px 0px 10px 16px; margin: 10px 0px 10px 11px;
} }
div.answer-container { div.answer-container {
@extend div.question-container; @extend div.question-container;
...@@ -130,17 +138,19 @@ div.answer-own { ...@@ -130,17 +138,19 @@ div.answer-own {
div.answer-actions { div.answer-actions {
margin: 0; margin: 0;
padding:8px 8px 8px 0; padding:8px 0 8px 8px;
text-align: right; text-align: right;
border-top: 1px solid #efefef; border-top: 1px solid #efefef;
span.sep { span.sep {
color: #EDDFAA; color: $border-color;
} }
a { a {
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
@extend a:link;
font-size: em(14);
} }
} }
...@@ -22,6 +22,8 @@ div#award-list{ ...@@ -22,6 +22,8 @@ div#award-list{
} }
ul.badge-list { ul.badge-list {
padding-left: 0;
li.badge { li.badge {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
@extend .clearfix; @extend .clearfix;
...@@ -70,12 +72,17 @@ ul.badge-list { ...@@ -70,12 +72,17 @@ ul.badge-list {
.bronze, .badge3 { .bronze, .badge3 {
color: #cc9933; color: #cc9933;
} }
div.badge-desc {
> div { div.discussion-wrapper aside {
margin-bottom: 20px; div.badge-desc {
span { border-top: 0;
font-size: 18px;
@include border-radius(10px); > div {
} margin-bottom: 20px;
span {
font-size: 18px;
@include border-radius(10px);
}
}
} }
} }
...@@ -8,7 +8,7 @@ body.askbot { ...@@ -8,7 +8,7 @@ body.askbot {
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
min-width: 650px; min-width: 650px;
padding: lh(); padding-right: lh();
vertical-align: top; vertical-align: top;
width: flex-grid(9) + flex-gutter(); width: flex-grid(9) + flex-gutter();
......
...@@ -5,6 +5,11 @@ form.answer-form { ...@@ -5,6 +5,11 @@ form.answer-form {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
overflow: hidden; overflow: hidden;
padding-left: flex-grid(1.1); padding-left: flex-grid(1.1);
padding-top: lh();
p {
margin-bottom: lh();
}
textarea { textarea {
@include box-sizing(border-box); @include box-sizing(border-box);
...@@ -121,7 +126,6 @@ form.question-form { ...@@ -121,7 +126,6 @@ form.question-form {
border: none; border: none;
padding: 15px 0 0 0; padding: 15px 0 0 0;
input[type="text"] { input[type="text"] {
@include box-sizing(border-box); @include box-sizing(border-box);
width: flex-grid(6); width: flex-grid(6);
...@@ -131,6 +135,11 @@ form.question-form { ...@@ -131,6 +135,11 @@ form.question-form {
margin-top: 10px; margin-top: 10px;
} }
input[value="Cancel"] {
@extend .light-button;
float: right;
}
div#question-list { div#question-list {
background-color: rgba(255,255,255,0.95); background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box); @include box-sizing(border-box);
......
...@@ -68,16 +68,18 @@ div.question-header { ...@@ -68,16 +68,18 @@ div.question-header {
h1 { h1 {
margin-top: 0; margin-top: 0;
font-weight: 100; font-weight: 100;
line-height: 1.1em;
a { a {
font-weight: 100; font-weight: 100;
line-height: 1.1em;
} }
} }
div.meta-bar { div.meta-bar {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
display: block; display: block;
margin: 10px 0; margin: lh(.5) 0 lh();
overflow: hidden; overflow: hidden;
padding: 5px 0 10px; padding: 5px 0 10px;
...@@ -158,7 +160,7 @@ div.question-header { ...@@ -158,7 +160,7 @@ div.question-header {
} }
div.change-date { div.change-date {
font-size: 12px; font-size: em(14);
margin-bottom: 2px; margin-bottom: 2px;
} }
...@@ -182,13 +184,13 @@ div.question-header { ...@@ -182,13 +184,13 @@ div.question-header {
display: inline-block; display: inline-block;
padding: 0 0 3% 0; padding: 0 0 3% 0;
width: 100%; width: 100%;
margin-top: lh(2);
div.comments-content { div.comments-content {
font-size: 13px; border-top: 1px solid lighten($border-color, 10%);
background: #efefef;
.block { .block {
border-top: 1px solid #ddd; border-top: 1px solid lighten($border-color, 10%);
padding: 15px; padding: 15px;
display: block; display: block;
...@@ -200,10 +202,10 @@ div.question-header { ...@@ -200,10 +202,10 @@ div.question-header {
padding-top: 10px; padding-top: 10px;
span.official-comment { span.official-comment {
background: $mit-red; background: $pink;
color: #fff; color: #fff;
display: block; display: block;
font-size: 12px; font-size: em(12);
margin: 0 0 10px -5%; margin: 0 0 10px -5%;
padding:2px 5px 2px 5%; padding:2px 5px 2px 5%;
text-align: left; text-align: left;
...@@ -215,6 +217,10 @@ div.question-header { ...@@ -215,6 +217,10 @@ div.question-header {
form.post-comments { form.post-comments {
padding: 15px; padding: 15px;
button {
color: #fff;
}
button:last-child { button:last-child {
margin-left: 10px; margin-left: 10px;
@extend .light-button; @extend .light-button;
...@@ -235,7 +241,6 @@ div.question-header { ...@@ -235,7 +241,6 @@ div.question-header {
border: none; border: none;
@include box-shadow(none); @include box-shadow(none);
display: inline-block; display: inline-block;
margin-top: -8px;
padding:0 2% 0 0; padding:0 2% 0 0;
text-align: center; text-align: center;
width: 5%; width: 5%;
...@@ -281,16 +286,14 @@ div.question-header { ...@@ -281,16 +286,14 @@ div.question-header {
} }
div.comment-delete { div.comment-delete {
// display: inline; @extend a:link;
color: $mit-red;
cursor: pointer; cursor: pointer;
font-size: 15px;
} }
div.comment-edit { div.comment-edit {
@include transform(rotate(50deg)); @include transform(rotate(50deg));
cursor: pointer; cursor: pointer;
font-size: 16px;
a.edit-icon { a.edit-icon {
color: #555; color: #555;
text-decoration: none; text-decoration: none;
...@@ -308,13 +311,13 @@ div.question-header { ...@@ -308,13 +311,13 @@ div.question-header {
div.comment-meta { div.comment-meta {
text-align: right; text-align: right;
margin-top: lh(.5);
a.author { a.author {
font-weight: bold; font-weight: bold;
} }
a.edit { a.edit {
font-size: 12px;
padding: 2px 10px; padding: 2px 10px;
} }
} }
...@@ -341,7 +344,6 @@ div.question-header { ...@@ -341,7 +344,6 @@ div.question-header {
a { a {
display: inline-block; display: inline-block;
font-size: 12px;
margin: 10px 10px 10px 0; margin: 10px 10px 10px 0;
} }
} }
......
// Styles for the default question list view // Styles for the default question list view
div.question-list-header { div.question-list-header {
@extend h1.top-header;
display: block; display: block;
margin-bottom: 0px; margin-bottom: 0px;
padding-bottom: lh(.5);
overflow: hidden; overflow: hidden;
width: flex-grid(9,9); width: flex-grid(9,9);
@extend h1.top-header;
h1 { h1 {
margin: 0; margin: 0;
font-size: 1em; font-size: 1em;
font-weight: 100; font-weight: 100;
padding-bottom: lh(.5);
> a.light-button { > a.light-button {
float: right; float: right;
font-size: em(14, 24);
letter-spacing: 0;
font-weight: 400;
} }
} }
...@@ -87,6 +92,7 @@ div.question-list-header { ...@@ -87,6 +92,7 @@ div.question-list-header {
a { a {
color: #555; color: #555;
font-size: em(14, 24);
} }
} }
...@@ -95,12 +101,10 @@ div.question-list-header { ...@@ -95,12 +101,10 @@ div.question-list-header {
} }
ul.tags { ul.tags {
li { span, div {
background: #fff; line-height: 1em;
margin-left: 6px;
&:before { cursor: pointer;
border-color: transparent #fff transparent transparent;
}
} }
} }
} }
...@@ -155,6 +159,7 @@ ul.question-list, div#question-list { ...@@ -155,6 +159,7 @@ ul.question-list, div#question-list {
span.relative-time { span.relative-time {
font-weight: normal; font-weight: normal;
line-height: lh();
} }
} }
......
...@@ -264,24 +264,16 @@ div.discussion-wrapper aside { ...@@ -264,24 +264,16 @@ div.discussion-wrapper aside {
} }
div.question-tips, div.markdown { div.question-tips, div.markdown {
ul { ul,
margin-left: 8%;
}
ol { ol {
margin-left: 8%;
}
}
div.markdown ul li {
margin: 20px 0;
&:first-child {
margin: 0; margin: 0;
} padding: 0;
ol li { li {
margin: 0; border-bottom: 0;
line-height: lh();
margin-bottom: em(8);
}
} }
} }
......
...@@ -42,6 +42,7 @@ textarea { ...@@ -42,6 +42,7 @@ textarea {
input[type="submit"], input[type="submit"],
input[type="button"], input[type="button"],
button,
.button { .button {
@include border-radius(3px); @include border-radius(3px);
@include button(shiny, $blue); @include button(shiny, $blue);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment