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

Merge branch 'master' of https://github.com/driftyco/framework-prototypes

Browse Source 
Conflicts:
	dist/ionic.css
	scss/ionic/structure/_bar.scss
This commit is contained in:
Adam Bradley
2013-09-10 13:54:30 -05:00
parent 292ff90193 d2b0f7f12a
commit 41ee7fbd64
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic.conf.js
View File

@ -21,7 +21,8 @@ module.exports = function(config) {
'vendor/angular/1.2.0rc1/*', 'vendor/angular/1.2.0rc1/*',
'ext/angular/src/**/*.js', 'ext/angular/src/**/*.js',
'ext/angular/test/**/*.js', 'ext/angular/test/**/*.js',
'hacking/**/*.js' 'hacking/**/*.js',
'test/**/*.js'
], ],

36
scss/ionic/_bar.scss
View File

@ -44,51 +44,51 @@
&.bar-primary { &.bar-primary {
background-color: $bar-primary-bg; background-color: $bar-primary-bg;
border-color: $bar-primary-border-color; border-color: $bar-primary-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
&.bar-info { &.bar-info {
background-color: $bar-info-bg; background-color: $bar-info-bg;
border-color: $bar-info-border-color; border-color: $bar-info-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
&.bar-success { &.bar-success {
background-color: $bar-success-bg; background-color: $bar-success-bg;
border-color: $bar-success-border-color; border-color: $bar-success-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
&.bar-warning { &.bar-warning {
background-color: $bar-warning-bg; background-color: $bar-warning-bg;
border-color: $bar-warning-border-color; border-color: $bar-warning-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
&.bar-danger { &.bar-danger {
background-color: $bar-danger-bg; background-color: $bar-danger-bg;
border-color: $bar-danger-border-color; border-color: $bar-danger-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
&.bar-dark { &.bar-dark {
background-color: $bar-dark-bg; background-color: $bar-dark-bg;
border-color: $bar-dark-border-color; border-color: $bar-dark-border-color;
color: $gray-light; color: $white;
.tab-item a { .tab-item a {
color: $gray-light; color: $white;
} }
} }
@ -170,33 +170,33 @@
.bar-primary { .bar-primary {
.button { .button {
@include button-style($button-primary-bg, $button-primary-border, $gray-light); @include button-style($button-primary-bg, $button-primary-border, $white);
} }
} }
.bar-info { .bar-info {
.button { .button {
@include button-style($button-info-bg, $button-info-border, $gray-light); @include button-style($button-info-bg, $button-info-border, $white);
} }
} }
.bar-success { .bar-success {
.button { .button {
@include button-style($button-success-bg, $button-success-border, $gray-light); @include button-style($button-success-bg, $button-success-border, $white);
} }
} }
.bar-warning { .bar-warning {
.button { .button {
@include button-style($button-warning-bg, $button-warning-border, $gray-light); @include button-style($button-warning-bg, $button-warning-border, $white);
} }
} }
.bar-danger { .bar-danger {
.button { .button {
@include button-style($button-danger-bg, $buttonDangerBorder, $gray-light); @include button-style($button-danger-bg, $buttonDangerBorder, $white);
} }
} }
.bar-dark { .bar-dark {
// A default style for buttons // A default style for buttons
.button { .button {
@include button-style($button-dark-bg, $button-dark-border, $gray-light); @include button-style($button-dark-bg, $button-dark-border, $white);
} }
} }

22
scss/ionic/_button.scss
View File

@ -31,22 +31,22 @@
@include button-style($button-secondary-bg, $button-secondary-border, $gray-dark); @include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
} }
&.button-primary { &.button-primary {
@include button-style($button-primary-bg, $button-primary-border, $gray-light); @include button-style($button-primary-bg, $button-primary-border, $white);
} }
&.button-info { &.button-info {
@include button-style($button-info-bg, $button-info-border, $gray-light); @include button-style($button-info-bg, $button-info-border, $white);
} }
&.button-success { &.button-success {
@include button-style($button-success-bg, $button-success-border, $gray-light); @include button-style($button-success-bg, $button-success-border, $white);
} }
&.button-warning { &.button-warning {
@include button-style($button-warning-bg, $button-warning-border, $gray-light); @include button-style($button-warning-bg, $button-warning-border, $white);
} }
&.button-danger { &.button-danger {
@include button-style($button-danger-bg, $buttonDangerBorder, $gray-light); @include button-style($button-danger-bg, $buttonDangerBorder, $white);
} }
&.button-dark { &.button-dark {
@include button-style($button-dark-bg, $button-dark-border, $gray-light); @include button-style($button-dark-bg, $button-dark-border, $white);
} }
&.button-clear { &.button-clear {
@ -54,6 +54,16 @@
border: none; border: none;
padding: $button-clear-padding; padding: $button-clear-padding;
} }
&.button-icon {
background: none;
border: none;
&:active, &.active {
text-shadow: 0px 0px 10px #fff;
box-shadow: none;
background: none;
}
}
} }
a.button { a.button {

10
test/views/bar.js Normal file
View File

@ -0,0 +1,10 @@
describe('Bar view', function() {
beforeEach(function() {
});
it('Should initialize', function() {
});
});