Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ffea8e3e
Commit
ffea8e3e
authored
Jul 03, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added more style for unit page, hovers, and buttons
parent
20df117b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
25 deletions
+69
-25
cms/static/sass/_base.scss
+31
-5
cms/static/sass/_calendar.scss
+9
-0
cms/static/sass/_unit.scss
+28
-19
cms/templates/widgets/notes.html
+1
-1
No files found.
cms/static/sass/_base.scss
View file @
ffea8e3e
...
@@ -8,6 +8,8 @@ $body-line-height: 20px;
...
@@ -8,6 +8,8 @@ $body-line-height: 20px;
$light-blue
:
#f0f8fa
;
$light-blue
:
#f0f8fa
;
$dark-blue
:
#50545c
;
$dark-blue
:
#50545c
;
$bright-blue
:
#3c8ebf
;
$bright-blue
:
#3c8ebf
;
$orange
:
#f96e5b
;
$yellow
:
#fff8af
;
// Base html styles
// Base html styles
html
{
html
{
...
@@ -28,17 +30,33 @@ input {
...
@@ -28,17 +30,33 @@ input {
font-family
:
$body-font-family
;
font-family
:
$body-font-family
;
}
}
input
[
type
=
"submit"
],
.button
{
button
,
input
[
type
=
"submit"
],
.button
{
border
:
1px
solid
#ccc
;
background-color
:
$orange
;
background
:
#efefef
;
color
:
#fff
;
@include
border-radius
(
3px
);
-webkit-font-smoothing
:
antialiased
;
padding
:
6px
;
padding
:
8px
10px
;
border
:
0
;
font-weight
:
bold
;
&
:hover
{
background-color
:
shade
(
$orange
,
10%
);
}
}
#{
$all-text-inputs
}
,
textarea
{
border
:
1px
solid
$dark-blue
;
font
:
$body-font-size
$body-font-family
;
padding
:
4px
6px
;
@include
box-shadow
(
inset
0
3px
6px
$light-blue
);
}
}
textarea
{
textarea
{
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
display
:
block
;
display
:
block
;
line-height
:
lh
();
padding
:
15px
;
width
:
100%
;
width
:
100%
;
}
}
// Extends
// Extends
...
@@ -77,6 +95,14 @@ textarea {
...
@@ -77,6 +95,14 @@ textarea {
float
:
right
;
float
:
right
;
}
}
.editable
{
&
:hover
{
background
:
lighten
(
$yellow
,
10%
);
}
button
{
padding
:
4px
10px
;
}
}
// .wip {
// .wip {
// outline: 1px solid #f00 !important;
// outline: 1px solid #f00 !important;
// position: relative;
// position: relative;
...
...
cms/static/sass/_calendar.scss
View file @
ffea8e3e
...
@@ -64,6 +64,7 @@ section.cal {
...
@@ -64,6 +64,7 @@ section.cal {
width
:
flex-grid
(
3
)
+
((
flex-gutter
()
*
3
)
/
4
);
width
:
flex-grid
(
3
)
+
((
flex-gutter
()
*
3
)
/
4
);
background-color
:
lighten
(
$light-blue
,
2%
);
background-color
:
lighten
(
$light-blue
,
2%
);
header
{
header
{
border-bottom
:
1px
solid
lighten
(
$dark-blue
,
40%
);
border-bottom
:
1px
solid
lighten
(
$dark-blue
,
40%
);
@include
box-shadow
(
0
2px
2px
$light-blue
);
@include
box-shadow
(
0
2px
2px
$light-blue
);
...
@@ -89,6 +90,10 @@ section.cal {
...
@@ -89,6 +90,10 @@ section.cal {
color
:
#888
;
color
:
#888
;
border-bottom
:
0
;
border-bottom
:
0
;
font-size
:
12px
;
font-size
:
12px
;
&
:hover
{
background
:
#fff
;
}
}
}
}
}
}
}
...
@@ -101,6 +106,10 @@ section.cal {
...
@@ -101,6 +106,10 @@ section.cal {
border-bottom
:
1px
solid
darken
(
$light-blue
,
8%
);
border-bottom
:
1px
solid
darken
(
$light-blue
,
8%
);
padding
:
6px
;
padding
:
6px
;
&
:hover
{
background
:
lighten
(
$yellow
,
10%
);
}
a
{
a
{
color
:
lighten
(
$dark-blue
,
10%
);
color
:
lighten
(
$dark-blue
,
10%
);
}
}
...
...
cms/static/sass/_unit.scss
View file @
ffea8e3e
...
@@ -40,15 +40,8 @@ section#unit-wrapper {
...
@@ -40,15 +40,8 @@ section#unit-wrapper {
}
}
&
.save-update
{
&
.save-update
{
background-color
:
#f96e5b
;
@extend
.button
;
color
:
#fff
;
-webkit-font-smoothing
:
antialiased
;
padding
:
8px
10px
;
margin
:
-6px
-25px
-6px
0
;
margin
:
-6px
-25px
-6px
0
;
&
:hover
{
background-color
:
shade
(
#f96e5b
,
10%
);
}
}
}
}
}
}
}
...
@@ -62,16 +55,16 @@ section#unit-wrapper {
...
@@ -62,16 +55,16 @@ section#unit-wrapper {
&
.status-settings
{
&
.status-settings
{
float
:
left
;
float
:
left
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
color
:
$dark-blue
;
ul
{
ul
{
list-style
:
none
;
list-style
:
none
;
@include
border-radius
(
2px
);
border
:
1px
solid
lighten
(
$dark-blue
,
40%
);
border
:
1px
solid
#999
;
@include
inline-block
();
@include
inline-block
();
li
{
li
{
@include
inline-block
();
@include
inline-block
();
border-right
:
1px
solid
#999
;
border-right
:
1px
solid
lighten
(
$dark-blue
,
40%
)
;
padding
:
6px
;
padding
:
6px
;
&
:last-child
{
&
:last-child
{
...
@@ -81,14 +74,19 @@ section#unit-wrapper {
...
@@ -81,14 +74,19 @@ section#unit-wrapper {
&
.current
{
&
.current
{
background
:
#eee
;
background
:
#eee
;
}
}
a
{
color
:
$dark-blue
;
}
}
}
}
}
a
.settings
{
a
.settings
{
@include
inline-block
();
@include
inline-block
();
margin
:
0
20px
;
margin
:
0
20px
;
border
:
1px
solid
#999
;
padding
:
6px
;
padding
:
6px
;
border
:
1px
solid
lighten
(
$dark-blue
,
40%
);
color
:
$dark-blue
;
}
}
select
{
select
{
...
@@ -98,6 +96,7 @@ section#unit-wrapper {
...
@@ -98,6 +96,7 @@ section#unit-wrapper {
&
.author
{
&
.author
{
float
:
right
;
float
:
right
;
color
:
lighten
(
$dark-blue
,
6%
);
dl
{
dl
{
dt
{
dt
{
...
@@ -111,7 +110,8 @@ section#unit-wrapper {
...
@@ -111,7 +110,8 @@ section#unit-wrapper {
}
}
&
.tags
{
&
.tags
{
background
:
#eee
;
background
:
$light-blue
;
color
:
lighten
(
$dark-blue
,
6%
);
padding
:
10px
;
padding
:
10px
;
margin
:
0
0
20px
;
margin
:
0
0
20px
;
@include
clearfix
();
@include
clearfix
();
...
@@ -135,9 +135,9 @@ section#unit-wrapper {
...
@@ -135,9 +135,9 @@ section#unit-wrapper {
}
}
//general styles for main content
//general styles for main content
div
.preview
{
.preview
{
background
:
#eee
;
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
border
:
1px
solid
lighten
(
$dark-blue
,
40%
);
min-height
:
40px
;
min-height
:
40px
;
padding
:
10px
;
padding
:
10px
;
width
:
100%
;
width
:
100%
;
...
@@ -170,13 +170,16 @@ section#unit-wrapper {
...
@@ -170,13 +170,16 @@ section#unit-wrapper {
//notes
//notes
section
.notes
{
section
.notes
{
margin-top
:
2
0px
;
margin-top
:
4
0px
;
padding
:
2
0px
0
0
;
padding
:
4
0px
0
0
;
border-top
:
1px
solid
#ccc
;
border-top
:
2px
solid
lighten
(
$dark-blue
,
60%
)
;
h2
{
h2
{
font-size
:
14px
;
margin-bottom
:
6px
;
margin-bottom
:
6px
;
font-size
:
$body-font-size
;
text-transform
:
uppercase
;
color
:
$bright-blue
;
letter-spacing
:
1px
;
}
}
form
{
form
{
...
@@ -211,6 +214,12 @@ section#unit-wrapper {
...
@@ -211,6 +214,12 @@ section#unit-wrapper {
@include
inline-block
();
@include
inline-block
();
margin-top
:
20px
;
margin-top
:
20px
;
}
}
a
.cancel
{
float
:
right
;
font-style
:
italic
;
margin-top
:
20px
;
}
}
}
}
}
}
}
cms/templates/widgets/notes.html
View file @
ffea8e3e
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<form>
<form>
<h2>
Add a note
</h2>
<h2>
Add a note
</h2>
<textarea
name=
""
id=
rows="8"
cols=
"40"
></textarea>
<textarea
name=
""
id=
rows="8"
cols=
"40"
></textarea>
<input
type=
"submit"
name=
""
id=
""
value=
"
p
ost"
/>
<input
type=
"submit"
name=
""
id=
""
value=
"
P
ost"
/>
</form>
</form>
</section>
</section>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment