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

button variables updates

Browse Source
This commit is contained in:
Adam Bradley
2013-11-01 11:26:43 -05:00
parent 907121cc7d
commit 979bba4810
7 changed files with 142 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
dist/css/ionic.css vendored
View File

@@ -1925,8 +1925,8 @@ a.subdued‎ {
border-style: solid;
border-top: 1px solid transparent;
border-bottom: 1px solid #dddddd;
background-size: 0;
background-color: white; }
background-color: white;
background-size: 0; }
@media (min--moz-device-pixel-ratio: 1.5), (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx) {
.bar {
border-top: none !important;
@@ -2015,23 +2015,17 @@ a.subdued‎ {
.bar .title a {
color: inherit; }
.bar > .button {
-webkit-box-flex: 0;
-webkit-flex: 0;
-moz-box-flex: 0;
-moz-flex: 0;
-ms-flex: 0;
flex: 0;
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
min-height: 33px;
background-color: transparent;
padding: 0 8px;
min-height: 31px;
font-size: 12px;
line-height: 28px; }
line-height: 30px; }
.bar > .button i, .bar > .button .icon {
margin-top: 1px; }
.bar .button-bar {
line-height: 18px; }
font-size: 24px;
line-height: 29px; }
.bar .button-bar > .button {
min-height: 31px;
line-height: 31px; }
.bar .button-bar + .button, .bar .button + .button-bar {
margin-left: 5px; }
.bar .title + .button:last-child,
@@ -3317,8 +3311,9 @@ input[type="range"] {
position: relative;
display: inline-block;
margin: 0;
padding: 10px 12px 7px 12px;
min-height: 44px;
padding: 0 12px;
padding-top: 1px;
min-height: 42px;
border-width: 1px;
border-style: solid;
border-radius: 2px;
@@ -3327,24 +3322,24 @@ input[type="range"] {
text-align: center;
text-overflow: ellipsis;
font-size: 16px;
line-height: 23px;
line-height: 41px;
cursor: pointer; }
.button i, .button .icon {
display: inline-block;
padding: 0;
padding: 0 0 1px 0;
vertical-align: inherit;
font-size: 24px;
line-height: 22px; }
line-height: 40px; }
.button.button-icon {
padding: 12px 6px;
padding: 2px 4px;
background: none; }
.button.button-icon i, .button.button-icon .icon {
font-size: 32px; }
.button.button-clear {
-webkit-transition: opacity 0.1s;
transition: opacity 0.1s;
padding: 12px 6px;
max-height: 44px;
padding: 0 6px;
max-height: 42px;
border: none;
background: none;
box-shadow: none; }
@@ -3543,20 +3538,22 @@ input[type="range"] {
margin-bottom: 10px; }
.button-small {
padding: 1px 8px 1px 8px;
min-height: 32px;
line-height: 29px;
font-size: 12px; }
padding: 0 4px;
min-height: 28px;
font-size: 12px;
line-height: 27px; }
.button-small i, .button-small .icon {
font-size: 20px;
font-size: 16px;
line-height: 26px; }
.button-large {
padding: 12px 18px 12px 18px;
min-height: 52px;
font-size: 24px; }
padding: 0 12px;
min-height: 54px;
font-size: 18px;
line-height: 53px; }
.button-large i, .button-large .icon {
font-size: 32px; }
font-size: 32px;
line-height: 52px; }
.padding > .button.block:first-child {
margin-top: 0; }
@@ -3604,7 +3601,6 @@ a.button {
-moz-flex: 1;
-ms-flex: 1;
flex: 1;
display: block;
overflow: hidden;
padding: 0 16px;
width: 0;
@@ -3612,33 +3608,13 @@ a.button {
border-radius: 0;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 13px; }
white-space: nowrap; }
.button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.button-bar > .button:last-child {
border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.buttons {
display: -webkit-box;
display: -webkit-flex;
display: -moz-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex: 1;
-webkit-flex: 1;
-moz-box-flex: 1;
-moz-flex: 1;
-ms-flex: 1;
flex: 1;
-webkit-box-direction: normal;
-webkit-box-orient: horizontal;
-webkit-flex-direction: horizontal;
-moz-flex-direction: horizontal;
-ms-flex-direction: horizontal;
flex-direction: horizontal; }
.badge {
display: inline-block;
min-width: 10px;