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

bar stable fix

Browse Source
This commit is contained in:
Adam Bradley
2013-11-12 13:51:41 -06:00
parent b3966d87e0
commit 52436e45eb
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dist/css/ionic.css vendored
View File

@ -2622,12 +2622,12 @@ a.subdued‎ {
color: #444444; } color: #444444; }
.bar.bar-light .title { .bar.bar-light .title {
color: #444444; } color: #444444; }
.bar.bar-light { .bar.bar-stable {
background-color: white; background-color: #f8f8f8;
border-color: #dddddd; border-color: #bbbbbb;
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%); background-image: linear-gradient(0deg, #bbbbbb, #bbbbbb 50%, transparent 50%);
color: #444444; } color: #444444; }
.bar.bar-light .title { .bar.bar-stable .title {
color: #444444; } color: #444444; }
.bar.bar-dark { .bar.bar-dark {
background-color: #444444; background-color: #444444;
@ -2847,18 +2847,18 @@ a.subdued‎ {
box-shadow: none; box-shadow: none;
font-size: 18px; } font-size: 18px; }
.bar-light .button { .bar-stable .button {
color: #444444; color: #444444;
background-color: white; background-color: #f8f8f8;
border-color: #dddddd; } border-color: #bbbbbb; }
.bar-light .button:hover { .bar-stable .button:hover {
color: #444444; color: #444444;
text-decoration: none; } text-decoration: none; }
.bar-light .button.active, .bar-light .button:active { .bar-stable .button.active, .bar-stable .button:active {
background-color: #222222; background-color: #222222;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
border-color: black; } border-color: black; }
.bar-light .button.button-clear { .bar-stable .button.button-clear {
color: white; color: white;
background: none; background: none;
box-shadow: none; box-shadow: none;

8
scss/_bar.scss
View File

@ -80,8 +80,8 @@
&.bar-light { &.bar-light {
@include bar-style($bar-light-bg, $bar-light-border, $bar-light-text); @include bar-style($bar-light-bg, $bar-light-border, $bar-light-text);
} }
&.bar-light { &.bar-stable {
@include bar-style($bar-light-bg, $bar-light-border, $bar-light-text); @include bar-style($bar-stable-bg, $bar-stable-border, $bar-stable-text);
} }
&.bar-dark { &.bar-dark {
@include bar-style($bar-dark-bg, $bar-dark-border, $bar-dark-text); @include bar-style($bar-dark-bg, $bar-dark-border, $bar-dark-text);
@ -213,9 +213,9 @@
@include button-clear(#fff, $bar-title-font-size); @include button-clear(#fff, $bar-title-font-size);
} }
} }
.bar-light { .bar-stable {
.button { .button {
@include button-style($bar-light-bg, $bar-light-border, $bar-light-active-bg, $bar-light-active-border, $bar-light-text); @include button-style($bar-stable-bg, $bar-stable-border, $bar-stable-active-bg, $bar-stable-active-border, $bar-stable-text);
@include button-clear(#fff, $bar-title-font-size); @include button-clear(#fff, $bar-title-font-size);
} }
} }

18
test/button-bar.html
View File

@ -104,23 +104,7 @@
</p> </p>
<p> <p>
<div class="button-bar bar-light-light"> <div class="button-bar bar-stable">
<a class="button">One</a>
<a class="button">Two</a>
<a class="button">Three</a>
</div>
</p>
<p>
<div class="button-bar bar-light">
<a class="button">One</a>
<a class="button">Two</a>
<a class="button">Three</a>
</div>
</p>
<p>
<div class="button-bar bar-light-dark">
<a class="button">One</a> <a class="button">One</a>
<a class="button">Two</a> <a class="button">Two</a>
<a class="button">Three</a> <a class="button">Three</a>