Permalink
Browse files

jobs, 0059994, 0059997, 0059993 + added templates.rst and less.rst (r…

…st work in progress)
  • Loading branch information...
Jon Price
Jon Price committed May 29, 2012
1 parent daef617 commit 67f230d29e0abad0c1bdb8c7405bb97582eef1b8
@@ -2767,6 +2767,9 @@ form:after {
.form-actions:after {
clear: both;
}
+.select-open {
+ width: 300px!important;
+}
.errorlist {
margin: 0;
padding: 0 0 10px 0;
@@ -2776,9 +2779,7 @@ form:after {
padding: 0 0 5px 0;
list-style: none;
}
-.control-label.required:after {
- content: "*";
- padding: 0 0 0 3px;
+.control-label.required span {
color: #FF0000;
}
.header {
@@ -90,6 +90,7 @@ $(document).ready(function()
// This activates elastislide
var es_carousel = $('.es-carousel-wrapper'),
product_page = $('.product_page').length;
+ console.log(es_carousel.length);
// on prodct page
if (es_carousel.length && product_page > 0) {
es_carousel.elastislide({
@@ -177,5 +178,20 @@ $(document).ready(function()
}
e.preventDefault();
});
+
+ //For IE - sets the width of a select in an overflow hidden container
+ var selectBox = $('.product_pod select'),
+ isIE = navigator.userAgent.toLowerCase().indexOf("msie");
+ if (isIE > -1) {
+ selectBox.on({
+ mousedown: function(){
+ $(this).addClass("select-open");
+ },
+ change: function(){
+ $(this).removeClass("select-open");
+ }
+ });
+ }
+
});
@@ -0,0 +1,38 @@
+==============
+Less Structure
+==============
+
+The Less files used here to generate the css in oscar/css.
+
+Files in the root folder of oscar/less will render into their respective css counter parts.
+
+Files in oscar/bootstrap and oscar/page are merged into styles.less
+
+Responsive.less has mixins.less,osc_mixins.less and variables.less merged in but other than that is a stand alone file.
+
+Dashboard.less is completly stand alone file to the other less files in the root folder oscar/less
+
+* Notes based on less files are split into their separate folder names
+
+Compiling less
+--------------
+
+Note :
+ Only the files in the root folder oscar/less need to render into css files, other less files that may render into css
+ files DO NOT need to be rendered into your project structure, they are redundent and may as well not be included in
+ the project as they add confusion.
+
+
+Bootstrap
+---------
+
+
+
+Page
+----
+
+
+
+
+Dashboard
+---------
@@ -76,6 +76,10 @@ form {
.form-actions {
.clearfix();
}
+//For IE: adds width for selects inside overflow hidden containers
+.select-open {
+ width:300px!important;
+}
// ADDITIONAL ERRORS
.errorlist {
@@ -88,8 +92,6 @@ form {
}
}
-.control-label.required:after {
- content: "*";
- padding:0 0 0 3px;
+.control-label.required span {
color: #FF0000;
}
@@ -5,7 +5,7 @@
{% if field.is_hidden %}
{{ field }}
{% else %}
- <label for="{{ field.auto_id }}" class="control-label {% if field.field.required %}required{% endif %}">{{ field.label }}</label>
+ <label for="{{ field.auto_id }}" class="control-label {% if field.field.required %}required{% endif %}">{{ field.label }}{% if field.field.required %} <span>*</span>{% endif %}</label>
<div class="controls">
{{ field }}
{% for error in field.errors %}
@@ -0,0 +1,57 @@
+==================
+Template Structure
+==================
+
+Layouts
+-------
+
+Currently there are 5 different layouts that extend the base.html
+
+layout.html :
+ For single column layouts
+* detail.html
+* basket.html
+* flatpages/default.html
+
+layout_2_col.html :
+ For two column layouts whereby first column is subservient (aside) to the main column
+* home.html
+* browse.html
+
+layout_3_col.html :
+ For three column layouts whereby first and third columns are subservient (aside) to the main middlecolumn
+* Currently NOT used
+
+checkout/layout.html :
+ For the checkout pages, removes the main navigation and uses a single column by default
+* checkout.html
+* gateway.html
+* thank_you.html
+
+dashboard/layout.html :
+ For dashboard section specifically different from the other frontend features:
+* separate css
+* separate js
+* single column 100% page width
+
+Forms
+-----
+
+Forms are rendered using either of these two partial templates
+
+* form_fields.html
+* form_fields_inline.html
+
+form_fields.html :
+ This is used for the majority of the forms in the frontend and dashboard, using a horizontal label / field stack
+
+form_fields_inline.html :
+ Used for smaller forms to reduced screen space (mainly in the dashboard section for search forms)
+
+Partials form_fields::
+
+ 'include "partials/form_fields.html" with form=form'
+
+Partials form_fields_inline::
+
+ 'include "partials/form_fields_inline.html" with form=form'

0 comments on commit 67f230d

Please sign in to comment.