mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-06 22:29:44 +08:00
Fixed #128 - tab item centering
This commit is contained in:
21
dist/css/ionic.css
vendored
21
dist/css/ionic.css
vendored
@ -1,5 +1,5 @@
|
|||||||
@charset "UTF-8";
|
@charset "UTF-8";
|
||||||
/*
|
/*!
|
||||||
Ionicons, v1.3.4
|
Ionicons, v1.3.4
|
||||||
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
|
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
|
||||||
https://twitter.com/helloimben https://twitter.com/ionicframework
|
https://twitter.com/helloimben https://twitter.com/ionicframework
|
||||||
@ -2045,7 +2045,7 @@ sub {
|
|||||||
fieldset {
|
fieldset {
|
||||||
margin: 0 2px;
|
margin: 0 2px;
|
||||||
padding: 0.35em 0.625em 0.75em;
|
padding: 0.35em 0.625em 0.75em;
|
||||||
border: 1px solid silver; }
|
border: 1px solid #c0c0c0; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1. Correct `color` not being inherited in IE 8/9.
|
* 1. Correct `color` not being inherited in IE 8/9.
|
||||||
@ -2466,13 +2466,13 @@ address {
|
|||||||
font-style: normal;
|
font-style: normal;
|
||||||
line-height: 1.42857; }
|
line-height: 1.42857; }
|
||||||
|
|
||||||
a.subdued {
|
a.subduedΓÇÄ {
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
color: #f8f8f8;
|
color: #f8f8f8;
|
||||||
text-decoration: none; }
|
text-decoration: none; }
|
||||||
a.subdued:hover {
|
a.subduedΓÇÄ:hover {
|
||||||
text-decoration: none; }
|
text-decoration: none; }
|
||||||
a.subdued:last-child {
|
a.subduedΓÇÄ:last-child {
|
||||||
padding-right: 0; }
|
padding-right: 0; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2937,6 +2937,9 @@ a.subdued {
|
|||||||
-moz-flex-direction: horizontal;
|
-moz-flex-direction: horizontal;
|
||||||
-ms-flex-direction: horizontal;
|
-ms-flex-direction: horizontal;
|
||||||
flex-direction: horizontal;
|
flex-direction: horizontal;
|
||||||
|
-webkit-justify-content: center;
|
||||||
|
-moz-justify-content: center;
|
||||||
|
justify-content: center;
|
||||||
background-color: #f8f8f8;
|
background-color: #f8f8f8;
|
||||||
background-image: linear-gradient(0deg, #b2b2b2, #b2b2b2 50%, transparent 50%);
|
background-image: linear-gradient(0deg, #b2b2b2, #b2b2b2 50%, transparent 50%);
|
||||||
border-color: #b2b2b2;
|
border-color: #b2b2b2;
|
||||||
@ -3017,7 +3020,7 @@ a.subdued {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin: auto;
|
max-width: 150px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
color: inherit;
|
color: inherit;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -4152,7 +4155,7 @@ input[type="checkbox"][readonly] {
|
|||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background: white;
|
background: white;
|
||||||
content: ' ';
|
content: ' ';
|
||||||
transition: background-color 0.1s ease-in-out; }
|
transition: background-color .1s ease-in-out; }
|
||||||
|
|
||||||
/* the checkmark within the box */
|
/* the checkmark within the box */
|
||||||
.checkbox input:after {
|
.checkbox input:after {
|
||||||
@ -4167,7 +4170,7 @@ input[type="checkbox"][readonly] {
|
|||||||
border-right: 0;
|
border-right: 0;
|
||||||
content: ' ';
|
content: ' ';
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.05s ease-in-out;
|
transition: opacity .05s ease-in-out;
|
||||||
-webkit-transform: rotate(-45deg);
|
-webkit-transform: rotate(-45deg);
|
||||||
transform: rotate(-45deg); }
|
transform: rotate(-45deg); }
|
||||||
|
|
||||||
@ -4652,7 +4655,7 @@ input[type="range"] {
|
|||||||
.button-icon:active, .button-icon.active {
|
.button-icon:active, .button-icon.active {
|
||||||
background: none;
|
background: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
text-shadow: 0px 0px 10px white; }
|
text-shadow: 0px 0px 10px #fff; }
|
||||||
|
|
||||||
.padding > .button.block:first-child {
|
.padding > .button.block:first-child {
|
||||||
margin-top: 0; }
|
margin-top: 0; }
|
||||||
|
|||||||
5
dist/css/themes/ionic-ios7.css
vendored
5
dist/css/themes/ionic-ios7.css
vendored
@ -1,4 +1,3 @@
|
|||||||
@charset "UTF-8";
|
|
||||||
/**
|
/**
|
||||||
* Nav controllers and header bar animations
|
* Nav controllers and header bar animations
|
||||||
*/
|
*/
|
||||||
@ -119,7 +118,7 @@
|
|||||||
right: 20px;
|
right: 20px;
|
||||||
transition: 0.2s ease;
|
transition: 0.2s ease;
|
||||||
transition-property: left, right;
|
transition-property: left, right;
|
||||||
transition-delay: 0s, 0.05s; }
|
transition-delay: 0s, .05s; }
|
||||||
|
|
||||||
.toggle :checked + .track {
|
.toggle :checked + .track {
|
||||||
/* When the toggle is "on" */
|
/* When the toggle is "on" */
|
||||||
@ -134,4 +133,4 @@
|
|||||||
right: 0;
|
right: 0;
|
||||||
left: 20px;
|
left: 20px;
|
||||||
-webkit-transform: none;
|
-webkit-transform: none;
|
||||||
transition-delay: 0.05s, 0s; }
|
transition-delay: .05s, 0s; }
|
||||||
|
|||||||
@ -98,6 +98,22 @@
|
|||||||
<h1>Settings</h1>
|
<h1>Settings</h1>
|
||||||
</content>
|
</content>
|
||||||
</tab>
|
</tab>
|
||||||
|
<tab title="Settings" icon-on="icon ion-ios7-gear" icon-off="icon ion-ios7-gear-outline">
|
||||||
|
<header class="bar bar-header bar-positive">
|
||||||
|
<h1 class="title">Settings</h1>
|
||||||
|
</header>
|
||||||
|
<content has-header="true" has-tabs="true">
|
||||||
|
<h1>Settings</h1>
|
||||||
|
</content>
|
||||||
|
</tab>
|
||||||
|
<tab title="Settings" icon-on="icon ion-ios7-gear" icon-off="icon ion-ios7-gear-outline">
|
||||||
|
<header class="bar bar-header bar-positive">
|
||||||
|
<h1 class="title">Settings</h1>
|
||||||
|
</header>
|
||||||
|
<content has-header="true" has-tabs="true">
|
||||||
|
<h1>Settings</h1>
|
||||||
|
</content>
|
||||||
|
</tab>
|
||||||
|
|
||||||
</tabs>
|
</tabs>
|
||||||
|
|
||||||
|
|||||||
@ -472,3 +472,9 @@
|
|||||||
}
|
}
|
||||||
align-content: $value;
|
align-content: $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@mixin justify-content($value: stretch) {
|
||||||
|
-webkit-justify-content: $value;
|
||||||
|
-moz-justify-content: $value;
|
||||||
|
justify-content: $value;
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@
|
|||||||
.tabs {
|
.tabs {
|
||||||
@include display-flex();
|
@include display-flex();
|
||||||
@include flex-direction(horizontal);
|
@include flex-direction(horizontal);
|
||||||
|
@include justify-content(center);
|
||||||
|
|
||||||
@include tab-style($tabs-default-bg, $tabs-default-border, $tabs-default-text);
|
@include tab-style($tabs-default-bg, $tabs-default-border, $tabs-default-text);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@ -72,7 +73,9 @@
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin: auto;
|
//margin: auto;
|
||||||
|
|
||||||
|
max-width: $tab-item-max-width;
|
||||||
|
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
|
|||||||
@ -266,6 +266,8 @@ $tabs-default-bg: $tabs-stable-bg;
|
|||||||
$tabs-default-border: $tabs-stable-border;
|
$tabs-default-border: $tabs-stable-border;
|
||||||
$tabs-default-text: $tabs-stable-text;
|
$tabs-default-text: $tabs-stable-text;
|
||||||
|
|
||||||
|
$tab-item-max-width: 150px;
|
||||||
|
|
||||||
|
|
||||||
// Items
|
// Items
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user