javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

use display-flex() mixin

Browse Source
This commit is contained in:
Adam Bradley
2013-11-26 23:55:30 -06:00
parent 1d7fb01a43
commit c38de498e9
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/ionic.css vendored
View File

@@ -2663,6 +2663,12 @@ a.subdued {
* --------------------------------------------------
*/
.bar {
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -moz-flex;
display: -ms-flexbox;
display: flex;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@@ -2671,8 +2677,6 @@ a.subdued {
right: 0;
left: 0;
z-index: 10;
display: -webkit-box;
display: box;
box-sizing: border-box;
padding: 5px;
width: 100%;
@@ -2790,8 +2794,8 @@ a.subdued {
font-size: 12px;
line-height: 30px; }
.bar .button .icon {
padding-left: 2px;
padding-right: 2px;
padding-left: 2px;
font-size: 24px;
line-height: 30px; }
.bar .button-bar > .button, .bar .buttons > .button {

6
scss/_bar.scss
View File

@@ -5,14 +5,13 @@
*/
.bar {
@include display-flex();
@include user-select(none);
position: absolute;
right: 0;
left: 0;
z-index: 10;
display: -webkit-box;
display: box;
box-sizing: border-box;
padding: $bar-padding-portrait;
@@ -44,6 +43,7 @@
border: none;
background: none;
color: #fff;
.button {
color: #fff;
}
@@ -123,8 +123,8 @@
line-height: $button-bar-button-height - $button-border-width - 1;
.icon {
padding-left: 2px;
padding-right: 2px;
padding-left: 2px;
font-size: $button-bar-button-icon-size;
line-height: $button-bar-button-height - $button-border-width - 1;
}