Skip to content

Commit

Permalink
Merge pull request #1 from cfarquharson/master
Browse files Browse the repository at this point in the history 
Removed calendar CSS, modified icon CSS  and added icon html page
  • Loading branch information
@LaurentGoderre
LaurentGoderre committed Sep 11, 2012
2 parents 37e81e7 + c5cd832 commit 6432728
Show file tree
Hide file tree
Showing 78 changed files with 953 additions and 573 deletions.
Binary file modified build/grids/images/control-record.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions demos/grids/grid-base-eng.html
View file
Expand Up @@ -1382,6 +1382,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down
2 changes: 2 additions & 0 deletions demos/grids/grid-basic-eng.html
View file
Expand Up @@ -112,6 +112,7 @@ <h1 id="wb-cont">Basic effects</h1>
<a href="grid-color-eng.html" class="button button-accent">Color</a>
<a href="grid-button-eng.html" class="button button-accent">Buttons</a>
<a href="grid-border-eng.html" class="button button-accent">Borders</a>
<a href="grid-icon-eng.html" class="button button-accent">Icons</a>
<a href="grid-opacity-eng.html" class="button button-accent">Opacity</a>
</p>
<p class="button-group">
Expand Down Expand Up @@ -146,6 +147,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down
38 changes: 1 addition & 37 deletions demos/grids/grid-border-eng.html
View file
Expand Up @@ -34,43 +34,6 @@
<!--<![endif]-->

<!-- CustomScriptsCSSStart -->
<style type="text/css">


.border-top,.border-right,.border-bottom,.border-left,.border-all {
display:inline;
float:left;
min-height:1px;
position:relative;
background-image:url(images/border.gif);
}

.border-top {
background-position:0 0;
background-repeat:repeat-x;
min-height:1px;
}

.border-bottom {
background-position:0 bottom;
background-repeat:repeat-x;
min-height:1px;
}

.border-left {
background-position:left 0;
background-repeat:repeat-y;
}

.border-right {
background-position:right 0;
background-repeat:repeat-y;
}
.border-all {
outline:1px solid #ccc;
background:none;
}
</style>
<!-- CustomScriptsCSSEnd -->
</head>

Expand Down Expand Up @@ -430,6 +393,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down
29 changes: 15 additions & 14 deletions demos/grids/grid-button-eng.html
View file
Expand Up @@ -141,7 +141,7 @@ <h2 id="base">Base classes</h2>
<tbody>
<tr>
<td><button class="button">Default</button></td>
<td><button class="button button-disabled">Default</button></td>
<td><button class="button button-disabled" disabled="disabled">Default</button></td>
<td><code>button</code></td>
<td>Standard gray button with gradient</td>
</tr>
Expand All @@ -153,37 +153,37 @@ <h2 id="base">Base classes</h2>
</tr>
<tr>
<td><button class="button button-info">Info</button></td>
<td><button class="button button-info button-disabled">Info</button></td>
<td><button class="button button-info button-disabled" disabled="disabled">Info</button></td>
<td><code>button button-info</code></td>
<td>Used as an alternate to the default styles</td>
</tr>
<tr>
<td><button class="button button-confirm">Confirm</button></td>
<td><button class="button button-confirm button-disabled">Confirm</button></td>
<td><button class="button button-confirm button-disabled" disabled="disabled">Confirm</button></td>
<td><code>button button-confirm</code></td>
<td>Indicates a successful or positive action</td>
</tr>
<tr>
<td><button class="button button-alert">Alert</button></td>
<td><button class="button button-alert button-disabled">Alert</button></td>
<td><button class="button button-alert button-disabled" disabled="disabled">Alert</button></td>
<td><code>button button-alert</code></td>
<td>Indicates caution should be taken with this action</td>
</tr>
<tr>
<td><button class="button button-attention">Attention</button></td>
<td><button class="button button-attention button-disabled">Attention</button></td>
<td><button class="button button-attention button-disabled" disabled="disabled">Attention</button></td>
<td><code>button button-attention</code></td>
<td>Indicates a dangerous or potentially negative action</td>
</tr>
<tr>
<td><button class="button button-dark">Dark</button></td>
<td><button class="button button-dark button-disabled">Dark</button></td>
<td><button class="button button-dark button-disabled" disabled="disabled">Dark</button></td>
<td><code>button button-dark</code></td>
<td>Alternate dark gray button, not tied to a semantic action or use</td>
</tr>
<tr>
<td><button class="button button-none">None</button></td>
<td><button class="button button-none button-disabled">None</button></td>
<td><button class="button button-none button-disabled" disabled="disabled">None</button></td>
<td><code>button button-none</code></td>
<td>Maintains the dimensions of a button without creating the visual style</td>
</tr>
Expand Down Expand Up @@ -340,7 +340,7 @@ <h2 id="examples">Examples</h2>
<a href="#embedded" class="button button-small">E<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small">F<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small">G<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small button-accent button-disabled">H<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small button-accent button-disabled" disabled="disabled">H<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small">I<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small">J<span class="wb-invisible">topics</span></a>
<a href="#embedded" class="button button-small">K<span class="wb-invisible">topics</span></a>
Expand All @@ -365,7 +365,7 @@ <h2 id="examples">Examples</h2>
<a href="#embedded" class="button button-small button-accent">Previous<span class="wb-invisible">page of search results</span></a>
<a href="#embedded" class="button button-small">1<span class="wb-invisible">: Page 1 of search results</span></a>
<a href="#embedded" class="button button-small">2<span class="wb-invisible">: Page 2 of search results</span></a>
<span class="button button-small button-attention button-disabled">3<span class="wb-invisible">: Page 3 of search results</span></span>
<span class="button button-small button-attention button-disabled" disabled="disabled">3<span class="wb-invisible">: Page 3 of search results</span></span>
<a href="#embedded" class="button button-small">4<span class="wb-invisible">: Page 4 of search results</span></a>
<a href="#embedded" class="button button-small">5<span class="wb-invisible">: Page 5 of search results</span></a>
<a href="#embedded" class="button button-small">6<span class="wb-invisible">: Page 6 of search results</span></a>
Expand All @@ -383,20 +383,20 @@ <h2 id="examples">Examples</h2>
</p>


<ul class="menu-horizontal span-3 indent-none">
<ul class="menu-horizontal span-3">
<li><a href="#embedded" class="button button-small">A<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">B<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled">C<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled" disabled="disabled">C<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">D<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">E<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">F<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">G<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small button-accent button-disabled">H<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small button-accent button-disabled" disabled="disabled">H<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">I<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">J<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">K<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">L<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled">M<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled" disabled="disabled">M<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">N<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">O<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">P<span class="wb-invisible">topics</span></a></li>
Expand All @@ -406,7 +406,7 @@ <h2 id="examples">Examples</h2>
<li><a href="#embedded" class="button button-small">T<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">U<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">V<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled">W<span class="wb-invisible">topics</span></a></li>
<li><a class="button button-small button-disabled" disabled="disabled">W<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">X<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">Y<span class="wb-invisible">topics</span></a></li>
<li><a href="#embedded" class="button button-small">Z<span class="wb-invisible">topics</span></a></li>
Expand Down Expand Up @@ -460,6 +460,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down
1 change: 1 addition & 0 deletions demos/grids/grid-color-eng.html
View file
Expand Up @@ -251,6 +251,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down
16 changes: 1 addition & 15 deletions demos/grids/grid-form-eng.html
View file
Expand Up @@ -34,21 +34,6 @@
<!--<![endif]-->

<!-- CustomScriptsCSSStart -->
<style>
form.background-light{padding-top:10px;}
.form-radio.form-label-inline,.form-checkbox.form-label-inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
.form-radio.form-label-inline + .form-radio.form-label-inline,.form-checkbox.form-label-inline + .form-checkbox.form-label-inline{margin-left:10px;}
.ui-mobile form [class*=width-]{width:100%!important;}
.ui-mobile form.background-light > *{margin-left:0;margin-right:0;}
.ui-mobile .form-inline > *{margin-right:0;}
.ui-mobile .form-radio.form-label-inline,.ui-mobile .form-checkbox.form-label-inline{display:block;padding:0;}
.ui-mobile .form-radio,.ui-mobile .form-checkbox{padding:0;}
.ui-mobile form.background-light{outline:none;}
.ui-mobile .form-inline label{display:block;}
.ui-mobile .form-horizontal label{text-align:left;}
.ui-mobile form [class*=margin-],.ui-mobile form [class*=span-]{margin:0!important;}
.ui-mobile .form-input-append button{position:absolute;}
</style>
<!-- CustomScriptsCSSEnd -->
</head>

Expand Down Expand Up @@ -974,6 +959,7 @@ <h3><a href="grid-basic-eng.html">Basic effects</a></h3>
<li><a href="grid-color-eng.html">Colour</a></li>
<li><a href="grid-button-eng.html">Buttons</a></li>
<li><a href="grid-border-eng.html">Borders</a></li>
<li><a href="grid-icon-eng.html">Icons</a></li>
<li><a href="grid-opacity-eng.html">Opacity</a></li>
<li><a href="grid-proximity-eng.html">Proximity</a></li>
<li><a href="grid-position-eng.html">Positioning and alignment</a></li>
Expand Down

0 comments on commit 6432728

Please sign in to comment.