moved styles in theme\standard\styles_form.css to theme\standard\styles_layout.css...

diff --git a/lib/weblib.php b/lib/weblib.php
index 439fd6fbd2bb5fc238cf6a7585358338c1237276..6185a63bd5477b5e010d2526f97c6874016e1f7a 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2403,7 +2403,7 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
     header('Pragma: ');
     header('Content-type: text/css');  // Correct MIME type
 
-    $DEFAULT_SHEET_LIST = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_form');
+    $DEFAULT_SHEET_LIST = array('styles_layout', 'styles_fonts', 'styles_color');
 
     if (empty($themename)) {
         $themename = current_theme();  // So we have something.  Normally not needed.

diff --git a/theme/chameleon/config.php b/theme/chameleon/config.php
index 638888890eb3d4d7761194310ce140b0b4f5299d..cff6731992fd85e7af8a977ea51a9102f7f83e6b 100644 (file)
--- a/theme/chameleon/config.php
+++ b/theme/chameleon/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('user_styles');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_form');
+$THEME->standardsheets = array('styles_layout');
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index 2f60222e9f7e4a6624db46a8d4f78c18844bd9e7..5360e9a4a73b1f15a084dc08faab4fc1fc00ee17 100644 (file)
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -12,7 +12,7 @@ $THEME->sheets = array('fw_layout','fw_color','fw_fonts');
 /// stylesheet files you want included in this theme, and in what order
 ////////////////////////////////////////////////////////////////////////////////
 
-$THEME->standardsheets = array('styles_layout','styles_form');
+$THEME->standardsheets = array('styles_layout');
 ///$THEME->standardsheets = true;
 
 /// This variable can be set to an array containing

diff --git a/theme/metal/config.php b/theme/metal/config.php
index 50c3b70d1d046d7dfc267d95eced52314fde4055..de75eb0a9ec268752778e5be08a9cd3a35134fab 100644 (file)
--- a/theme/metal/config.php
+++ b/theme/metal/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients', 'colors', 'fonts');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/orangewhite/config.php b/theme/orangewhite/config.php
index 486acc64f150761657f6a49cd7c60d4a5e804684..d133053741ed3c5fd28848d4219931513d9fdaec 100644 (file)
--- a/theme/orangewhite/config.php
+++ b/theme/orangewhite/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_form');
+$THEME->standardsheets = array('styles_layout');
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/orangewhitepda/config.php b/theme/orangewhitepda/config.php
index 312d5a1f152b3e407d5182e6f59c1b3b03df4b45..ef3afa19f8c04076719aefb239188b40a5e46591 100644 (file)
--- a/theme/orangewhitepda/config.php
+++ b/theme/orangewhitepda/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('styles_pda');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_form');
+$THEME->standardsheets = array('styles_layout');
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/standard/config.php b/theme/standard/config.php
index 2850dcbb1e4b1e291dc6ad75c5be3aec91dcab82..8628ae95b9fbb2a8f92748a814aa06fe6d42a8ed 100644 (file)
--- a/theme/standard/config.php
+++ b/theme/standard/config.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->sheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_form');
+$THEME->sheets = array('styles_layout', 'styles_fonts', 'styles_color');
 
 /// This variable is an array containing the names of all the 
 /// stylesheet files you want included in this theme, and in what order

diff --git a/theme/standard/styles_form.css b/theme/standard/styles_form.css
deleted file mode 100644 (file)
index 2e1a6f1..0000000
--- a/theme/standard/styles_form.css
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************
- styles_form.css
-  
- This CSS file contains all css required for new css and xhtml only 
- moodleforms.
-*/
-form.mform {
-    margin: 0;
-    padding: 0;
-    width: 100%;
-}
-form.mform fieldset {
-    border: 1px solid black;
-    padding: 10px 0;
-    margin: 0;
-    width:100%;
-}
-form.mform fieldset.hidden, form.mform fieldset.felement {
-    border: 0;
-}
-form.mform fieldset.felement {
-    width: auto;
-}
-form.mform fieldset legend {
-    font-weight: bold;
-}
-
-form.mform div.fitem {
-    clear: both;
-    width: 100%;
-    min-height: 1.5em;
-}
-/* uncomment this and edit formslib.php for
-ol li containers for form items.
-
-form.mform fieldset li.qfrow {
-    list-style: none;
-    padding: 5px;
-    margin: 0;
-    clear: both;
-    width: 100%;
-    min-height: 1.5em;
-}
-form.mform fieldset ol {
-  margin: 0;
-  padding: 0;
-}*/
-form.mform label {
-    display: block;
-    float: left;
-    width: 30%;
-    padding: 0;
-    margin: 0 0 0 0;
-    text-align: right;
-}
-div.fitem fieldset.fgroup label {
-    display:inline;
-    float: none;
-    width: auto;
-}
-
-form.mform div.felement,  form.mform fieldset.felement{
-    /* display: inline; */
-    display: block;
-    float: left;
-    margin: 5px 0 0 10px;
-    padding: 0;
-    text-align:left;
-}
-
-form.mform div.fdescription {
-    clear: both;
-    min-height: 1.5em;
-}
-
-form.mform input, form.mform select {
-    width: auto;
-}
-form.mform ftextarea {
-}
-form.mform br {
-    clear: left;
-}
-form.mform div.fhtmleditor {
-    margin: 0 auto 10px auto;
-    width : 600px;
-    clear:both;
-    float:none;
-}
-form.mform span.error, form.mform span.required {
-    color: red;
-}
-form.mform div.error {
-    border: 1px solid red;
-    padding: 5px;
-    color: inherit;
-}

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index e4d3e66b8d1ba038185c6e175b9baccbed78eb4c..3a810dbbe7512d77729df98b0ff38dbd2678f677 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -6,6 +6,7 @@
 
  Styles are organised into the following sections:
   core
+  forms
   header
   footer
 
@@ -272,7 +273,104 @@ div.hide {
   display:none;
 }
 
+/***
+ *** Forms
+ ***/
+
+form.mform {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+}
+form.mform fieldset {
+    border: 1px solid black;
+    padding: 10px 0;
+    margin: 0;
+    width:100%;
+}
+form.mform fieldset.hidden, form.mform fieldset.felement {
+    border: 0;
+}
+form.mform fieldset.felement {
+    width: auto;
+}
+form.mform fieldset legend {
+    font-weight: bold;
+}
+
+form.mform div.fitem {
+    clear: both;
+    width: 100%;
+    min-height: 1.5em;
+}
+/* uncomment this and edit formslib.php for
+ol li containers for form items.
+
+form.mform fieldset li.qfrow {
+    list-style: none;
+    padding: 5px;
+    margin: 0;
+    clear: both;
+    width: 100%;
+    min-height: 1.5em;
+}
+form.mform fieldset ol {
+  margin: 0;
+  padding: 0;
+}*/
+form.mform label {
+    display: block;
+    float: left;
+    width: 30%;
+    padding: 0;
+    margin: 0 0 0 0;
+    text-align: right;
+}
+div.fitem fieldset.fgroup label, div.fradio label,  div.fcheckbox label{
+    display:inline;
+    float: none;
+    width: auto;
+}
+
+form.mform div.felement,  form.mform fieldset.felement{
+    display: block;
+    float: left;
+    margin: 5px 0 0 10px;
+    padding: 0;
+    text-align:left;
+}
+
+form.mform div.fdescription {
+    clear: both;
+    min-height: 1.5em;
+}
 
+form.mform input, form.mform select {
+    width: auto;
+}
+form.mform ftextarea {
+}
+form.mform br {
+    clear: left;
+}
+form.mform div.fhtmleditor {
+    margin: 0 auto 10px auto;
+    width : 600px;
+    clear:both;
+    float:none;
+}
+form.mform span.error, form.mform span.required {
+    color: red;
+}
+form.mform div.error,form.mform fieldset.error {
+    border: 1px solid red;
+    padding: 5px;
+    color: inherit;
+}
+ 
+ 
+ 
+ 
 /***
  *** Header
  ***/

diff --git a/theme/standardblue/config.php b/theme/standardblue/config.php
index 842e1707e1c692099c451937cace8d09b539d4d2..68f9af7b47a624a8630d7d598e9ace9bedaa81e4 100644 (file)
--- a/theme/standardblue/config.php
+++ b/theme/standardblue/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/standardgreen/config.php b/theme/standardgreen/config.php
index 842e1707e1c692099c451937cace8d09b539d4d2..68f9af7b47a624a8630d7d598e9ace9bedaa81e4 100644 (file)
--- a/theme/standardgreen/config.php
+++ b/theme/standardgreen/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/standardlogo/config.php b/theme/standardlogo/config.php
index 54e17b2d8fd6c4d4add840eea0363e7826087c7a..ba954c3c4bcdf4d5b36efddb2bb06b776a52fd93 100644 (file)
--- a/theme/standardlogo/config.php
+++ b/theme/standardlogo/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/standardred/config.php b/theme/standardred/config.php
index 842e1707e1c692099c451937cace8d09b539d4d2..68f9af7b47a624a8630d7d598e9ace9bedaa81e4 100644 (file)
--- a/theme/standardred/config.php
+++ b/theme/standardred/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/standardwhite/config.php b/theme/standardwhite/config.php
index 842e1707e1c692099c451937cace8d09b539d4d2..68f9af7b47a624a8630d7d598e9ace9bedaa81e4 100644 (file)
--- a/theme/standardwhite/config.php
+++ b/theme/standardwhite/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('gradients');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_moz');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 

diff --git a/theme/wood/config.php b/theme/wood/config.php
index 7fce9302110fff065d753158d71b85e04370b3f3..ac4a4fa4272de638eb4ad7f3748d5d32b716491c 100644 (file)
--- a/theme/wood/config.php
+++ b/theme/wood/config.php
@@ -13,7 +13,7 @@ $THEME->sheets = array('styles_color');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color','styles_form');  
+$THEME->standardsheets = array('styles_layout','styles_fonts','styles_color');  
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the