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

conflict fix

Browse Source 
Conflicts:
	dist/ionic.css
	scss/ionic/_structure-variables.scss
This commit is contained in:
Adam Bradley
2013-09-09 19:09:52 -05:00
parent c18dded02c a7101adcba
commit 78ab65c2b7
6 changed files with 63 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
example/headers.html
View File

@@ -20,36 +20,25 @@
<section>
<header class="bar bar-header bar-dark">
<div class="buttons">
<a class="button button-clear">Back</a>
<a class="button button-clear">This</a>
</div>
<a class="button">Back</a>
<h1 class="title">Really really really really really really really really long title!</h1>
<div class="buttons">
<a class="button">Forward</a>
</div>
<a class="button">This</a>
</header>
<div class="bar bar-header-secondary bar-dark">
<div class="bar bar-header-secondary bar-success">
<div class="button-bar">
<a class="button">Success</a>
<a class="button">Warning</a>
<a class="button">Danger</a>
</div>
</div>
<header class="bar bar-header bar-dark">
<div class="buttons">
<a class="button button-clear">Back</a>
<a class="button button-clear">This</a>
</div>
<header class="bar bar-header bar-default">
<a class="button">Back</a>
<div class="button-bar">
<a class="button">Success</a>
<a class="button">Warning</a>
<a class="button">Danger</a>
</div>
<div class="buttons">
<a class="button button-clear">Back</a>
<a class="button button-clear">This</a>
</div>
<a class="button">This</a>
</header>
<main class="content content-padded has-header">