Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4214bc6
64063bd
)
Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
author
Dan Poltawski
<dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000
(16:28 +0800)
committer
Dan Poltawski
<dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000
(16:28 +0800)
Conflicts:
theme/base/style/core.css
1
2
theme/base/style/core.css
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
theme/base/style/core.css
index
e63a4a0
,
9187c4c
..
6f38ffd
---
1
/
theme/base/style/core.css
---
2
/
theme/base/style/core.css
+++ b/
theme/base/style/core.css
@@@
-932,10
-944,10
+944,10
@@@
sup {vertical-align: super;
top: 0px;
right: 0px;
bottom: 0px;
- left:
18.5
em;
+ left:
20.3
em;
margin: 0;
- padding:
2em 2em 2em 2.4
em;
- background-color:
white
;
+ padding:
1.6
em;
+ background-color:
#FFFFFF
;
overflow-x: hidden;
overflow-y: auto;
max-height: 550px;
@@@
-961,4
-967,3
+973,4
@@@
-moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
}
- .initialbar a {padding-right: 2px;}
++.initialbar a {padding-right: 2px;}