javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename padded/padding, inset/margin

Browse Source
This commit is contained in:
Adam Bradley
2013-10-15 15:08:41 -05:00
parent 1828379217
commit d9543e56c8
34 changed files with 203 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/actionsheet.html
View File

@ -17,7 +17,7 @@
</header>
<main class="content has-header">
<div style="width: 100%; height: 2000px; background: url('tree_bark.png') repeat;" class="padded">
<div style="width: 100%; height: 2000px; background: url('tree_bark.png') repeat;" class="padding">
<a href="#" class="button button-warning" id="modal-opener">Open Sheet</a>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>

2
test/alerts.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Alerts</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<p class="alert">
<strong>Warning!</strong> Best check yo self, you're not looking too good.

2
test/button-bar.html
View File

@ -14,7 +14,7 @@
</header>
<div class="content-wrapper">
<main class="content padded has-header">
<main class="content padding has-header">
<p>
<div class="button-bar">
<a class="button button-primary">Success</a>

10
test/buttons.html
View File

@ -16,9 +16,9 @@
<div class="content-wrapper">
<main class="content has-header">
<div class="padded">
<div class="padding">
<h3>Default (Block w/ parent .padded)</h3>
<h3>Default (Block w/ parent .padding)</h3>
<p>
<a class="button button-default">Default</a>
<a class="button button-secondary">Secondary</a>
@ -106,7 +106,7 @@
</div>
<h3>Default (Block w/out padded)</h3>
<h3>Default (Block w/out padding)</h3>
<p>
<a class="button button-default">Default</a>
<a class="button button-secondary">Secondary</a>
@ -118,8 +118,8 @@
<a class="button button-dark">Dark</a>
</p>
<h3>Default (Block w/out padded and parent .inset)</h3>
<p class="inset">
<h3>Default (Block w/out padding and parent .margin)</h3>
<p class="margin">
<a class="button button-default">Default</a>
<a class="button button-secondary">Secondary</a>
<a class="button button-primary">Primary</a>

2
test/cards.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Cards</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
todo
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>

2
test/controllers/sideMenu.html
View File

@ -17,7 +17,7 @@
<h1 class="title">Tab Bars</h1>
</header>
<main class="has-header content padded">
<main class="has-header content padding">
<h1>Swipe me, side to side</h1>
</main>
</section>

2
test/footers.html
View File

@ -19,7 +19,7 @@
<h1 class="title">Footer</h1>
</header>
<main class="content padded has-header has-footer">
<main class="content padding has-header has-footer">
<p>Footer should always stay at the bottom of the screen, and on top of the main content.</p>
<p>Content element must have "has-footer" as a classname.</p>
<p><button id="btnAddMore">Dynamically Add More Content</button></p>

2
test/headers.html
View File

@ -55,7 +55,7 @@
</div>
</div>
<main class="content padded has-header">
<main class="content padding has-header">
<p>Content element must have "has-header" as a classname.</p>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>

4
test/index.html
View File

@ -16,9 +16,9 @@
<div class="content-wrapper">
<main class="content padded has-header">
<main class="content padding has-header">
<p><a class="button button-block button-default" href="alerts.html"><i class="icon-star"></i> Alerts</a></p>
<p><a class="button button-block button-default" href="buttons.html"><i class="icon-star-half-empty"></i> Buttons</a></p>
<p><a class="button button-block button-default" href="buttons.html"><i class="icon-star"></i> Buttons</a></p>
<p><a class="button button-block button-default" href="button-bar.html"><i class="icon-star"></i> Button Bar</a></p>
<p><a class="button button-block button-default" href="cards.html"><i class="icon-star-empty"></i> Cards</a></p>
<p><a class="button button-block button-default" href="footers.html"><i class="icon-star"></i> Footers</a></p>

2
test/input-radio.html
View File

@ -60,7 +60,7 @@
</label>
</div>
<div class="padded">
<div class="padding">
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>

2
test/input-range.html
View File

@ -25,7 +25,7 @@
</li>
</ul>
<div class="inset">
<div class="margin">
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>

2
test/input-select.html
View File

@ -28,7 +28,7 @@
</li>
</ul>
<div class="inset">
<div class="margin">
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>

26
test/input-text.html
View File

@ -36,7 +36,7 @@
</div>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<input type="text" placeholder="First Name">
</label>
@ -48,7 +48,7 @@
</label>
</div>
<div class="padded">
<div class="padding">
<h3>Default Text Input, Not Inset, With Content Padding</h3>
<div class="input-group">
@ -67,7 +67,7 @@
</div>
<h3>Default Text Input, Is Inset, With Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<input type="email" placeholder="Email">
</label>
@ -113,14 +113,14 @@
</div>
<h3>Inline Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<div class="padding">
<h3>Inline Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group">
@ -135,13 +135,13 @@
</div>
<h3>Inline Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<span class="input-label">Filter By Name</span>
<input type="text" placeholder="Enter keywords">
@ -176,14 +176,14 @@
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<div class="input-group stacked-label margin">
<label class="input-row">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<div class="padding">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
@ -194,7 +194,7 @@
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<div class="input-group stacked-label margin">
<label class="input-row">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
@ -212,7 +212,7 @@
</div>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-row">
<i class="icon-star placeholder-icon"></i>
<input type="text" placeholder="Favorites">
@ -229,7 +229,7 @@
</label>
</div>
<div class="padded">
<div class="padding">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
@ -241,7 +241,7 @@
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<div class="input-group stacked-label margin">
<label class="input-row">
<i class="icon-headphone"></i>
<span class="input-label">Favorite Music</span>

10
test/input-textarea.html
View File

@ -30,7 +30,7 @@
</div>
<h3>Default Text Area, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-wrapper">
<textarea rows="3" placeholder="Summary"></textarea>
</label>
@ -39,7 +39,7 @@
</label>
</div>
<div class="padded">
<div class="padding">
<h3>Default Text Area, Not Inset, With Content Padding</h3>
<div class="input-group">
@ -58,7 +58,7 @@
</div>
<h3>Default Text Area, Is Inset, With Content Padding</h3>
<div class="input-group inset">
<div class="input-group margin">
<label class="input-wrapper">
<textarea rows="3" placeholder="3 Rows"></textarea>
</label>
@ -80,7 +80,7 @@
</div>
<h3>Stacked Label On Top Of Text Area, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<div class="input-group stacked-label margin">
<label class="input-wrapper">
<span class="input-label">Summary</span>
<textarea rows="3" placeholder="3 Rows"></textarea>
@ -98,7 +98,7 @@
</div>
<h3>Stacked Label On Top Of Text Area, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<div class="input-group stacked-label margin">
<label class="input-wrapper">
<span class="input-label">Summary</span>
<textarea rows="3" placeholder="3 Rows"></textarea>

2
test/input-toggle-ios7.html
View File

@ -39,7 +39,7 @@
</li>
</ul>
<div class="inset">
<div class="margin">
<p>
<button id="btnTest1">Toggle Airplane Mode</button>
</p>

2
test/input-toggle.html
View File

@ -39,7 +39,7 @@
</li>
</ul>
<div class="inset">
<div class="margin">
<p>
<button id="btnTest1">Toggle Airplane Mode</button>
</p>

2
test/menus.html
View File

@ -22,7 +22,7 @@
</button>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<p><button class="button button-primary" data-panel-toggle="my-other-left-panel">Other Left Side Panel</button></p>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>

4
test/modals.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Modals</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<a href="#" class="button button-warning" id="modal-opener">Open Modal</a>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>
@ -29,7 +29,7 @@
<a href="#" class="button" id="modal-closer">Close</a>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<h2>I'm a thing</h2>
<div style="background-color: blue; width: 100%; height: 1000px"></div>
</main>

2
test/popovers.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Popovers</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
todo
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>

2
test/pull-to-refresh.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Pull To Refresh</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
todo
<p>Pull the content down to refresh.</p>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>

2
test/scroll.html
View File

@ -17,7 +17,7 @@
</div>
<div class="content-wrapper">
<div class="content has-header has-footer">
<div style="width: 100%; height: 2000px; background: url('tree_bark.png') repeat;" class="padded">
<div style="width: 100%; height: 2000px; background: url('tree_bark.png') repeat;" class="padding">
<div class="card">
<div class="card-header card-header-secondary">
Your update

2
test/side-menus.html
View File

@ -24,7 +24,7 @@
</div>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>

2
test/swipe.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Swipe</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
todo
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</main>

2
test/tab-bars.html
View File

@ -27,7 +27,7 @@
<h1 class="title">Tab Bars</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
content
</main>

2
test/type.html
View File

@ -16,7 +16,7 @@
<h1 class="title">Type</h1>
</header>
<main class="content padded has-header">
<main class="content padding has-header">
<h1>I'm an H1 Element</h1>
<h2>I'm an H2 Element</h2>
<h3>I'm an H3 Element</h3>