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

button updates

Browse Source
This commit is contained in:
Adam Bradley
2013-10-16 11:48:26 -05:00
parent a4a1fba6dc
commit ebab110ffa
5 changed files with 2040 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2006
dist/css/ionic-ios7.css vendored
View File

File diff suppressed because it is too large Load Diff

25
dist/css/ionic-scoped.css vendored
View File

@ -2187,18 +2187,17 @@
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 8px 12px; padding: 8px 12px;
border-width: 0; border-width: 1px;
border-style: solid; border-style: solid;
border-top-width: 1px; border-radius: 2px;
border-bottom-width: 1px;
color: #222222; color: #222222;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
line-height: 20px;
cursor: pointer; } cursor: pointer; }
.ionic .button.button-icon { .ionic .button.button-icon {
padding: 4px 5px; padding: 4px 5px;
width: auto;
border: none; border: none;
background: none; } background: none; }
.ionic .button.button-clear { .ionic .button.button-clear {
@ -2398,14 +2397,20 @@
background: none; background: none;
box-shadow: none; box-shadow: none;
text-shadow: 0px 0px 10px white; } text-shadow: 0px 0px 10px white; }
.ionic .button.block {
margin-top: 10px;
margin-bottom: 10px; }
.ionic .button-full,
.ionic .button-full > .button {
margin-right: 0;
margin-left: 0;
border-right-width: 0;
border-left-width: 0;
border-radius: 0; }
.ionic button.block {
width: 100%; }
.ionic a.button { .ionic a.button {
text-decoration: none; } text-decoration: none; }
.ionic .margin.button,
.ionic .margin .button,
.ionic .padding .button {
border-right-width: 1px;
border-left-width: 1px;
border-radius: 2px; }
.ionic .button-bar { .ionic .button-bar {
box-flex: 1; box-flex: 1;
-webkit-box-flex: 1; -webkit-box-flex: 1;

28
dist/css/ionic.css vendored
View File

@ -2666,18 +2666,17 @@ input[type="checkbox"][readonly] {
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 8px 12px; padding: 8px 12px;
border-width: 0; border-width: 1px;
border-style: solid; border-style: solid;
border-top-width: 1px; border-radius: 2px;
border-bottom-width: 1px;
color: #222222; color: #222222;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
line-height: 20px;
cursor: pointer; } cursor: pointer; }
.button.button-icon { .button.button-icon {
padding: 4px 5px; padding: 4px 5px;
width: auto;
border: none; border: none;
background: none; } background: none; }
.button.button-clear { .button.button-clear {
@ -2877,17 +2876,24 @@ input[type="checkbox"][readonly] {
background: none; background: none;
box-shadow: none; box-shadow: none;
text-shadow: 0px 0px 10px white; } text-shadow: 0px 0px 10px white; }
.button.block {
margin-top: 10px;
margin-bottom: 10px; }
.button-full,
.button-full > .button {
margin-right: 0;
margin-left: 0;
border-right-width: 0;
border-left-width: 0;
border-radius: 0; }
button.block {
width: 100%; }
a.button { a.button {
text-decoration: none; } text-decoration: none; }
.margin.button,
.margin .button,
.padding .button {
border-right-width: 1px;
border-left-width: 1px;
border-radius: 2px; }
.button-bar { .button-bar {
box-flex: 1; box-flex: 1;
-webkit-box-flex: 1; -webkit-box-flex: 1;

2
scss/ionic-ios7/ionic-ios7.scss
View File

@ -35,7 +35,7 @@
"../ionic/card", "../ionic/card",
// Animations // Animations
"../ionic/animations"; "../ionic/animations",
// Util // Util
"../ionic/util"; "../ionic/util";