Merge branch 'MDL-27989_MOODLE_20_STABLE' of git://github.com/kordan/…

…moodle into MOODLE_20_STABLE
moodle · Jul 7, 2011 · fea115d · fea115d
2 parents 46306d8 + 10bc60a
commit fea115d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
@@ -187,12 +187,13 @@ a.skip:active {position: static;display: block;}
 .mform fieldset div div {margin:0;}
 .mform fieldset .advancedbutton {text-align:right;}
 .mform fieldset.hidden {border-width:0;}
+.mform fieldset.group {margin-bottom: 0}
 .mform fieldset.error {border: 1px solid #A00;}
 .mform .fitem {width:100%;overflow:hidden;margin-top:5px;margin-bottom:1px;clear:right;}
 .mform .fitem .fitemtitle {width:15%;text-align:right;float:left;}
 .mform .fitem .fitemtitle div {display: inline;}
 .mform .fitem .felement {border-width: 0;width:80%;margin-left:16%;}
-.mform .fitem fieldset.felement {margin-left:0;padding-left:1%;}
+.mform .fitem fieldset.felement {margin-left:0;padding-left:1%;margin-bottom:0}
 .mform .error,
 .mform .required {color:#A00;}
 .mform .required .fgroup span label {color:#000;}

diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
@@ -175,7 +175,7 @@ input[type="radio"] {
     margin-left: 21%;
 }
 
-/* Calendar 
+/* Calendar
 -----------------------*/
 
 .calendarlayout .sidecalendar {
@@ -330,8 +330,8 @@ input[type="radio"] {
 -----------------------*/
 
 .userinfobox {
-border-color: #ddd;
-padding: 0
+    border-color: #ddd;
+    padding: 0
 }
 
 .userinfobox .content {
@@ -450,7 +450,7 @@ padding: 0
     text-align: center;
 }
 
-/* Blogs 
+/* Blogs
 ------------------------*/
 
 .blog_entry .audience {
@@ -463,7 +463,7 @@ padding: 0
     margin-bottom: 0.5em;
 }
 
-/* Tags 
+/* Tags
 ------------------------*/
 
 #big-tag-cloud-box {
@@ -556,7 +556,7 @@ padding: 0
     padding-top: 30px;
 }
 
-/* Forms 
+/* Forms
 -----------------------*/
 
 .mform .fsubmit {
@@ -574,12 +574,6 @@ padding: 0
     color: #444;
 }
 
-.mform .hidden .fitem .fgroup {
-    width: 100%;
-    text-align: center;
-    margin: 1em 0;
-}
-
 .path-backup .mform .hidden .fitem .fgroup {
     text-align: left;
 }

diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css
@@ -116,9 +116,11 @@ input[type="radio"] {
     margin: 0 auto;
     text-align: left;
 }
+
 .dir-rtl .loginbox .loginform .form-label {
     text-align: right;
 }
+
 .loginbox .loginform .form-input {
     float: none;
     width: 100%;
@@ -434,10 +436,16 @@ input[type="radio"] {
     color: #444;
 }
 
-.mform .hidden .fitem .fgroup {
-    width: 100%;
-    text-align: center;
-    margin: 1em 0;
+/* do not push the field far from the label more than all the other mform elements */
+.mform .fitem input[type="text"],
+.mform .fitem input[type="password"] {
+	margin: 0.3em 0 0.3em 0;
+}
+
+/* needed to vertically align label of mform groups containing, for instance, select and text */
+.mform .fitem {
+    line-height:2.0em;
+    margin-top:0;
 }
 
 .path-backup .mform .hidden .fitem .fgroup {
@@ -553,4 +561,4 @@ input[type="radio"] {
 .pagelayout-redirect #content {text-align:center;margin-top:10%;margin-bottom:10%;}
 
 /* plugin compattable */
-.plugincompattable {font-size:90%;}
+.plugincompattable {font-size:90%;}
diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css
@@ -94,8 +94,8 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
 .environmenttable td,
 .forumheaderlist td,
 .forumheaderlist th {
-	border: 1px solid #E3DFD4;
-	border-collapse: collapse;
+    border: 1px solid #E3DFD4;
+    border-collapse: collapse;
 }
 
 th.header,