javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

.button css updates

Browse Source
This commit is contained in:
Adam Bradley
2015-06-19 13:31:11 -05:00
parent f2d5781bb3
commit 5dfa350f29
13 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ionic/components/action-menu/action-menu.scss
View File

@ -58,7 +58,8 @@ $action-menu-options-border-color: #d1d3d6 !default;
z-index: $z-index-action-menu; z-index: $z-index-action-menu;
overflow: hidden; overflow: hidden;
.button { button,
[button] {
display: block; display: block;
padding: 1px; padding: 1px;
width: 100%; width: 100%;
@ -80,7 +81,8 @@ $action-menu-options-border-color: #d1d3d6 !default;
} }
} }
.button.active, .button.activated { button.activated,
[button].activated {
box-shadow: none; box-shadow: none;
border-color: $action-menu-options-border-color; border-color: $action-menu-options-border-color;
color: $action-menu-options-text-color; color: $action-menu-options-text-color;
@ -106,10 +108,12 @@ $action-menu-options-border-color: #d1d3d6 !default;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
.button { button,
[button] {
border-width: 1px 0px 0px 0px; border-width: 1px 0px 0px 0px;
} }
.button:first-child:last-child { button:first-child:last-child,
[button]:first-child:last-child {
border-width: 0; border-width: 0;
} }
} }
@ -119,7 +123,8 @@ $action-menu-options-border-color: #d1d3d6 !default;
} }
.action-menu-cancel { .action-menu-cancel {
.button { button,
[button] {
font-weight: 500; font-weight: 500;
} }
} }

12
ionic/components/action-menu/extensions/material.scss
View File

@ -1,5 +1,5 @@
.platform-android { .action-menu-md {
.action-menu-backdrop.active { .action-menu-backdrop.active {
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.2);
@ -9,7 +9,8 @@
margin: 0; margin: 0;
.action-menu-title, .action-menu-title,
.button { button,
[button] {
text-align: left; text-align: left;
border-color: transparent; border-color: transparent;
font-size: 16px; font-size: 16px;
@ -22,8 +23,8 @@
color: #666; color: #666;
} }
.button.active, button.activated,
.button.activated { [button].activated {
background: #e8e8e8; background: #e8e8e8;
} }
} }
@ -40,7 +41,8 @@
.action-menu-has-icons { .action-menu-has-icons {
.button { button,
[button] {
padding-left: 56px; padding-left: 56px;
} }

3
ionic/components/alert/extensions/ios.scss
View File

@ -35,7 +35,8 @@ $alert-ios-button-font-size: 2rem !default;
.alert-actions { .alert-actions {
min-height: 44px; min-height: 44px;
.button { button,
[button] {
flex: 1; flex: 1;
border: 0; border: 0;
background: transparent; background: transparent;

3
ionic/components/alert/extensions/material.scss
View File

@ -33,7 +33,8 @@ $alert-material-box-shadow: 0px 27px 24px 0 rgba(0, 0, 0, 0.2) !de
background: $alert-material-background-color; background: $alert-material-background-color;
margin: $alert-material-content-margin; margin: $alert-material-content-margin;
.button { button,
[button] {
border: 0; border: 0;
} }
} }

6
ionic/components/app/test/snapcat/main.html
View File

@ -85,7 +85,7 @@
ion-toolbar { ion-toolbar {
letter-spacing: 1px; letter-spacing: 1px;
} }
.platform-ios ion-toolbar .button i { .platform-ios ion-toolbar button i {
color: #fff !important; color: #fff !important;
font-size: 24px !important; font-size: 24px !important;
} }
@ -122,13 +122,13 @@
font-size: 18px; font-size: 18px;
} }
heart-modal .button-icon { heart-modal icon {
position: absolute; position: absolute;
top: 13px; top: 13px;
left: 0px; left: 0px;
} }
heart-modal .button-icon i { heart-modal icon i {
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
} }

3
ionic/components/app/util.scss
View File

@ -63,7 +63,8 @@ $content-padding: 10px !default;
outline: thin dotted; outline: thin dotted;
} }
.button:focus { button:focus,
[button]:focus {
outline-offset: -2px; outline-offset: -2px;
outline: 2px solid red; outline: 2px solid red;
} }

5
ionic/components/nav-bar/extensions/ios.scss
View File

@ -57,7 +57,8 @@ $navbar-ios-button-background-color: transparent !default;
overflow: inherit; overflow: inherit;
} }
.button { button,
[button] {
font-size: $navbar-ios-button-font-size; font-size: $navbar-ios-button-font-size;
color: $navbar-ios-button-text-color; color: $navbar-ios-button-text-color;
border: none; border: none;
@ -68,7 +69,7 @@ $navbar-ios-button-background-color: transparent !default;
background: $navbar-ios-button-background-color; background: $navbar-ios-button-background-color;
} }
.button-icon { [icon] {
font-size: 2.5rem; font-size: 2.5rem;
} }

3
ionic/components/nav-bar/extensions/material.scss
View File

@ -18,7 +18,8 @@ $navbar-material-button-text-color: #007aff !default;
font-size: $navbar-material-title-font-size; font-size: $navbar-material-title-font-size;
} }
.button { button,
[button] {
font-size: $navbar-material-button-font-size; font-size: $navbar-material-button-font-size;
color: $navbar-material-button-text-color; color: $navbar-material-button-text-color;
border: none; border: none;

3
ionic/components/nav-bar/nav-bar.scss
View File

@ -82,7 +82,8 @@ ion-title {
order: map-get($navbar-order, 'secondary'); order: map-get($navbar-order, 'secondary');
} }
.navbar .button { .navbar button,
.navbar [button] {
background: transparent; background: transparent;
border: none; border: none;
} }

3
ionic/components/segment/extensions/ios.scss
View File

@ -2,7 +2,8 @@
.ion-segment { .ion-segment {
> .button { > button,
> [button] {
border-width: 1px; border-width: 1px;
transition: 100ms all linear; transition: 100ms all linear;

3
ionic/components/segment/segment.scss
View File

@ -5,7 +5,8 @@ ion-segment { display: block; }
flex: 1; flex: 1;
width: 100%; width: 100%;
> .button { > button,
> [button] {
flex: 1; flex: 1;
display: block; display: block;

3
ionic/components/toolbar/extensions/ios.scss
View File

@ -50,7 +50,8 @@ $toolbar-ios-button-background-color: transparent !default;
font-weight: 500; font-weight: 500;
} }
.button { button,
[button] {
font-size: $toolbar-ios-button-font-size; font-size: $toolbar-ios-button-font-size;
color: $toolbar-ios-button-text-color; color: $toolbar-ios-button-text-color;
border: none; border: none;

3
ionic/components/toolbar/toolbar.scss
View File

@ -50,7 +50,8 @@ ion-toolbar ion-title {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.toolbar .button { .toolbar button,
.toolbar [button] {
background: transparent; background: transparent;
border: none; border: none;
} }