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

fix item-complex active state

Browse Source
This commit is contained in:
Adam Bradley
2013-11-14 08:43:07 -06:00
parent cc865ef10a
commit 4b623f6c86
3 changed files with 5 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dist/css/ionic.css vendored
View File

@ -3190,10 +3190,6 @@ a.subdued‎ {
.item.active, .item:active {
background-color: activeBgColor;
border-color: #cccccc; }
.item.active .item-content, .item:active .item-content {
background-color: #fafafa;
border-color: #cccccc;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item h2 {
margin: 0 0 4px 0;
font-size: 16px; }
@ -3230,10 +3226,6 @@ a.subdued‎ {
.item.item-light.active, .item.item-light:active {
background-color: activeBgColor;
border-color: #cccccc; }
.item.item-light.active .item-content, .item.item-light:active .item-content {
background-color: #fafafa;
border-color: #cccccc;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-stable {
color: #444444;
background-color: #f8f8f8;
@ -3241,10 +3233,6 @@ a.subdued‎ {
.item.item-stable.active, .item.item-stable:active {
background-color: activeBgColor;
border-color: #a2a2a2; }
.item.item-stable.active .item-content, .item.item-stable:active .item-content {
background-color: #e5e5e5;
border-color: #a2a2a2;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-positive {
color: white;
background-color: #4a87ee;
@ -3252,10 +3240,6 @@ a.subdued‎ {
.item.item-positive.active, .item.item-positive:active {
background-color: activeBgColor;
border-color: #145dd7; }
.item.item-positive.active .item-content, .item.item-positive:active .item-content {
background-color: #145dd7;
border-color: #145dd7;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-calm {
color: white;
background-color: #43cee6;
@ -3263,10 +3247,6 @@ a.subdued‎ {
.item.item-calm.active, .item.item-calm:active {
background-color: activeBgColor;
border-color: #1aaac3; }
.item.item-calm.active .item-content, .item.item-calm:active .item-content {
background-color: #1aaac3;
border-color: #1aaac3;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-assertive {
color: white;
background-color: #ef4e3a;
@ -3274,10 +3254,6 @@ a.subdued‎ {
.item.item-assertive.active, .item.item-assertive:active {
background-color: activeBgColor;
border-color: #cc2511; }
.item.item-assertive.active .item-content, .item.item-assertive:active .item-content {
background-color: #cc2511;
border-color: #cc2511;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-balanced {
color: white;
background-color: #66cc33;
@ -3285,10 +3261,6 @@ a.subdued‎ {
.item.item-balanced.active, .item.item-balanced:active {
background-color: activeBgColor;
border-color: #478f24; }
.item.item-balanced.active .item-content, .item.item-balanced:active .item-content {
background-color: #478f24;
border-color: #478f24;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-energized {
color: white;
background-color: #f0b840;
@ -3296,10 +3268,6 @@ a.subdued‎ {
.item.item-energized.active, .item.item-energized:active {
background-color: activeBgColor;
border-color: #d39511; }
.item.item-energized.active .item-content, .item.item-energized:active .item-content {
background-color: #d39511;
border-color: #d39511;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-royal {
color: white;
background-color: #8a6de9;
@ -3307,10 +3275,6 @@ a.subdued‎ {
.item.item-royal.active, .item.item-royal:active {
background-color: activeBgColor;
border-color: #552bdf; }
.item.item-royal.active .item-content, .item.item-royal:active .item-content {
background-color: #552bdf;
border-color: #552bdf;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item.item-dark {
color: white;
background-color: #444444;
@ -3318,10 +3282,6 @@ a.subdued‎ {
.item.item-dark.active, .item.item-dark:active {
background-color: activeBgColor;
border-color: black; }
.item.item-dark.active .item-content, .item.item-dark:active .item-content {
background-color: #262626;
border-color: black;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.12); }
.item,
.item h1,

6
scss/_mixins.scss
View File

@ -87,12 +87,6 @@
&:active {
background-color: activeBgColor;
border-color: $activeBorderColor;
.item-content {
background-color: $activeBgColor;
border-color: $activeBorderColor;
box-shadow: inset 0px 1px 3px rgba(0,0,0,0.12);
}
}
}

10
test/lists.html
View File

@ -130,13 +130,13 @@
Not a link so no default right arrow
</div>
<a href="#" class="item">
<a href="#" class="item item-complex">
<div class="item-content slide-right">
Auto Right side arrow cuz its a link
</div>
</a>
<a href="#" class="item item-icon-right">
<a href="#" class="item item-complex item-icon-right">
<div class="item-content slide-right">
Processing Icon
<i class="icon ion-loading"></i>
@ -236,7 +236,7 @@
List Divider
</div>
<a href="#" class="item">
<a href="#" class="item item-complex">
<div class="item-content">
Computers
<span class="badge">3</span>
@ -271,7 +271,7 @@
<div class="list">
<a href="#" class="item item-icon-left item-icon-right item-slider">
<a href="#" class="item item-complex item-icon-left item-icon-right item-slider">
<div class="item-content">
<i class="icon ion-heart brand-danger fill-icon"></i>
Madison, WI
@ -290,7 +290,7 @@
</div>
</a>
<a href="#" class="item item-icon-left item-icon-right item-slider">
<a href="#" class="item item-complex item-icon-left item-icon-right item-slider">
<div class="item-content slide-right">
<i class="icon ion-ios7-cog gray fill-icon"></i>
Settings