Skip to content

Commit 915f98b

Browse files
author
Adam Bradley
committed
Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts: scss/_type.scss
2 parents 129b481 + f0caee3 commit 915f98b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dist/css/ionic.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@charset "UTF-8";
21
/**
32
* Copyright 2013 Drifty Co.
43
* http://drifty.com/
@@ -640,13 +639,13 @@ address {
640639
font-style: normal;
641640
line-height: 1.42857; }
642641

643-
a.subdued {
642+
a.subdued {
644643
padding-right: 10px;
645644
color: #888;
646645
text-decoration: none; }
647-
a.subdued:hover {
646+
a.subdued:hover {
648647
text-decoration: none; }
649-
a.subdued:last-child {
648+
a.subdued:last-child {
650649
padding-right: 0; }
651650

652651
/**

scss/_type.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ address {
165165
// Links
166166
// -------------------------
167167

168-
a.subdued {
168+
a.subdued {
169169
padding-right: 10px;
170170
color: #888;
171171
text-decoration: none;

0 commit comments

Comments
 (0)