From: jamiesensei <jamiesensei>
Date: Thu, 28 Sep 2006 10:32:23 +0000 (+0000)
Subject: moved styles in theme\standard\styles_form.css to theme\standard\styles_layout.css... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=909ec807cb833769f8abd9ecebe5329705d94461;p=moodle.git

moved styles in theme\standard\styles_form.css to theme\standard\styles_layout.css and removed theme\standard\styles_form.css and all references to it. In line with discussion here : http://moodle.org/mod/forum/discuss.php?d=54907
---

diff --git a/lib/weblib.php b/lib/weblib.php
index 439fd6fbd2..6185a63bd5 100644
--- 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 638888890e..cff6731992 100644
--- 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 2f60222e9f..5360e9a4a7 100644
--- 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 50c3b70d1d..de75eb0a9e 100644
--- 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 486acc64f1..d133053741 100644
--- 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 312d5a1f15..ef3afa19f8 100644
--- 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 2850dcbb1e..8628ae95b9 100644
--- 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
index 2e1a6f1e1d..0000000000
--- 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 e4d3e66b8d..3a810dbbe7 100644
--- 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 842e1707e1..68f9af7b47 100644
--- 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 842e1707e1..68f9af7b47 100644
--- 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 54e17b2d8f..ba954c3c4b 100644
--- 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 842e1707e1..68f9af7b47 100644
--- 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 842e1707e1..68f9af7b47 100644
--- 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 7fce930211..ac4a4fa427 100644
--- 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