Skip to content

E
edx-platform
Commit 51a19b3d by Tom Giannattasio
Options

transferred edge styles from cms to lms

parent 096d6853
Showing with 133 additions and 6 deletions
lms/static/sass/application.scss
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
@import 'multicourse/password_reset'; @import 'multicourse/password_reset';
@import 'multicourse/error-pages'; @import 'multicourse/error-pages';
@import 'multicourse/help'; @import 'multicourse/help';
@import 'multicourse/edge';
@import 'discussion'; @import 'discussion';
@import 'news'; @import 'news';
cms/static/sass/_edge.scss → lms/static/sass/multicourse/_edge.scss
$blue: #5597dd;
$lightGrey: #edf1f5;
$mediumGrey: #ced2db;
$darkGrey: #8891a1;
$extraDarkGrey: #3d4043;
$paleYellow: #fffcf1;
@mixin button {
display: inline-block;
padding: 4px 20px 6px;
font-family: $sans-serif;
font-size: 14px;
font-weight: 700;
text-transform: none;
letter-spacing: 0;
@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 0 0 rgba(0, 0, 0, 0));
@include transition(background-color .15s, box-shadow .15s);
&.disabled {
border: 1px solid $lightGrey !important;
border-radius: 3px !important;
background: $lightGrey !important;
color: $darkGrey !important;
pointer-events: none;
cursor: none;
&:hover {
box-shadow: 0 0 0 0 !important;
}
}
&:hover {
@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15));
text-decoration: none;
}
}
@mixin blue-button {
@include button;
border: 1px solid #437fbf;
border-radius: 3px;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: $blue;
color: #fff;
&:hover {
background-color: #62aaf5;
color: #fff;
}
}
@mixin grey-button {
@include button;
border: 1px solid $darkGrey;
border-radius: 3px;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: #d1dae3;
@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
color: #6d788b;
&:hover {
background-color: #d9e3ee;
color: #6d788b;
}
}
.edge-landing { .edge-landing {
border-top: 5px solid $blue; border-top: 5px solid $blue;
...@@ -7,14 +72,20 @@ ...@@ -7,14 +72,20 @@
border-bottom: 3px solid $blue; border-bottom: 3px solid $blue;
} }
a:hover {
text-decoration: none;
}
.main-wrapper { .main-wrapper {
width: 942px; width: 942px;
margin: auto; margin: auto;
.content { .content {
@extend .window; padding: 40px 60px 36px;
padding: 24px 60px 36px; background: #fff;
border: 1px solid $darkGrey;
border-radius: 3px; border-radius: 3px;
@include box-shadow(0 1px 2px rgba(0, 0, 0, .1));
@include clearfix; @include clearfix;
} }
...@@ -31,12 +102,18 @@ ...@@ -31,12 +102,18 @@
} }
label { label {
font-family: $sans-serif;
font-size: 13px;
font-weight: 700; font-weight: 700;
font-style: normal;
} }
input { input {
width: 100%; width: 100%;
height: 43px;
font-family: $sans-serif;
font-size: 21px; font-size: 21px;
font-style: normal;
font-weight: 300; font-weight: 300;
} }
...@@ -49,6 +126,7 @@ ...@@ -49,6 +126,7 @@
.forgot-button { .forgot-button {
font-size: 12px; font-size: 12px;
line-height: 41px;
margin-left: 10px; margin-left: 10px;
} }
} }
...@@ -59,20 +137,31 @@ ...@@ -59,20 +137,31 @@
.register-button { .register-button {
@include grey-button; @include grey-button;
padding: 10px 20px 12px;
margin-top: 20px; margin-top: 20px;
} }
} }
h2 { h2 {
margin-bottom: 30px; margin-bottom: 30px;
font-family: $sans-serif;
font-size: 24px; font-size: 24px;
font-weight: 300; font-weight: 300;
text-transform: none;
letter-spacing: 0;
color: #3c3c3c;
} }
h3 { h3 {
margin-bottom: 30px; margin-bottom: 30px;
font-family: $sans-serif;
font-size: 24px; font-size: 24px;
font-weight: 300; font-weight: 300;
color: #3c3c3c;
}
p {
font-family: $sans-serif;
} }
} }
...@@ -81,6 +170,8 @@ ...@@ -81,6 +170,8 @@
width: 263px; width: 263px;
height: 72px; height: 72px;
margin: 150px auto 50px; margin: 150px auto 50px;
background: url(../img/edge-logo-large.png) no-repeat; background: url(../images/edge-logo-large.png) no-repeat;
text-indent: -9999px;
overflow: hidden;
} }
} }
\ No newline at end of file
lms/templates/stripped-main.html 0 → 100644
<%namespace name='static' file='static_content.html'/>
<!DOCTYPE html>
<html>
<head>
<%block name="title"><title>edX</title></%block>
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
<%static:css group='application'/>
<%static:js group='main_vendor'/>
<%block name="headextra"/>
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<meta name="path_prefix" content="${MITX_ROOT_URL}">
</head>
<body class="<%block name='bodyclass'/>">
${self.body()}
<%block name="bodyextra"/>
<%static:js group='application'/>
<%static:js group='module-js'/>
<%block name="js_extra"/>
</body>
</html>
lms/templates/university_profile/edge.html
<%inherit file="base.html" /> <%inherit file="../stripped-main.html" />
<%block name="title">edX edge</%block> <%block name="title"><title>edX edge</title></%block>
<%block name="bodyclass">no-header edge-landing</%block> <%block name="bodyclass">no-header edge-landing</%block>
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="edx-edge-logo-large"></div> <div class="edx-edge-logo-large">edX edge</div>
<div class="content"> <div class="content">
<div class="log-in-form"> <div class="log-in-form">
<h2>Log in to your courses</h2> <h2>Log in to your courses</h2>
......
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