Skip to content
This repository has been archived by the owner on Dec 5, 2022. It is now read-only.

Commit

Permalink
fix(logo-text): long logo text breaks layout
Browse files Browse the repository at this point in the history
* fix(logo-text): long logo text breaks layout
* chore(sass): add task to watch and recompile sass

close #26
  • Loading branch information
rbarilani committed Nov 15, 2017
1 parent 127f628 commit 1dd4d25
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"compile:js": "webpack -p",
"compile": "npm run compile:sass && npm run compile:js && node banner.js",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"prerelease": "npm run lint && npm run test && npm run compile && npm run changelog"
"prerelease": "npm run lint && npm run test && npm run compile && npm run changelog",
"watch:sass": "nodemon -e scss -x 'npm run compile:sass'"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -74,6 +75,7 @@
"jest": "^20.0.4",
"jest-junit": "^2.1.0",
"node-sass": "^4.5.3",
"nodemon": "^1.12.1",
"promise-polyfill": "^6.0.2",
"raf": "^3.4.0",
"react-test-renderer": "^16.0.0",
Expand Down
21 changes: 14 additions & 7 deletions source/style/_doc/navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//
.doc-navbar {
position: fixed;
display: flex;
top: 0;
right: 0;
bottom: auto;
Expand All @@ -20,34 +21,40 @@
}

.doc-search-form {
float: right;
margin-top: 0.7rem;
margin-bottom: 0rem;
margin-left: auto;

@media screen and (min-width: $doc-breakpoint) {
display: none
}
}

&__logo {
display: inline-block;
line-height: $doc-navbar-height - 4px;
vertical-align: middle;
flex-grow: 1;
display: flex;
height: 100%;
align-items: center;

@media screen and (max-width: $doc-breakpoint) {
flex-grow: initial;
}
}

&__logo__img {
display: inline-block;
vertical-align: middle;
width: 30px;
height: 30px;
margin-right: 6px;
}

&__logo__text {
color: $doc-navbar-logo-text-color;
flex-grow: 1;
margin-right: 0.6rem;
line-height: 1.6rem;
font-size: 14px;
font-family: "Source Sans Pro", "Ubuntu", "Helvetica Neue", "Helvetica", sans-serif;
font-weight: 700;
color: $doc-navbar-logo-text-color;

@media screen and (max-width: $doc-breakpoint) {
display: none
Expand Down
7 changes: 1 addition & 6 deletions source/style/doc.css

Large diffs are not rendered by default.

0 comments on commit 1dd4d25

Please # to comment.