Skip to content

Commit

Permalink
Everything is pink now
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Apr 13, 2017
1 parent c0b3e99 commit 6716a5b
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions ui/style-guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ <h2>Colors</h2>
<hr>
<ul class="list-unstyled">
<li>
<div style="width: 75px; height: 75px; display:inline-block;" class="bg-purple"></div>
<div style="width: 75px; height: 75px; display:inline-block" class="bg-light-purple"></div>
<div style="width: 75px; height: 75px; display:inline-block;" class="bg-pink"></div>
<div style="width: 75px; height: 75px; display:inline-block" class="bg-light-pink"></div>
</li>
<li>
<div style="width: 75px; height: 75px; display:inline-block" class="bg-red"></div>
Expand Down
4 changes: 2 additions & 2 deletions ui/styles/_lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@

&.active {
@include transition(border-color .1s linear);
border-color: $purple;
border-color: $pink;

.list-bar, .list-bar-horizontal {
@include transition(background-color .1s linear);
background-color: $purple;
background-color: $pink;
}
}

Expand Down
6 changes: 3 additions & 3 deletions ui/styles/_panels.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@

&.active {
>.panel-heading {
border-color: $purple;
border-color: $pink;
}

@include transition(border-color .1s linear);
border-color: $purple;
border-color: $pink;

.panel-bar {
@include transition(background-color .1s linear);
background-color: $purple;
background-color: $pink;
}
}
}
8 changes: 4 additions & 4 deletions ui/styles/_type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ body {
}

a {
color: $purple;
color: $pink;
font-weight: 600;
@include transition(color .2s ease-in-out);

&:hover {
text-decoration: none;
color: darken($purple, 10%);
color: darken($pink, 10%);
}

&.subtle {
color: inherit;

&:hover {
color: $purple;
color: $pink;
}
}
}

code {
color: $purple-dark;
color: $pink-dark;
background-color: $gray-background;
}

Expand Down
10 changes: 5 additions & 5 deletions ui/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ a {

.row {
&.colored {
background-color: $light-purple;
background-color: $light-pink;
}
}

Expand All @@ -82,12 +82,12 @@ a {
}


.bg-purple {
background-color: $purple;
.bg-pink {
background-color: $pink;
}

.bg-light-purple {
background-color: $light-purple;
.bg-light-pink {
background-color: $light-pink;
}

.bg-orange {
Expand Down

0 comments on commit 6716a5b

Please sign in to comment.