Skip to content

E
edx-platform
Commit 8b52a9fc by Galen Frechette
Options

type tweeks in modals

parent 60c0faf6
Showing with 191 additions and 13 deletions
lms/static/sass/_font_face.scss 0 → 100644
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Light-webfont.eot');
src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-LightItalic-webfont.eot');
src: url('../fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Regular-webfont.eot');
src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Italic-webfont.eot');
src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
font-weight: 400;
font-style: italic;
}
// Not used in UI
// @font-face {
// font-family: 'Open Sans';
// src: url('../fonts/OpenSans-Semibold-webfont.eot');
// src: url('../fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
// url('../fonts/OpenSans-Semibold-webfont.woff') format('woff'),
// url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'),
// url('../fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg');
// font-weight: 600;
// font-style: normal;
// }
// @font-face {
// font-family: 'Open Sans';
// src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot');
// src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'),
// url('../fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
// url('../fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'),
// url('../fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg');
// font-weight: 600;
// font-style: italic;
// }
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Bold-webfont.eot');
src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-BoldItalic-webfont.eot');
src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-ExtraBold-webfont.eot');
src: url('../fonts/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-ExtraBold-webfont.woff') format('woff'),
url('../fonts/OpenSans-ExtraBold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg');
font-weight: 800;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot');
src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
font-weight: 800;
font-style: italic;
}
lms/static/sass/_shared_forms.scss
...@@ -13,11 +13,11 @@ form { ...@@ -13,11 +13,11 @@ form {
input[type="email"], input[type="email"],
input[type="password"] { input[type="password"] {
background: rgb(250,250,250); background: rgb(250,250,250);
border: 1px solid rgb(210,210,210); border: 1px solid rgb(200,200,200);
@include border-radius(3px); @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-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); @include box-sizing(border-box);
font: italic 300 1.2rem/1.6rem $sans-serif; font: italic 300 1.2rem/1.6rem $serif;
height: 35px; height: 35px;
@include inline-block; @include inline-block;
padding: 5px 12px; padding: 5px 12px;
...@@ -44,6 +44,5 @@ form { ...@@ -44,6 +44,5 @@ form {
letter-spacing: 1px; letter-spacing: 1px;
text-transform: uppercase; text-transform: uppercase;
vertical-align: top; vertical-align: top;
-webkit-font-smoothing: antialiased;
} }
} }
lms/static/sass/_shared_modal.scss
...@@ -158,11 +158,8 @@ ...@@ -158,11 +158,8 @@
} }
a { a {
font: normal 1.2rem/1.6rem $serif; font: italic normal 1.2rem/1.6rem $serif;
text-decoration: underline; text-decoration: underline;
&:hover {
}
} }
} }
...@@ -231,6 +228,7 @@ ...@@ -231,6 +228,7 @@
color: $lighter-base-font-color; color: $lighter-base-font-color;
font: italic 1.2rem/1.6rem $serif; font: italic 1.2rem/1.6rem $serif;
text-align: center; text-align: center;
-webkit-font-smoothing: antialiased;
a { a {
color: $lighter-base-font-color; color: $lighter-base-font-color;
......
lms/static/sass/application.css
...@@ -306,6 +306,63 @@ td { ...@@ -306,6 +306,63 @@ td {
h2, h3 { h2, h3 {
page-break-after: avoid; } } page-break-after: avoid; } }
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Light-webfont.eot");
src: url("../fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Light-webfont.woff") format("woff"), url("../fonts/OpenSans-Light-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Light-webfont.svg#OpenSansLight") format("svg");
font-weight: 300;
font-style: normal; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-LightItalic-webfont.eot");
src: url("../fonts/OpenSans-LightItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-LightItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-LightItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic") format("svg");
font-weight: 300;
font-style: italic; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Regular-webfont.eot");
src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular") format("svg");
font-weight: 600;
font-style: normal; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Italic-webfont.eot");
src: url("../fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Italic-webfont.woff") format("woff"), url("../fonts/OpenSans-Italic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic") format("svg");
font-weight: 400;
font-style: italic; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Bold-webfont.eot");
src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#OpenSansBold") format("svg");
font-weight: 700;
font-style: normal; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-BoldItalic-webfont.eot");
src: url("../fonts/OpenSans-BoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-BoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-BoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic") format("svg");
font-weight: 700;
font-style: italic; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-ExtraBold-webfont.eot");
src: url("../fonts/OpenSans-ExtraBold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBold-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold") format("svg");
font-weight: 800;
font-style: normal; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot");
src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic") format("svg");
font-weight: 800;
font-style: italic; }
html, body { html, body {
background: #fdfdfd; background: #fdfdfd;
font-size: 75%; } font-size: 75%; }
...@@ -1240,7 +1297,7 @@ form { ...@@ -1240,7 +1297,7 @@ form {
form input[type="email"], form input[type="email"],
form input[type="password"] { form input[type="password"] {
background: #fafafa; background: #fafafa;
border: 1px solid #d2d2d2; border: 1px solid #c8c8c8;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-ms-border-radius: 3px; -ms-border-radius: 3px;
...@@ -1252,7 +1309,7 @@ form { ...@@ -1252,7 +1309,7 @@ form {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
font: italic 300 1.2rem/1.6rem "Open Sans", Verdana, Geneva, sans-serif; font: italic 300 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif;
height: 35px; height: 35px;
display: -moz-inline-box; display: -moz-inline-box;
-moz-box-orient: vertical; -moz-box-orient: vertical;
...@@ -1318,8 +1375,7 @@ form { ...@@ -1318,8 +1375,7 @@ form {
*vertical-align: auto; *vertical-align: auto;
letter-spacing: 1px; letter-spacing: 1px;
text-transform: uppercase; text-transform: uppercase;
vertical-align: top; vertical-align: top; }
-webkit-font-smoothing: antialiased; }
form input[type="submit"]:hover { form input[type="submit"]:hover {
cursor: pointer; cursor: pointer;
background-color: #108ec7; background-color: #108ec7;
...@@ -2326,7 +2382,7 @@ header.global { ...@@ -2326,7 +2382,7 @@ header.global {
.modal .inner-wrapper form label.remember-me a, .modal .inner-wrapper form label.remember-me a,
.modal .inner-wrapper form label.terms-of-service a, .modal .inner-wrapper form label.terms-of-service a,
.modal .inner-wrapper form label.honor-code a { .modal .inner-wrapper form label.honor-code a {
font: normal 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif; font: italic normal 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif;
text-decoration: underline; } text-decoration: underline; }
.modal .inner-wrapper form .honor-code-summary { .modal .inner-wrapper form .honor-code-summary {
margin-bottom: 20px; margin-bottom: 20px;
...@@ -2372,7 +2428,8 @@ header.global { ...@@ -2372,7 +2428,8 @@ header.global {
.modal .inner-wrapper .login-extra p { .modal .inner-wrapper .login-extra p {
color: #a0a0a0; color: #a0a0a0;
font: italic 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif; font: italic 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif;
text-align: center; } text-align: center;
-webkit-font-smoothing: antialiased; }
.modal .inner-wrapper .login-extra p a { .modal .inner-wrapper .login-extra p a {
color: #a0a0a0; color: #a0a0a0;
font: italic 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif; font: italic 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif;
......
lms/static/sass/application.scss
@import 'bourbon/bourbon'; @import 'bourbon/bourbon';
@import 'reset'; @import 'reset';
@import 'font_face';
@import 'base'; @import 'base';
@import 'base_mixins'; @import 'base_mixins';
@import 'base_extends'; @import 'base_extends';
......
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