Commit 731f1cd7 by Kyle Fiedler

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

parent a984fbb6
...@@ -14,7 +14,7 @@ div.video { ...@@ -14,7 +14,7 @@ div.video {
section.video-player { section.video-player {
height: 0; height: 0;
overflow: hidden; // overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;
position: relative; position: relative;
...@@ -45,12 +45,13 @@ div.video { ...@@ -45,12 +45,13 @@ div.video {
div.slider { div.slider {
@extend .clearfix; @extend .clearfix;
background: #c2c2c2; background: #c2c2c2;
border: none; border: 1px solid #000;
border-bottom: 1px solid #000;
@include border-radius(0); @include border-radius(0);
border-top: 1px solid #000; border-top: 1px solid #000;
@include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555); @include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555);
height: 7px; height: 7px;
margin-left: -1px;
margin-right: -1px;
@include transition(height 2.0s ease-in-out); @include transition(height 2.0s ease-in-out);
div.ui-widget-header { div.ui-widget-header {
...@@ -58,43 +59,12 @@ div.video { ...@@ -58,43 +59,12 @@ div.video {
@include box-shadow(inset 0 1px 0 #999); @include box-shadow(inset 0 1px 0 #999);
} }
.ui-tooltip.qtip .ui-tooltip-content {
background: $mit-red;
border: 1px solid darken($mit-red, 20%);
@include border-radius(2px);
@include box-shadow(inset 0 1px 0 lighten($mit-red, 10%));
color: #fff;
font: bold 12px $body-font-family;
margin-bottom: 6px;
margin-right: 0;
overflow: visible;
padding: 4px;
text-align: center;
text-shadow: 0 -1px 0 darken($mit-red, 10%);
-webkit-font-smoothing: antialiased;
&::after {
background: $mit-red;
border-bottom: 1px solid darken($mit-red, 20%);
border-right: 1px solid darken($mit-red, 20%);
bottom: -5px;
content: " ";
display: block;
height: 7px;
left: 50%;
margin-left: -3px;
position: absolute;
@include transform(rotate(45deg));
width: 7px;
}
}
a.ui-slider-handle { a.ui-slider-handle {
background: $mit-red url(../images/slider-handle.png) center center no-repeat; background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%); @include background-size(50%);
border: 1px solid darken($mit-red, 20%); border: 1px solid darken($pink, 20%);
@include border-radius(15px); @include border-radius(15px);
@include box-shadow(inset 0 1px 0 lighten($mit-red, 10%)); @include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer; cursor: pointer;
height: 15px; height: 15px;
margin-left: -7px; margin-left: -7px;
...@@ -103,7 +73,7 @@ div.video { ...@@ -103,7 +73,7 @@ div.video {
width: 15px; width: 15px;
&:focus, &:hover { &:focus, &:hover {
background-color: lighten($mit-red, 10%); background-color: lighten($pink, 10%);
outline: none; outline: none;
} }
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
@import 'base/base'; @import 'base/base';
@import 'base/extends'; @import 'base/extends';
@import 'base/animations'; @import 'base/animations';
@import 'shared/tooltips';
// Course base / layout styles // Course base / layout styles
@import 'course/layout/courseware_subnav'; @import 'course/layout/courseware_subnav';
......
...@@ -15,15 +15,15 @@ div.info-wrapper { ...@@ -15,15 +15,15 @@ div.info-wrapper {
> ol { > ol {
list-style: none; list-style: none;
padding-left: 0;
margin-bottom: lh(); margin-bottom: lh();
padding-left: 0;
> li { > li {
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid lighten($border-color, 10%); border-bottom: 1px solid lighten($border-color, 10%);
list-style-type: disk;
margin-bottom: lh(); margin-bottom: lh();
padding-bottom: lh(.5); padding-bottom: lh(.5);
list-style-type: disk;
&:first-child { &:first-child {
margin: 0 (-(lh(.5))) lh(); margin: 0 (-(lh(.5))) lh();
...@@ -41,10 +41,10 @@ div.info-wrapper { ...@@ -41,10 +41,10 @@ div.info-wrapper {
h2 { h2 {
float: left; float: left;
margin: 0 flex-gutter() 0 0;
width: flex-grid(2, 9);
font-size: $body-font-size; font-size: $body-font-size;
font-weight: bold; font-weight: bold;
margin: 0 flex-gutter() 0 0;
width: flex-grid(2, 9);
} }
section.update-description { section.update-description {
...@@ -68,15 +68,15 @@ div.info-wrapper { ...@@ -68,15 +68,15 @@ div.info-wrapper {
section.handouts { section.handouts {
@extend .sidebar; @extend .sidebar;
border-left: 1px solid #d3d3d3; border-left: 1px solid $border-color;
@include border-radius(0 4px 4px 0); @include border-radius(0 4px 4px 0);
@include box-shadow(none);
border-right: 0; border-right: 0;
@include box-shadow(none);
h1 { h1 {
@extend .bottom-border; @extend .bottom-border;
padding: lh(.5) lh(.5);
margin-bottom: 0; margin-bottom: 0;
padding: lh(.5) lh(.5);
} }
ol { ol {
...@@ -90,8 +90,9 @@ div.info-wrapper { ...@@ -90,8 +90,9 @@ div.info-wrapper {
&.expandable, &.expandable,
&.collapsable { &.collapsable {
h4 { h4 {
font-weight: normal; color: $blue;
font-size: 1em; font-size: 1em;
font-weight: normal;
padding: lh(.25) 0 lh(.25) lh(1.5); padding: lh(.25) 0 lh(.25) lh(1.5);
} }
} }
...@@ -145,7 +146,8 @@ div.info-wrapper { ...@@ -145,7 +146,8 @@ div.info-wrapper {
filter: alpha(opacity=60); filter: alpha(opacity=60);
+ h4 { + h4 {
background-color: #e3e3e3; @extend a:hover;
text-decoration: underline;
} }
} }
......
...@@ -3,6 +3,7 @@ body { ...@@ -3,6 +3,7 @@ body {
} }
body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a { body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a {
text-align: left;
font-family: $sans-serif; font-family: $sans-serif;
} }
......
...@@ -25,24 +25,12 @@ h1.top-header { ...@@ -25,24 +25,12 @@ h1.top-header {
} }
} }
.action-link {
a {
color: $mit-red;
&:hover {
color: darken($mit-red, 20%);
text-decoration: none;
}
}
}
.content { .content {
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
padding: lh(); padding: lh();
vertical-align: top; vertical-align: top;
width: flex-grid(9) + flex-gutter(); width: flex-grid(9) + flex-gutter();
overflow: hidden;
@media print { @media print {
@include box-shadow(none); @include box-shadow(none);
...@@ -164,7 +152,6 @@ h1.top-header { ...@@ -164,7 +152,6 @@ h1.top-header {
.topbar { .topbar {
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
font-size: 14px;
@media print { @media print {
display: none; display: none;
...@@ -193,17 +180,17 @@ h1.top-header { ...@@ -193,17 +180,17 @@ h1.top-header {
h2 { h2 {
display: block; display: block;
width: 700px;
float: left; float: left;
font-size: 0.9em; font-size: 0.9em;
font-weight: 600; font-weight: 600;
line-height: 40px;
letter-spacing: 0; letter-spacing: 0;
text-transform: none; line-height: 40px;
overflow: hidden;
text-overflow: ellipsis;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
text-transform: none;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; width: 700px;
overflow: hidden;
.provider { .provider {
font: inherit; font: inherit;
...@@ -211,4 +198,4 @@ h1.top-header { ...@@ -211,4 +198,4 @@ h1.top-header {
color: #6d6d6d; color: #6d6d6d;
} }
} }
} }
\ No newline at end of file
...@@ -146,13 +146,13 @@ div.course-wrapper { ...@@ -146,13 +146,13 @@ div.course-wrapper {
@include border-radius(0); @include border-radius(0);
a.ui-slider-handle { a.ui-slider-handle {
@include box-shadow(inset 0 1px 0 lighten($mit-red, 10%)); @include box-shadow(inset 0 1px 0 lighten($pink, 10%));
background: $mit-red url(../images/slider-bars.png) center center no-repeat; background: $mit-red url(../images/slider-bars.png) center center no-repeat;
border: 1px solid darken($mit-red, 20%); border: 1px solid darken($pink, 20%);
cursor: pointer; cursor: pointer;
&:hover, &:focus { &:hover, &:focus {
background-color: lighten($mit-red, 10%); background-color: lighten($pink, 10%);
outline: none; outline: none;
} }
} }
......
...@@ -13,7 +13,7 @@ section.course-index { ...@@ -13,7 +13,7 @@ section.course-index {
div#accordion { div#accordion {
h3 { h3 {
@include border-radius(0); @include border-radius(0);
border-top: 1px solid #e3e3e3; border-top: 1px solid lighten($border-color, 10%);
font-size: em(16, 18); font-size: em(16, 18);
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
...@@ -34,6 +34,7 @@ section.course-index { ...@@ -34,6 +34,7 @@ section.course-index {
} }
&.ui-accordion-header { &.ui-accordion-header {
border-bottom: none;
color: #000; color: #000;
a { a {
......
...@@ -17,7 +17,6 @@ div.answer-controls { ...@@ -17,7 +17,6 @@ div.answer-controls {
margin-left: flex-gutter(); margin-left: flex-gutter();
nav { nav {
@extend .action-link;
float: right; float: right;
margin-top: 34px; margin-top: 34px;
...@@ -144,7 +143,7 @@ div.answer-actions { ...@@ -144,7 +143,7 @@ div.answer-actions {
text-decoration: none; text-decoration: none;
&.question-delete { &.question-delete {
// color: $mit-red; color: $mit-red;
} }
} }
} }
......
...@@ -92,7 +92,7 @@ form.answer-form { ...@@ -92,7 +92,7 @@ form.answer-form {
margin-left: 2.5%; margin-left: 2.5%;
padding-left: 1.5%; padding-left: 1.5%;
border-left: 1px dashed #ddd; border-left: 1px dashed #ddd;
color: $mit-red;; color: $mit-red;
} }
ul, ol, pre { ul, ol, pre {
......
...@@ -14,14 +14,6 @@ div#wiki_panel { ...@@ -14,14 +14,6 @@ div#wiki_panel {
} }
} }
form {
input[type="submit"]{
@extend .light-button;
text-transform: none;
text-shadow: none;
}
}
div#wiki_create_form { div#wiki_create_form {
@extend .clearfix; @extend .clearfix;
padding: lh(.5) lh() lh(.5) 0; padding: lh(.5) lh() lh(.5) 0;
...@@ -53,4 +45,12 @@ div#wiki_panel { ...@@ -53,4 +45,12 @@ div#wiki_panel {
} }
} }
} }
input#wiki_search_input_submit {
padding: 4px 8px;
}
input#wiki_search_input {
margin-right: 10px;
}
} }
form { form {
font-size: 1em; font-size: 1em;
}
label { label {
color: $base-font-color; color: $base-font-color;
font: italic 300 1rem/1.6rem $serif; font: italic 300 1rem/1.6rem $serif;
margin-bottom: 5px; margin-bottom: 5px;
text-shadow: 0 1px rgba(255,255,255, 0.4); text-shadow: 0 1px rgba(255,255,255, 0.4);
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
textarea,
input[type="text"],
input[type="email"],
input[type="password"] {
background: rgb(250,250,250);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1));
@include box-sizing(border-box);
font: italic 300 1rem/1.6rem $serif;
height: 35px;
padding: 5px 12px;
vertical-align: top;
-webkit-font-smoothing: antialiased;
&:last-child { textarea,
margin-right: 0px; input[type="text"],
} input[type="email"],
input[type="password"] {
background: rgb(250,250,250);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1));
@include box-sizing(border-box);
font: italic 300 1rem/1.6rem $serif;
height: 35px;
padding: 5px 12px;
vertical-align: top;
-webkit-font-smoothing: antialiased;
&:focus { &:last-child {
border-color: lighten($blue, 20%); margin-right: 0px;
@include box-shadow(0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0,0,0, 0.15));
outline: none;
}
} }
textarea { &:focus {
height: 60px; border-color: lighten($blue, 20%);
@include box-shadow(0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0,0,0, 0.15));
outline: none;
} }
}
input[type="submit"] { textarea {
@include button(shiny, $blue); height: 60px;
@include border-radius(3px); }
font: normal 1.2rem/1.6rem $sans-serif;
height: 35px; input[type="submit"],
letter-spacing: 1px; input[type="button"],
text-transform: uppercase; .button {
vertical-align: top; @include border-radius(3px);
-webkit-font-smoothing: antialiased; @include button(shiny, $blue);
} font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
padding: 4px 20px;
text-transform: uppercase;
vertical-align: top;
-webkit-font-smoothing: antialiased;
} }
.ui-tooltip.qtip .ui-tooltip-content {
background: rgba($pink, .8);
border: 0;
color: #fff;
font: bold 12px $body-font-family;
margin-bottom: 6px;
margin-right: 0;
overflow: visible;
padding: 4px;
text-align: center;
-webkit-font-smoothing: antialiased;
}
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</div> </div>
<ul> <ul>
<li> <li>
<input type="submit" class="button" value="Create" style="display: inline-block; margin-right: 2px; font-weight: bold;" /> <input type="submit" class="button" value="Create" />
</li> </li>
</ul> </ul>
</form> </form>
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
<li class="search"> <li class="search">
<form method="GET" action='${wiki_reverse("wiki_search_articles", course=course, namespace=namespace)}'> <form method="GET" action='${wiki_reverse("wiki_search_articles", course=course, namespace=namespace)}'>
<label class="wiki_box_title">Search</label> <label class="wiki_box_title">Search</label>
<input type="text" placeholder="Search" name="value" id="wiki_search_input" style="width: 71%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/> <input type="text" placeholder="Search" name="value" id="wiki_search_input" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
<input type="submit" id="wiki_search_input_submit" value="Go!" style="width: 20%" /> <input type="submit" id="wiki_search_input_submit" value="Go!" />
</form> </form>
</li> </li>
</ul> </ul>
......
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