Skip to content

E
edx-platform
Commit d8a8bacd by Andy Armstrong
Options

Merge pull request #12639 from edx/andya/discussion-board-header 

Add styling for content headers to the edx-platform
parents acc9bca3 3b053980
Showing with 177 additions and 31 deletions
lms/static/sass/discussion/views/_home.scss
......@@ -115,9 +115,9 @@
.row-item-full {
.notification-checkbox {
@include margin-right($baseline/2);
display: inline-block;
@include padding($baseline/4, 0, $baseline/2, 0);
@include margin-right($baseline/2);
border-radius: 5px;
border: 1px solid gray;
......
lms/static/sass/shared-v2/_components.scss
......@@ -18,12 +18,12 @@
&.prominent + li {
@include border-left(1px solid $lms-border-color);
padding-left: $baseline*0.75;
@include padding-left($baseline*0.75);
}
a,
a:visited {
padding: ($baseline/2) ($baseline*0.75) 13px ($baseline*0.75);
@include padding($baseline/2, $baseline*0.75, 13px, $baseline*0.75);
display: block;
text-align: center;
text-decoration: none;
......@@ -47,3 +47,48 @@
}
}
}
// TODO: search box should be in the Pattern Library
.page-header-search {
display: inline-block;
.search-form {
display: inline-block;
}
.search-box {
display: inline-block;
position: relative;
vertical-align: middle;
}
.search-field {
transition: all $tmg-f2 ease-in-out;
border: 1px solid $lms-border-color;
border-radius: 3px;
padding: $baseline/4 $baseline*1.5;
font-family: inherit;
}
.action-search {
text-shadow: none;
vertical-align: middle;
padding: $baseline/5 $baseline/2;
}
.action-clear {
@include right(0);
@include margin(0, ($baseline/4), 0, 0);
position: absolute;
top: 0;
color: $lms-gray;
padding: $baseline/4;
// STATE: hover and focus
&:hover,
&:focus {
color: $lms-label-color;
border-width: 0;
}
}
}
lms/static/sass/shared-v2/_footer.scss
......@@ -2,13 +2,12 @@
// ====================
.wrapper-footer {
@include clearfix();
@extend %ui-print-excluded;
margin-top: ($baseline*2);
box-shadow: 0 -1px 5px 0 $shadow-l1;
border-top: 1px solid tint(palette(grayscale, light), 50%);
padding: 25px ($baseline/2) ($baseline*1.5) ($baseline/2);
padding: 25px ($baseline/2) ($baseline*1.5);
background: $footer-bg;
clear: both;
footer#footer-openedx {
@include clearfix();
......@@ -53,7 +52,7 @@
li {
@include float(left);
margin-right: ($baseline*0.75);
@include margin-right($baseline*0.75);
a {
color: tint($black, 20%);
......@@ -76,16 +75,16 @@
img {
@include float(left);
@include margin-right(0);
width: 68px;
height: 34px;
margin-right: 0;
}
p {
@include float(left);
@include span(9);
margin-left: $baseline;
padding-left: $baseline;
@include margin-left($baseline);
@include padding-left($baseline);
font-size: font-size(small);
background: transparent url(/static/images/bg-footer-divider.jpg) 0 0 no-repeat;
}
......@@ -105,7 +104,8 @@
a {
display: inline-block;
&:hover {
&:hover,
&:focus {
border-bottom: 0;
}
}
......@@ -113,7 +113,7 @@
.copyright {
@include text-align(left);
margin: -2px 0 8px 0;
margin: -2px 0 8px;
font-size: font-size(xx-small);
color: palette(grayscale, dark);
}
......@@ -143,7 +143,7 @@
display: inline-block;
&:last-child {
margin-right: 0;
@include margin-right(0);
}
a {
......
lms/static/sass/shared-v2/_layouts.scss
......@@ -2,12 +2,20 @@
.content-wrapper {
max-width: 1180px;
padding-top: 10px;
padding: {
top: $baseline/2;
bottom: $baseline*2;
}
.container {
border: 1px solid $lms-border-color;
background-color: $lms-container-background-color;
padding: $baseline;
}
.page-header {
@include clearfix();
border-bottom: 1px solid $lms-border-color;
padding: $baseline $baseline ($baseline/2) $baseline;
.page-title {
@extend %t-title4;
......@@ -21,26 +29,43 @@
margin-bottom: ($baseline/4);
color: $gray;
}
}
.page-header.has-secondary {
&.has-secondary {
.page-header-main {
display: inline-block;
width: flex-grid(8,12);
}
.page-header-secondary {
@include float(right);
@include text-align(right);
display: inline-block;
width: flex-grid(4,12);
vertical-align: text-bottom;
.form-actions {
display: inline-block;
}
.form-actions > * {
@include margin-left($baseline/2);
vertical-align: middle;
min-width: 200px;
height: 34px;
}
.container {
border: 1px solid #c8c8c8;
background-color: $lms-container-background-color;
padding: $baseline;
.form-actions > button {
padding: $baseline/5;
min-width: 200px;
height: 34px;
}
.form-actions > *:first-child {
@include margin-left(0);
}
}
}
}
.page-content {
padding-top: $baseline;
}
}
lms/static/sass/shared-v2/_modal.scss
......@@ -18,7 +18,7 @@
left: 50%;
padding: 8px;
border-radius: 3px;
box-shadow: 0 0px 5px 0 $shadow-d1;
box-shadow: 0 0 5px 0 $shadow-d1;
background: $gray-d2;
color: $base-font-color;
......@@ -166,7 +166,7 @@
}
input[type="checkbox"] {
margin-right: ($baseline/4);
@include margin-right($baseline/4);
}
textarea {
......@@ -209,7 +209,7 @@
padding: 10px;
position: absolute;
right: 2px;
top: 0px;
top: 0;
z-index: z-index(front);
color: $lighter-base-font-color;
font: {
......@@ -243,9 +243,9 @@
padding: 0 ($baseline*1.5) ($baseline*1.5) ($baseline*1.5);
header {
@include padding-left(0);
@include padding-right(0);
margin-bottom: $baseline;
padding-right: 0;
padding-left: 0;
}
.note {
......
lms/static/sass/shared-v2/_variables.scss
// LMS variables
$lms-gray: palette(grayscale, base);
$lms-background-color: palette(grayscale, white); // Why is the Pattern Library default background different?
$lms-container-background-color: palette(grayscale, white-t);
$lms-border-color: palette(grayscale, light);
$lms-label-color: palette(grayscale, black);
$lms-active-color: palette(primary, base);
// Icons
$lms-dark-icon-color: palette(grayscale, white-t);
$lms-dark-icon-background-color: palette(grayscale, black);
lms/templates/ux/reference/course-skeleton.html 0 → 100644
## Override the default styles_version to the Pattern Library version (version 2)
<%! main_css = "style-main-v2" %>
<%page expression_filter="h"/>
<%inherit file="/main.html" />
<%block name="pagetitle">Course Skeleton</%block>
<%block name="bodyclass">pattern-library</%block>
<%block name="content">
<nav class="wrapper-course-material">
<div class="course-material">
<ol class="tabs course-tabs">
<li class="tab">
<a href="index.html">
Home
</a>
</li>
<li class="tab">
<a href="#">
Course
</a>
</li>
<li class="tab">
<a href="course-skeleton.html" class="active">
Skeleton
<span class="sr-only">, current location</span>
</a>
</li>
</ol>
</div>
</nav>
<section class="container">
<header class="page-header has-secondary">
<div class="page-header-main">
<div class="sr-is-focusable" tabindex="-1"></div>
<h2 class="hd hd-2 page-title">Skeleton Page</h2>
<p class="page-description">This demonstrates the pieces available to a courseware page.</p>
</div>
<div class="page-header-secondary">
<div class="form-actions">
<button class="btn-neutral btn-small">Click Me!</button>
## TODO: note that this search component markup is provisional
## - update to use Chris's placeholder recommendation: http://codepen.io/clrux/pen/YqMpRO
## - update the Pattern Library's markup to match
<div class="page-header-search">
<form class="search-form" role="search">
<div class="search-box">
<input class="search-field" type="text" value=""
aria-label="Search all the things" placeholder="Search all the things">
<button type="button" class="btn action action-clear" aria-label="Clear search">
<span class="fa fa-times-circle" aria-hidden="true"></span>
</button>
</div>
<button type="submit" class="btn-brand action action-search" aria-label="Search items">
<span class="fa fa-search" aria-hidden="true"></span>
</button>
</form>
</div>
</div>
</div>
</header>
<div class="page-content">
<h3>This is where the page content belongs</h3>
<p>Useful stuff goes here</p>
</div>
</section>
</%block>
lms/templates/ux/reference/index.html
......@@ -22,6 +22,7 @@
<h3>Page Types</h3>
<ul>
<li><a href="pattern-library-test.html">Pattern Library test page</a></li>
<li><a href="course-skeleton.html">Course skeleton page</a></li>
</ul>
</section>
</article>
......
lms/urls.py
......@@ -980,8 +980,7 @@ if settings.DEBUG:
document_root=settings.PROFILE_IMAGE_BACKEND['options']['location']
)
# in debug mode, allow any template to be rendered (most useful for UX reference templates)
urlpatterns += url(r'^template/(?P<template>.+)$', 'openedx.core.djangoapps.debug.views.show_reference_template'),
urlpatterns += url(r'^template/(?P<template>.+)$', 'openedx.core.djangoapps.debug.views.show_reference_template'),
if 'debug_toolbar' in settings.INSTALLED_APPS:
import debug_toolbar
......
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