manual merge from stable

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 59bcacb46bf6a10829248c86effece9faa5e71a3..aef89ce0273aadcee0aacf4349381a0cacfdf42a 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -43,11 +43,13 @@ h6.main {
 #layout-table {
   width:100%;
   border-collapse:separate;
+  margin-top: 8px;
 }
 
 #layout-table #left-column,
 #layout-table #middle-column,
-#layout-table #right-column {
+#layout-table #right-column 
+{
   vertical-align:top;
 }
 
@@ -105,7 +107,7 @@ a img {
 img.userpicture,
 img.grouppicture,
 .block_online_users .listentry img {
-  border: 0px none
+  border: 0px solid
 }
 
 .notifyproblem {
@@ -143,10 +145,6 @@ img.grouppicture,
   padding: 5px;
 }
 
-.errorboxcontent {
-  padding: 5px;
-}
-
 .informationbox {
   border-width:1px;
   border-style:solid;
@@ -371,19 +369,6 @@ table.navbar {
   display: block;
 }
 
-
-/***
- *** Content
- ***/
-
-#content {
-  margin-top:8px;
-}
-
-#admin-index #content {
-  margin-top:0;
-}
-
 /***
  *** Admin
  ***/
@@ -430,29 +415,6 @@ body#admin-config .confighelp {
   padding-bottom: 20px;
 }
 
-table.flexible td.cell {
-  padding-top: 2px;
-  padding-bottom: 2px;
-} 
-
-table.flexible {
-  width: 70%;
-  margin: auto;
-}
-
-table.flexible thi, 
-table.flexible td.cell {
-  padding: 4px;
-  text-align: center;
-  vertical-align: middle;
-} 
-
-table.flexible td.c0,
-table.flexible th.c0 {
-  text-align: left;
-}
-
-
 /***
  *** Blocks
  ***/
@@ -562,10 +524,6 @@ ul.list, ul.list li {
   padding: 2px;
 }
 
-.sideblock .content .message {
-  text-align:center  
-}
-
 .sideblock .footer {
   margin-bottom: 4px;
   text-align:center;
@@ -1107,7 +1065,7 @@ body#grade-index .grades .weighted {
  ***/
 
 .loginbox {
-  margin-top:7px;
+  margin-top:15px;
 }
 
 .loginbox .content {
@@ -1821,12 +1779,6 @@ body#mod-quiz-report .controls {
   padding:0.1em;
 }
 
-.ims-nav-button a,
-.ims-nav-dimmed {
-  padding-left:1em;
-  padding-right:1em;
-}
-
 #ims-containerdiv {
   margin-top:0.2em;
 }