Skip to content

Commit

Permalink
Merge branch 'captainbuckkets-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
peerchemist committed Dec 19, 2018
2 parents c7dbec7 + ce27c24 commit 25b5768
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CNAME
@@ -1 +1 @@
univeristy.peercoin.net
university.peercoin.net
6 changes: 3 additions & 3 deletions app/styles/components/main.component.scss
Expand Up @@ -163,14 +163,14 @@
li {
padding: 1rem;
border-bottom: 1px solid rgba($color-primary, 0.5);
color: $color-neutral;
color: #ababab;

&:before {
counter-increment: section;
content: counter(section) '.';
padding-right: 0.5rem;
font-weight: bold;
color: $color-primary;
color: #929292;
}

&:last-child {
Expand Down Expand Up @@ -294,4 +294,4 @@
border: 1px solid #3cb054;
box-shadow: 0 1px 5px rgba(#000, 0.1);
}
}
}
6 changes: 3 additions & 3 deletions app/styles/components/menu.component.scss
Expand Up @@ -35,7 +35,7 @@
height: calc(100vh - #{$app-topbar-height});
overflow-y: auto;
user-select: none;
background: rgba($color-menu-bg, 0.08);
background: #363636;
// box-shadow: -1px 0 0 rgba($color-fonts, 0.08) inset;

@include viewports(up-to small) {
Expand Down Expand Up @@ -116,7 +116,7 @@
a {
display: block;
padding: 0.8rem 2rem;
color: inherit;
color: #f7f7f7;
text-decoration: none;

@include viewports(up-to small) {
Expand Down Expand Up @@ -178,4 +178,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions app/styles/components/topbar.component.scss
Expand Up @@ -13,7 +13,7 @@
align-items: center;
padding: 0 1rem;
padding-left: $app-menu-width;
background: $color-primary;
background: #363636;
box-shadow: 0 1px 3px rgba(#000, 0.1);

@include viewports(up-to small) {
Expand Down Expand Up @@ -182,4 +182,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions app/styles/main.scss
Expand Up @@ -50,7 +50,7 @@ body {

.call-to-action {
max-width: 500px;
margin: 0 auto;
margin: 0 auto;
font-size: 2rem;
color: #646464;
font-weight: 300;
Expand Down Expand Up @@ -101,4 +101,4 @@ body {
a {
color: #fff;
}
}
}

0 comments on commit 25b5768

Please sign in to comment.