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

speling is hard, closes #123

Browse Source
This commit is contained in:
Adam Bradley
2013-11-12 12:35:53 -06:00
parent 4104be33e3
commit 8a82dbe725
13 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dist/css/ionic.css vendored
View File

@ -2608,12 +2608,12 @@ a.subdued‎ {
color: white; } color: white; }
.bar.bar-energized .title { .bar.bar-energized .title {
color: white; } color: white; }
.bar.bar-royle { .bar.bar-royal {
background-color: #8a6de9; background-color: #8a6de9;
border-color: #552bdf; border-color: #552bdf;
background-image: linear-gradient(0deg, #552bdf, #552bdf 50%, transparent 50%); background-image: linear-gradient(0deg, #552bdf, #552bdf 50%, transparent 50%);
color: white; } color: white; }
.bar.bar-royle .title { .bar.bar-royal .title {
color: white; } color: white; }
.bar.bar-pure { .bar.bar-pure {
background-color: white; background-color: white;
@ -2827,18 +2827,18 @@ a.subdued‎ {
box-shadow: none; box-shadow: none;
font-size: 18px; } font-size: 18px; }
.bar-royle .button { .bar-royal .button {
color: white; color: white;
background-color: #8a6de9; background-color: #8a6de9;
border-color: #552bdf; } border-color: #552bdf; }
.bar-royle .button:hover { .bar-royal .button:hover {
color: white; color: white;
text-decoration: none; } text-decoration: none; }
.bar-royle .button.active, .bar-royle .button:active { .bar-royal .button.active, .bar-royal .button:active {
background-color: #552bdf; background-color: #552bdf;
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: #552bdf; } border-color: #552bdf; }
.bar-royle .button.button-clear { .bar-royal .button.button-clear {
color: white; color: white;
background: none; background: none;
box-shadow: none; box-shadow: none;
@ -3021,7 +3021,7 @@ a.subdued‎ {
background-image: linear-gradient(0deg, #d39511, #d39511 50%, transparent 50%); background-image: linear-gradient(0deg, #d39511, #d39511 50%, transparent 50%);
border-color: #d39511; border-color: #d39511;
color: white; } color: white; }
.tabs.tabs-royle { .tabs.tabs-royal {
background-color: #8a6de9; background-color: #8a6de9;
background-image: linear-gradient(0deg, #552bdf, #552bdf 50%, transparent 50%); background-image: linear-gradient(0deg, #552bdf, #552bdf 50%, transparent 50%);
border-color: #552bdf; border-color: #552bdf;
@ -3129,7 +3129,7 @@ a.subdued‎ {
color: #66cc33; } color: #66cc33; }
.tab-item.active.tab-item-energized, .tab-item:active.tab-item-energized { .tab-item.active.tab-item-energized, .tab-item:active.tab-item-energized {
color: #f0b840; } color: #f0b840; }
.tab-item.active.tab-item-royle, .tab-item:active.tab-item-royle { .tab-item.active.tab-item-royal, .tab-item:active.tab-item-royal {
color: #8a6de9; } color: #8a6de9; }
.tab-item.active.tab-item-pure, .tab-item:active.tab-item-pure { .tab-item.active.tab-item-pure, .tab-item:active.tab-item-pure {
color: white; } color: white; }
@ -3351,11 +3351,11 @@ a.subdued‎ {
background-color: #f0b840; background-color: #f0b840;
color: white; } color: white; }
.item-royle.active { .item-royal.active {
color: white; color: white;
background-color: #8a6de9; background-color: #8a6de9;
border-color: #888888; } border-color: #888888; }
.item-royle.active .item-content { .item-royal.active .item-content {
background-color: #8a6de9; background-color: #8a6de9;
color: white; } color: white; }
@ -3939,7 +3939,7 @@ button.item-button-right:after {
.badge-energized { .badge-energized {
background-color: #f0b840; } background-color: #f0b840; }
.badge-royle { .badge-royal {
background-color: #8a6de9; } background-color: #8a6de9; }
.badge-pure { .badge-pure {
@ -4754,26 +4754,26 @@ input[type="range"] {
color: #fff; color: #fff;
box-shadow: none; } box-shadow: none; }
.button-royle { .button-royal {
color: white; color: white;
background-color: #8a6de9; background-color: #8a6de9;
border-color: #552bdf; } border-color: #552bdf; }
.button-royle:hover { .button-royal:hover {
color: white; color: white;
text-decoration: none; } text-decoration: none; }
.button-royle.active, .button-royle:active { .button-royal.active, .button-royal:active {
background-color: #552bdf; background-color: #552bdf;
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: #552bdf; } border-color: #552bdf; }
.button-royle.button-clear { .button-royal.button-clear {
color: #8a6de9; color: #8a6de9;
background: none; background: none;
box-shadow: none; } box-shadow: none; }
.button-royle.button-outline { .button-royal.button-outline {
background: transparent; background: transparent;
border-color: #8a6de9; border-color: #8a6de9;
color: #8a6de9; } color: #8a6de9; }
.button-royle.button-outline.active, .button-royle.button-outline:active { .button-royal.button-outline.active, .button-royal.button-outline:active {
background-color: #8a6de9; background-color: #8a6de9;
color: #fff; color: #fff;
box-shadow: none; } box-shadow: none; }
@ -5452,13 +5452,13 @@ a.button {
.energized-border { .energized-border {
border-color: #d39511; } border-color: #d39511; }
.royle { .royal {
color: #8a6de9; } color: #8a6de9; }
.royle-bg { .royal-bg {
background-color: #8a6de9; } background-color: #8a6de9; }
.royle-border { .royal-border {
border-color: #552bdf; } border-color: #552bdf; }
.pure { .pure {

4
scss/_badge.scss
View File

@ -53,8 +53,8 @@
.badge-energized { .badge-energized {
background-color: $energized; background-color: $energized;
} }
.badge-royle { .badge-royal {
background-color: $royle; background-color: $royal;
} }
.badge-pure { .badge-pure {
background-color: $pure; background-color: $pure;

8
scss/_bar.scss
View File

@ -74,8 +74,8 @@
&.bar-energized { &.bar-energized {
@include bar-style($bar-energized-bg, $bar-energized-border, $bar-energized-text); @include bar-style($bar-energized-bg, $bar-energized-border, $bar-energized-text);
} }
&.bar-royle { &.bar-royal {
@include bar-style($bar-royle-bg, $bar-royle-border, $bar-royle-text); @include bar-style($bar-royal-bg, $bar-royal-border, $bar-royal-text);
} }
&.bar-pure { &.bar-pure {
@include bar-style($bar-pure-bg, $bar-pure-border, $bar-pure-text); @include bar-style($bar-pure-bg, $bar-pure-border, $bar-pure-text);
@ -207,9 +207,9 @@
@include button-clear(#fff, $bar-title-font-size); @include button-clear(#fff, $bar-title-font-size);
} }
} }
.bar-royle { .bar-royal {
.button { .button {
@include button-style($bar-royle-bg, $bar-royle-border, $bar-royle-active-bg, $bar-royle-active-border, $bar-royle-text); @include button-style($bar-royal-bg, $bar-royal-border, $bar-royal-active-bg, $bar-royal-active-border, $bar-royal-text);
@include button-clear(#fff, $bar-title-font-size); @include button-clear(#fff, $bar-title-font-size);
} }
} }

8
scss/_button.scss
View File

@ -160,10 +160,10 @@
@include button-outline($button-energized-bg); @include button-outline($button-energized-bg);
} }
.button-royle { .button-royal {
@include button-style($button-royle-bg, $button-royle-border, $button-royle-active-bg, $button-royle-active-border, $button-royle-text); @include button-style($button-royal-bg, $button-royal-border, $button-royal-active-bg, $button-royal-active-border, $button-royal-text);
@include button-clear($button-royle-bg); @include button-clear($button-royal-bg);
@include button-outline($button-royle-bg); @include button-outline($button-royal-bg);
} }
.button-pure { .button-pure {

2
scss/_items.scss
View File

@ -82,7 +82,7 @@
.item-calm { @include item-style-active($calm, $subdued-dark, #fff); } .item-calm { @include item-style-active($calm, $subdued-dark, #fff); }
.item-balanced { @include item-style-active($balanced, $subdued-dark, #fff); } .item-balanced { @include item-style-active($balanced, $subdued-dark, #fff); }
.item-energized { @include item-style-active($energized, $subdued-dark, #fff); } .item-energized { @include item-style-active($energized, $subdued-dark, #fff); }
.item-royle { @include item-style-active($royle, $subdued-dark, #fff); } .item-royal { @include item-style-active($royal, $subdued-dark, #fff); }
.item-pure { @include item-style-active($pure, $subdued-dark, #fff); } .item-pure { @include item-style-active($pure, $subdued-dark, #fff); }
.item-subdued-light { @include item-style-active($subdued-light, $subdued-dark, #fff); } .item-subdued-light { @include item-style-active($subdued-light, $subdued-dark, #fff); }
.item-subdued { @include item-style-active($subdued, $subdued-dark, #fff); } .item-subdued { @include item-style-active($subdued, $subdued-dark, #fff); }

8
scss/_tabs.scss
View File

@ -46,8 +46,8 @@
&.tabs-energized { &.tabs-energized {
@include tab-style($tabs-energized-bg, $tabs-energized-border-color, $tabs-energized-text); @include tab-style($tabs-energized-bg, $tabs-energized-border-color, $tabs-energized-text);
} }
&.tabs-royle { &.tabs-royal {
@include tab-style($tabs-royle-bg, $tabs-royle-border-color, $tabs-royle-text); @include tab-style($tabs-royal-bg, $tabs-royal-border-color, $tabs-royal-text);
} }
&.tabs-pure { &.tabs-pure {
@include tab-style($tabs-pure-bg, $tabs-pure-border-color, $tabs-pure-text); @include tab-style($tabs-pure-bg, $tabs-pure-border-color, $tabs-pure-text);
@ -165,8 +165,8 @@
&.tab-item-energized { &.tab-item-energized {
color: $energized; color: $energized;
} }
&.tab-item-royle { &.tab-item-royal {
color: $royle; color: $royal;
} }
&.tab-item-pure { &.tab-item-pure {
color: $pure; color: $pure;

12
scss/_util.scss
View File

@ -131,14 +131,14 @@
border-color: $button-energized-border; border-color: $button-energized-border;
} }
.royle { .royal {
color: $royle; color: $royal;
} }
.royle-bg { .royal-bg {
background-color: $royle; background-color: $royal;
} }
.royle-border { .royal-border {
border-color: $button-royle-border; border-color: $button-royal-border;
} }
.pure { .pure {

28
scss/_variables.scss
View File

@ -15,7 +15,7 @@ $calm: #43cee6 !default;
$balanced: #66cc33 !default; $balanced: #66cc33 !default;
$energized: #f0b840 !default; $energized: #f0b840 !default;
$assertive: #ef4e3a !default; $assertive: #ef4e3a !default;
$royle: #8a6de9 !default; $royal: #8a6de9 !default;
$pure: #fff !default; $pure: #fff !default;
$subdued-light: #eee !default; $subdued-light: #eee !default;
@ -228,11 +228,11 @@ $button-energized-border: darken($energized, 15%);
$button-energized-active-bg: darken($energized, 15%); $button-energized-active-bg: darken($energized, 15%);
$button-energized-active-border: darken($energized, 15%); $button-energized-active-border: darken($energized, 15%);
$button-royle-bg: $royle; $button-royal-bg: $royal;
$button-royle-text: #fff; $button-royal-text: #fff;
$button-royle-border: darken($royle, 15%); $button-royal-border: darken($royal, 15%);
$button-royle-active-bg: darken($royle, 15%); $button-royal-active-bg: darken($royal, 15%);
$button-royle-active-border: darken($royle, 15%); $button-royal-active-border: darken($royal, 15%);
$button-pure-bg: $pure; $button-pure-bg: $pure;
$button-pure-text: #444; $button-pure-text: #444;
@ -328,11 +328,11 @@ $bar-energized-border: $button-energized-border;
$bar-energized-active-bg: $button-energized-active-bg; $bar-energized-active-bg: $button-energized-active-bg;
$bar-energized-active-border: $button-energized-active-border; $bar-energized-active-border: $button-energized-active-border;
$bar-royle-bg: rgba($button-royle-bg, $bar-transparency); $bar-royal-bg: rgba($button-royal-bg, $bar-transparency);
$bar-royle-text: $button-royle-text; $bar-royal-text: $button-royal-text;
$bar-royle-border: $button-royle-border; $bar-royal-border: $button-royal-border;
$bar-royle-active-bg: $button-royle-active-bg; $bar-royal-active-bg: $button-royal-active-bg;
$bar-royle-active-border: $button-royle-active-border; $bar-royal-active-border: $button-royal-active-border;
$bar-pure-bg: rgba($button-pure-bg, $bar-transparency); $bar-pure-bg: rgba($button-pure-bg, $bar-transparency);
$bar-pure-text: $button-pure-text; $bar-pure-text: $button-pure-text;
@ -409,9 +409,9 @@ $tabs-energized-bg: $button-energized-bg;
$tabs-energized-border-color: $button-energized-border; $tabs-energized-border-color: $button-energized-border;
$tabs-energized-text: $button-energized-text; $tabs-energized-text: $button-energized-text;
$tabs-royle-bg: $button-royle-bg; $tabs-royal-bg: $button-royal-bg;
$tabs-royle-border-color: $button-royle-border; $tabs-royal-border-color: $button-royal-border;
$tabs-royle-text: $button-royle-text; $tabs-royal-text: $button-royal-text;
$tabs-pure-bg: $button-pure-bg; $tabs-pure-bg: $button-pure-bg;
$tabs-pure-border-color: $button-pure-border; $tabs-pure-border-color: $button-pure-border;

2
test/button-bar.html
View File

@ -88,7 +88,7 @@
</p> </p>
<p> <p>
<div class="button-bar bar-royle"> <div class="button-bar bar-royal">
<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>

2
test/buttons.html
View File

@ -151,7 +151,7 @@
<a class="button block button-assertive">.button-assertive</a> <a class="button block button-assertive">.button-assertive</a>
<a class="button block button-balanced">.button-balanced</a> <a class="button block button-balanced">.button-balanced</a>
<a class="button block button-energized">.button-energized</a> <a class="button block button-energized">.button-energized</a>
<a class="button block button-royle">.button-royle</a> <a class="button block button-royal">.button-royal</a>
<a class="button block button-pure">.button-pure</a> <a class="button block button-pure">.button-pure</a>
<a class="button block button-subdued-light">.button-subdued-light</a> <a class="button block button-subdued-light">.button-subdued-light</a>
<a class="button block button-subdued">.button-subdued</a> <a class="button block button-subdued">.button-subdued</a>

6
test/colors.html
View File

@ -44,9 +44,9 @@
energized energized
<span class="color-demo energized-bg"></span> <span class="color-demo energized-bg"></span>
</li> </li>
<li class="item royle"> <li class="item royal">
royle royal
<span class="color-demo royle-bg"></span> <span class="color-demo royal-bg"></span>
</li> </li>
<li class="item pure dark-bg"> <li class="item pure dark-bg">
pure pure

2
test/headers.html
View File

@ -66,7 +66,7 @@
</a> </a>
</div> </div>
<header class="bar bar-header bar-royle"> <header class="bar bar-header bar-royal">
<a class="button button-default"> <a class="button button-default">
<i class="icon ion-home"></i> <i class="icon ion-home"></i>
</a> </a>

2
test/tab-bars-icons-right.html
View File

@ -28,7 +28,7 @@
</main> </main>
<nav id="tab-bar" class="tabs tabs-icon-right tabs-royle"> <nav id="tab-bar" class="tabs tabs-icon-right tabs-royal">
<a class="tab-item" href="#"> <a class="tab-item" href="#">
Fun Fun
<i class="icon ion-game-controller-a"></i> <i class="icon ion-game-controller-a"></i>