Skip to content

Commit

Permalink
Merge 62b15e4 into 233d031
Browse files Browse the repository at this point in the history
  • Loading branch information
motet-a committed Aug 5, 2017
2 parents 233d031 + 62b15e4 commit a28936a
Show file tree
Hide file tree
Showing 6 changed files with 622 additions and 613 deletions.
1 change: 0 additions & 1 deletion assets/scss/components/_alert-box.scss
@@ -1,7 +1,6 @@
.alert-box {
position: relative;
padding: 8px 30px 8px 15px;
margin: 0 0 15px 2%;
color: #FFF;
text-shadow: rgba(0, 0, 0, 0.2) 0 0 2px;
background: #777;
Expand Down
6 changes: 3 additions & 3 deletions assets/scss/components/_breadcrumb.scss
Expand Up @@ -5,10 +5,10 @@
@media only screen and #{$media-wide} {
.breadcrumb {
position: relative;
display: block;
float: left;
display: flex;
width: calc(100% - 230px);
height: 30px;
padding-left: 2rem;

&:after {
content: " ";
Expand Down Expand Up @@ -62,4 +62,4 @@
}
}
}
}
}
6 changes: 4 additions & 2 deletions assets/scss/components/_header-search.scss
Expand Up @@ -90,11 +90,12 @@
width: 20px;
background: linear-gradient(to left, rgba(0, 0, 0, .03), rgba(0, 0, 0, 0));
}

form {
input {
padding: 6px 10px;
height: 18px;
width: 150px;
height: 30px;
width: 170px;
}
button {
height: 30px;
Expand All @@ -106,6 +107,7 @@
}
}
}

.search-more {
width: 30px;
height: 30px;
Expand Down

0 comments on commit a28936a

Please sign in to comment.