Files
ionic-framework/ionic/components/view/view.scss.orig
Adam Bradley 2e6fb5cd04 Merge remote-tracking branch 'origin/master'
Conflicts:
	ionic/components/nav/nav-item.js
	ionic/components/view/view.scss
2015-06-02 15:35:57 -05:00

31 lines
500 B
SCSS

ion-view {
display: flex;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: white;
<<<<<<< HEAD
=======
// by default this is display: none;
// and the transition animation will display it
//display: none;
flex-direction: column;
display: flex;
/*
TODO: This is probably not the most common case,
should be display flex first, then remove for special cases.
&.show-view {
display: flex;
}
*/
>>>>>>> origin/master
}