Skip to content

Commit

Permalink
Integrated more grids updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Jackson authored and Paul Jackson committed Sep 14, 2012
1 parent c43ee1b commit c543c2d
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 24 deletions.
2 changes: 1 addition & 1 deletion build/grids/css/util-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/grids/css/util-min.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions demos/formvalid/formvalid-eng.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ <h1 id="wb-cont">Form validation</h1>
<option value="mr">Mr.</option>
<option value="ms">Ms.</option>
</select>
<label for="fname1"><span class="field-name">First Name</span> <strong>(required)</strong></label><input id="fname1" name="fname1" type="text" required pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="lname1"><span class="field-name">Last Name</span> <strong>(required)</strong></label><input id="lname1" name="lname1" type="text" required pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="tel1"><span class="field-name">Telephone Number</span> (999-999-9999) <strong>(required)</strong></label><input id="tel1" name="tel1" type="tel" required class="{validate:{phoneUS:true}}" />
<label for="fname1"><span class="field-name">First Name</span> <strong>(required)</strong></label><input id="fname1" name="fname1" type="text" required="required" pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="lname1"><span class="field-name">Last Name</span> <strong>(required)</strong></label><input id="lname1" name="lname1" type="text" required="required" pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="tel1"><span class="field-name">Telephone Number</span> (999-999-9999) <strong>(required)</strong></label><input id="tel1" name="tel1" type="tel" required="required" class="{validate:{phoneUS:true}}" />
<label for="email1"><span class="field-name">Email Address</span></label><input id="email1" name="email1" type="email" />
<label for="url1"><span class="field-name">Website URL (http://www.url.com)</span></label><input id="url1" name="url1" type="url" />
</fieldset>

<fieldset><legend>Other examples</legend>
<label for="date1"><span class="field-name">Date</span> (YYYY-MM-DD)</label><input id="date1" name="date1" type="date" data-min-date="2012-07-27" data-max-date="2013-09-07" class="{validate:{dateISO:true}}" />
<label for="date1"><span class="field-name">Date</span> (YYYY-MM-DD)</label><input id="date1" name="date1" type="date" class="{validate:{dateISO:true}}" />
<label for="time1"><span class="field-name">Time</span> (hh:mm)</label><input id="time1" name="time1" type="time" />
<label for="an1"><span class="field-name">Alphanumeric</span> (at least 4 characters)</label><input id="an1" name="an1" type="text" pattern="[A-Za-z0-9\s]{4,}" class="{validate:{alphanumeric:true,minlength:4}}" />
<label for="digits1"><span class="field-name">Digits only</span></label><input id="digits1" name="digits1" type="number" />
Expand Down
8 changes: 4 additions & 4 deletions demos/formvalid/formvalid-fra.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ <h1 id="wb-cont">Validation des formulaires</h1>
<option value="ms">Madame</option>
</select>

<label for="fname"><span class="field-name">Prénom</span> <strong>(obligatoire)</strong></label><input id="fname" name="fname" type="text" required pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="lname"><span class="field-name">Nom de famille</span> <strong>(obligatoire)</strong></label><input id="lname" name="lname" type="text" required pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="tel"><span class="field-name">Numéro de téléphone</span> (999-999-9999) <strong>(obligatoire)</strong></label><input id="tel" name="tel" type="tel" required class="{validate:{phoneUS:true}}" />
<label for="fname"><span class="field-name">Prénom</span> <strong>(obligatoire)</strong></label><input id="fname" name="fname" type="text" required="required" pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="lname"><span class="field-name">Nom de famille</span> <strong>(obligatoire)</strong></label><input id="lname" name="lname" type="text" required="required" pattern="{2,}" class="{validate:{minlength:2}}" />
<label for="tel"><span class="field-name">Numéro de téléphone</span> (999-999-9999) <strong>(obligatoire)</strong></label><input id="tel" name="tel" type="tel" required="required" class="{validate:{phoneUS:true}}" />
<label for="email1"><span class="field-name">Adresse électronique</span></label><input id="email1" name="email1" type="email" />
<label for="url1"><span class="field-name">URL du site Web (http://www.url.com)</span></label><input id="url1" name="url1" type="url" class="{validate:{url:true}}" />
</fieldset>

<fieldset><legend>Autres exemples</legend>
<label for="date1"><span class="field-name">Date</span> (AAAA-MM-JJ)</label><input id="date1" name="date1" type="date" data-min-date="2012-07-27" data-max-date="2013-09-07" class="{validate:{dateISO:true}}" />
<label for="date1"><span class="field-name">Date</span> (AAAA-MM-JJ)</label><input id="date1" name="date1" type="date" class="{validate:{dateISO:true}}" />
<label for="time1"><span class="field-name">Heure</span> (hh:mm)</label><input id="time1" name="time1" type="time" />
<label for="an1"><span class="field-name">Alphanumérique</span> (4 caractères minimum)</label><input id="an1" name="an1" type="text" pattern="[A-Za-z0-9\s]{4,}" class="{validate:{alphanumeric:true,minlength:4}}" />
<label for="digits1"><span class="field-name">Chiffres seulement</span></label><input id="digits1" name="digits1" type="number" />
Expand Down
23 changes: 20 additions & 3 deletions demos/grids/grid-form-eng.html
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ <h2 id="vertical">Vertical form</h2>

<h2 id="inline">Inline form</h2>
<p>Inputs are block level to start. For <code>.form-inline</code> forms, we force all elements to be inline-block.</p>
<div class="span-1"><p class="badge-intro">Example 1</p></div>
<div class="span-1 margin-bottom-none"><p class="badge-intro">Example 1</p></div>
<form class="form-inline span-5 margin-bottom-none">
<label for="email1" class="wb-invisible">Email</label> <input type="text" id="email1" class="width-20" placeholder="Email" />
<label for="pword1" class="wb-invisible">Password</label> <input type="password" id="pword1" class="width-20" placeholder="Password" />
Expand Down Expand Up @@ -389,12 +389,29 @@ <h2 id="inline">Inline form</h2>
&lt;label class="form-checkbox2"&gt;
&lt;input type="checkbox2"&gt;
Remember me &lt;/label&gt;
&lt;button type="submit" class="button button-accent"&gt;Sign in&lt;/buttonv
&lt;button type="submit" class="button button-accent"&gt;Sign in&lt;/button&gt;
&lt;/form&gt;</pre>
</details>
<div class="clear"></div>


<div class="span-1 margin-bottom-none"><p class="badge-intro">Example 3</p></div>
<div class="span-5 margin-top-medium margin-bottom-none">
<form>
<div class="form-inline"><input type="submit" class="button button-accent" value="Submit feedback" id="submit" name="submit"> <input type="reset" class="button" value="Reset"></div>
</form>
</div>
<div class="clear"></div>
<div class="span-1"></div>
<details class="span-5">
<summary>View code</summary>
<pre>
&lt;form&gt;
&lt;div class=&quot;form-inline&quot;&gt;
&lt;input type=&quot;submit&quot; class=&quot;button button-accent&quot; value=&quot;Submit feedback&quot; id=&quot;submit&quot; name=&quot;submit&quot;&gt; &lt;input type=&quot;reset&quot; class=&quot;button&quot; value=&quot;Reset&quot;&gt;
&lt;/div&gt;
&lt;/form&gt;</pre>
</details>
<div class="clear"></div>
<h2 id="horizontal">Horizontal form</h2>
<div class="span-6 module-note">
<h3>The <code>form-horizontal</code> class behaves like a grid parent.</h3>
Expand Down
2 changes: 1 addition & 1 deletion demos/grids/grid-icon-eng.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ <h2>Table of contents</h2>

<div class="clear"></div>
<h2 id="overview">Overview</h2>
<p>The Fugue icon set was created by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>. Fugue has over 3,400 icons, however only commonly used icons have them have been incorporated into WET.</p>
<p>The Fugue icon set was created by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>. Fugue has over 3,400 icons, however only commonly used icons have been incorporated into WET.</p>
<p>An icon is attached to an empty <code>span</code>: </p>
<pre>&lt;span class=&quot;wb-icon-alarm&quot;&gt;&lt;/span&gt;</pre>

Expand Down
2 changes: 1 addition & 1 deletion demos/sessiontimeout/sessiontimeout-eng.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h1 id="wb-cont">Session timeout</h1>
</ul>
<p>The only required parameter is logouturl, all other fields are optional. The default code would be:</p>
<p><code>&lt;span class="wet-boew-sessiontimeout"&gt; data-wet-boew="{logouturl: './'}"&gt;&lt;/span&gt;</code></p>
<p><strong>IMPORTANT NOTE:</strong> The inactivity, reactionTime and sessionalive parameters are set in miliseconds. The only required paramter is the logouturl. The default inactivity and sessionalive is set to 20 minutes with a 30 second confirmation time with the dialog message. The refreshCallbackUrl must not be a page containing the timeout function again as a loop will be created, it should be simply a viewless page that refreshes the session.</p>
<p><strong>IMPORTANT NOTE:</strong> The inactivity, reactionTime and sessionalive parameters are set in milliseconds. The only required parameter is the logouturl. The default inactivity and sessionalive is set to 20 minutes with a 30 second confirmation time with the dialog message. The refreshCallbackUrl must not be a page containing the timeout function again as a loop will be created, it should be simply a viewless page that refreshes the session.</p>
<p>Need help with the conversion? See: <a href="http://www.calculateme.com/Time/Minutes/ToMilliseconds.htm">http://www.calculateme.com/Time/Minutes/ToMilliseconds.htm</a></p>
<p><strong>IMPORTANT NOTE</strong>: Your sessionalive and inactivity parameters should be equal to your web server session alive time minus the reactionTime time. If you set your sessionalive time and inactivity time to the same as your web server without taking into consideration the reactionTime time then the session will have ended by the server as soon as the popup appears to extend the session.</p>
</section>
Expand Down
21 changes: 18 additions & 3 deletions src/grids/sass/includes/_module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@
*/
@mixin modules {

.module-related, .module-billboard, .module-menu-section, .module-table-contents {
.module-billboard, .module-menu-section, .module-table-contents {
& > :first-child {
@include header;
@include colorize-base($medium);
@include colorize($medium);
}
}

.module-related {
& > :first-child {
@include header;
@include colorize-base($accent);
@include colorize($accent);
}
}

.module-billboard li, .module-related > ul, .module-menu-section > ul {
margin-top: 1px !important;
Expand Down Expand Up @@ -73,6 +81,13 @@
display: block;
padding: ($margin-medium / 2) $margin-medium;
}

.module-menu-section a {
text-decoration: none;
&:hover, &:focus, &:active {
text-decoration: underline;
}
}

.module-menu-section ul {
li {
Expand Down Expand Up @@ -220,7 +235,7 @@
.module-alert, .module-attention, .module-note, .module-info, .module-question, .module-answer, .module-tool, .module-inprogress, .module-refer, .module-summary, .module-archive {
background-image: url('../images/module.jpg');
background-repeat: no-repeat;
/*padding-bottom: 1px; - the margin-bottom wasn't displaying? */
padding-bottom:5px;
padding-top: 30px;
@include box-sizing(border-box);
> div, > p, > h2, > h3, > h4, > h5, > h6 {
Expand All @@ -238,7 +253,7 @@
}
&.module-simplify {
background-image: none;
padding-top: 0;
padding-top: 5px;
}
}
.module-attention { @include module-colorize($attention, $border:"outline"); background-position: 0 0; }
Expand Down
8 changes: 8 additions & 0 deletions src/grids/sass/includes/util-mobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,12 @@ form {

.form-input-append button{
position:absolute;
}

.border-top,.border-right,.border-bottom,.border-left,.border-all {
float:none;
display:block;
outline:none;
position:static;
background:none;
}
7 changes: 1 addition & 6 deletions src/js/pe-ap.js
Original file line number Diff line number Diff line change
Expand Up @@ -1062,9 +1062,6 @@
'mathml': {
selector: 'math',
load: 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=Accessible',
/*update: function (elms) {
MathJax.Hub.Queue(["Typeset",MathJax.Hub,elms]);
},*/
support_check: function () {
// MathML
// http://www.w3.org/Math/
Expand All @@ -1074,11 +1071,9 @@
divParent,
div,
divCompare,
/*divCompare2,*/
mrow,
mo,
mfrac/*,
munderover*/;
mfrac;
if (document.createElementNS) {
ns = 'http://www.w3.org/1998/Math/MathML';
divParent = document.createElement('div');
Expand Down

0 comments on commit c543c2d

Please sign in to comment.