Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleans up visual style of accordion and sidebar links and fixes border alignment issues

Browse Source
This commit is contained in:
Galen Frechette
2012-05-17 11:47:28 -04:00
parent 2bb7a77d01
commit cb8224cbcd
7 changed files with 1586 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1603
static/css/application.css
View File

File diff suppressed because one or more lines are too long

70
templates/accordion_bak.html
View File

@@ -1,70 +0,0 @@
<h3><a href="#">Using the System</a></h3>
<div>
<ul>
<li> Lecture
<li> Homework
<li> Lab
</ul>
</div>
<h3><a href="#">Basic Circuit Analysis</a></h3>
<div>
<ul>
<li> Electronic Text
<li> Introduction <br><small>lecture, 50min, due Feb 1</small>
<li> KVL, KCL, and Resistive <br><small>lecture, 50min, due Feb 3</small>
<li> Nodal analysis <br><small>lecture, 50min, due Feb 5</small>
<li> <div style="background-color:#aed0ea;">Linearity, Superposition <br><small>lecture, 50min, due Feb 7</small></div>
<li> Homework 1 <br><small>due Feb 14</small>
<li> Lab 0 <br><small>due Feb 7</small>
</ul>
</div>
<h3><a href="#">Digital Systems</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>
<h3><a href="#">Nonlinear Elements</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>
<h3><a href="#">Analog Amplification</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>
<h3><a href="#">Capacitors and Inductors</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>
<h3><a href="#">Operational Amplifiers</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>
<h3><a href="#">Applications</a></h3>
<div>
<!--ul>
<li> Lecture
<li> Homework
<li> Lab
</ul-->
</div>

13
templates/sass/base/_extends.scss
View File

@@ -124,10 +124,8 @@ h1.top-header {
}
h3 {
@include box-shadow(inset 0 1px 0 0 #eee);
background: none;
border: none;
border-top: 1px solid #d3d3d3;
color: #000;
font-weight: normal;
margin: 0;
@@ -140,11 +138,6 @@ h1.top-header {
padding: 7px 7px 7px 30px;
text-decoration: none;
@include transition();
&:hover {
background: #efefef;
@include box-shadow(0 1px 0 #fff);
}
}
span.ui-icon {
@@ -153,9 +146,9 @@ h1.top-header {
&.active {
background: none;
//border: 0;
//border-bottom: 1px solid #bbb;
//@include box-shadow(none);
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
border-bottom: 1px solid #d3d3d3;
@include box-shadow(inset 0 1px 0 0 #eee);
color: #000;
font-weight: bold;

7
templates/sass/courseware/_sidebar.scss
View File

@@ -5,6 +5,8 @@ section.course-index {
div#accordion {
h3 {
@include box-shadow(inset 0 1px 0 0 #eee);
border-top: 1px solid #d3d3d3;
overflow: hidden;
margin: 0;
@@ -12,6 +14,10 @@ section.course-index {
border: none;
}
&:hover {
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
}
&.ui-accordion-header {
color: #000;
@@ -33,7 +39,6 @@ section.course-index {
@include box-shadow(inset -1px 0 0 #e6e6e6);
background: #dadada;
border: none;
border-bottom: 1px solid #c3c3c3;
font-size: 12px;
margin: 0;
padding: 1em 1.5em;

4
templates/sass/plugins/_jquery-ui-1.8.16.custom.scss
View File

@@ -333,7 +333,7 @@
.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
.ui-accordion .ui-accordion-content-active { display: block; }
/*
* jQuery UI Autocomplete 1.8.16
@@ -565,4 +565,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Progressbar#theming
*/
.ui-progressbar { height:2em; text-align: left; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

45
templates/sass/wiki/_sidebar.scss
View File

@@ -10,27 +10,35 @@ div#wiki_panel {
}
input[type="button"] {
@extend h3;
color: lighten($text-color, 10%);
font-size: $body-font-size;
margin: 0 !important;
background: transparent;
border: none;
@include box-shadow(none);
color: #666;
font-size: 14px;
font-weight: bold;
margin: 0px;
padding: 7px lh();
text-align: left;
@include transition();
width: 100%;
&:hover {
@include box-shadow(0 1px 0 #fff);
background: #efefef;
}
}
ul {
li {
@include box-shadow(inset 0 1px 0 0 #eee);
border-top: 1px solid #d3d3d3;
&:hover {
background: #efefef;
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
}
&:first-child {
border: none;
}
&.search {
border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee);
padding: 7px lh();
padding: 10px lh();
label {
display: none;
@@ -39,18 +47,21 @@ div#wiki_panel {
&.create-article {
h3 {
a {
padding: 7px lh();
}
}
}
a {
color: #666;
font-size: 14px;
padding: 7px lh();
}
}
}
div#wiki_create_form {
@extend .clearfix;
background: #d6d6d6;
border-bottom: 1px solid #bbb;
background: #dadada;
border-bottom: 1px solid #d3d3d3;
padding: 15px;
input[type="text"] {

6
templates/simplewiki_base.html
View File

@@ -87,9 +87,11 @@
%>
<ul class="action">
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_list_articles", args=[])}'" value="All articles" class="button" />
<h3>
<a href="${reverse("wiki_list_articles", args=[])}">All Articles</a>
</h3>
</li>
<li class="create-article">
<h3>
<a href="#" id="create-article"/>Create Article</a>