diff options
Diffstat (limited to 'theme/stylesheets')
28 files changed, 409 insertions, 184 deletions
diff --git a/theme/stylesheets/book/body.less b/theme/stylesheets/book/body.less index 06d297a..d13734a 100644..100755 --- a/theme/stylesheets/book/body.less +++ b/theme/stylesheets/book/body.less @@ -1,11 +1,14 @@ .book { - .book-body { + .book-body { position: fixed; - top: 40px; + top: @header-height; right: 0px; left: 0px; bottom: 0px; + background: @body-background; + .transition(left 0.5s ease); + .body-inner { position: absolute; top: 0px; @@ -15,29 +18,26 @@ overflow-y: auto; } - .transition(left 0.5s ease); - - background: #edece4; - .page-wrapper { position: relative; - min-height: 100%; .page-inner { + font-family: @font-family-serif; max-width: 800px; margin: 0px auto; - + section { margin: 0px 0px; padding: 5px 15px; - background: #fff; + + background: @page-background; border-radius: 2px; - font-size: 15px; - line-height: 1.7; + + font-size: 16px; + line-height: 1.5em; } .btn-group { - .btn { border-radius: 0px; background: #eee; diff --git a/theme/stylesheets/book/exercise.less b/theme/stylesheets/book/exercise.less index a1cbb43..dd30298 100644..100755 --- a/theme/stylesheets/book/exercise.less +++ b/theme/stylesheets/book/exercise.less @@ -6,8 +6,9 @@ .header { padding: 5px 15px; - background: #2f8cde; + color: #fff; + background: #2f8cde; h2 { margin: 0px; diff --git a/theme/stylesheets/book/header.less b/theme/stylesheets/book/header.less index 9986fa6..21a3e7f 100644..100755 --- a/theme/stylesheets/book/header.less +++ b/theme/stylesheets/book/header.less @@ -1,34 +1,34 @@ .book { .book-header { + font-family: @font-family-sans; + position: fixed; + overflow: hidden; top: 0px; right: 0px; left: 0px; + height: @header-height; z-index: 2; - height: 40px; - font-size: 0.85em; - - background: #242628; - color: #e2edf2; - overflow: hidden; + color: @header-color; + background: @header-background; + box-shadow: 0 1px 2px hsla(200,10%,80%,0.6); .btn { display: block; - height: 40px; + height: @header-height; padding: 0px 15px; border-bottom: none; - color: #7d878a; + color: @header-button-color; text-transform: uppercase; - line-height: 40px; + line-height: @header-height; &:hover { - color: #e2edf2; - text-decoration: none; position: relative; - background: #303436; - box-shadow: 0 -2px 2px rgba(0,0,0,0.2) inset; + text-decoration: none; + color: @header-button-hover-color; + background: @header-button-hover-background; } } @@ -36,7 +36,7 @@ margin: 0px; font-size: 20px; text-align: center; - line-height: 40px; + line-height: @header-height; padding-left: 200px; padding-right: 200px; diff --git a/theme/stylesheets/book/languages.less b/theme/stylesheets/book/languages.less index 3919adf..cc9104f 100644..100755 --- a/theme/stylesheets/book/languages.less +++ b/theme/stylesheets/book/languages.less @@ -1,38 +1,40 @@ .book-langs-index { width: 100%; height: 100%; - background: #edece4; padding: 40px 0px; margin: 0px; overflow: auto; + @media (max-width: 600px) { + padding: 0px; + } + .inner { - max-width: 350px; + max-width: 600px; width: 100%; margin: 0px auto; - padding: 15px; + padding: 30px; background: #fff; border-radius: 3px; - h1 { + h3 { margin: 0px; - text-align: center; } .languages { list-style: none; - padding: 0px; - margin: 0px; + padding: 20px 30px; margin-top: 20px; - border-top: 1px solid #eee; + .clearfix(); + li { - text-align: center; + width: 50%; + float: left; padding: 10px 5px; - font-size: 16px; border-bottom: 1px solid #eee; @@ -40,6 +42,11 @@ a { } + + @media (max-width: 600px) { + width: 100%; + max-width: 100%; + } } } } diff --git a/theme/stylesheets/book/markdown.less b/theme/stylesheets/book/markdown.less index 97c40bf..aa1b466 100644..100755 --- a/theme/stylesheets/book/markdown.less +++ b/theme/stylesheets/book/markdown.less @@ -2,13 +2,13 @@ padding: 25px; padding-top: 15px; background-color: white; - + & > *:first-child { margin-top: 0 !important; } & > *:last-child { margin-bottom: 0 !important; } - + a { color: #4183C4; } a.absent { @@ -22,7 +22,7 @@ top: 0; left: 0; bottom: 0; } - + h1, h2, h3, h4, h5, h6 { line-height: 1.7; margin: 20px 0 10px; @@ -31,54 +31,54 @@ -webkit-font-smoothing: antialiased; cursor: text; position: relative; } - + h1 tt, h1 code { font-size: inherit; } - + h2 tt, h2 code { font-size: inherit; } - + h3 tt, h3 code { font-size: inherit; } - + h4 tt, h4 code { font-size: inherit; } - + h5 tt, h5 code { font-size: inherit; } - + h6 tt, h6 code { font-size: inherit; } - + h1 { font-size: 28px; color: black; } - + h2 { font-size: 24px; border-bottom: 1px solid #eee; color: black; } - + h3 { font-size: 18px; } - + h4 { font-size: 16px; } - + h5 { font-size: 14px; } - + h6 { color: #777777; font-size: 14px; } - + p, blockquote, ul, ol, dl, table, pre { margin: 15px 0; } - + hr { - + } - + body > h2:first-child { margin-top: 0; padding-top: 0; } @@ -91,23 +91,23 @@ body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child { margin-top: 0; padding-top: 0; } - + a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 { margin-top: 0; padding-top: 0; } - + h1 p, h2 p, h3 p, h4 p, h5 p, h6 p { margin-top: 0; } - + li p.first { display: inline-block; } - + ul, ol { padding-left: 30px; } - + ul :first-child, ol :first-child { margin-top: 0; } - + ul :last-child, ol :last-child { margin-bottom: 0; } @@ -117,7 +117,7 @@ ul ul { margin: 0px; } - + dl { padding: 0; } dl dt { @@ -139,7 +139,7 @@ margin-top: 0; } dl dd > :last-child { margin-bottom: 0; } - + blockquote { border-left: 4px solid #dddddd; padding: 0 15px; @@ -154,12 +154,12 @@ } blockquote > :last-child { margin-bottom: 0; } - + table { width: 100%; padding: 0; } - + table tr { border-top: 1px solid #cccccc; background-color: white; @@ -182,13 +182,13 @@ margin-top: 0; } table tr th :last-child, table tr td :last-child { margin-bottom: 0; } - + img { max-width: 100%; display: block; margin: 0px auto; } - + span.frame { display: block; overflow: hidden; } @@ -256,7 +256,7 @@ text-align: right; } } - + code, tt { margin: 0 2px; padding: 0 5px; @@ -265,7 +265,7 @@ background-color: #f8f8f8; border-radius: 3px; } - + pre code { margin: 0; padding: 0; @@ -273,27 +273,33 @@ border: none; background: transparent; } - + .highlight pre { - background-color: #f8f8f8; - border: 1px solid #cccccc; - font-size: 13px; - line-height: 19px; + color: hsl(204, 40%, 80%); + background-color: hsl(204, 30%, 10%); + border: 1px solid hsl(204, 30%, 10%); + font-size: 16px; + line-height: 1.5em; overflow: auto; - padding: 6px 10px; + padding: 20px; + margin: 0 -20px; border-radius: 3px; } - + pre { - background-color: #f8f8f8; - border: 1px solid #cccccc; - font-size: 13px; - line-height: 19px; + color: hsl(204, 40%, 80%); + background-color: hsl(204, 30%, 10%); + border: 1px solid hsl(204, 30%, 10%); + font-size: 16px; + line-height: 1.5em; overflow: auto; - padding: 6px 10px; - border-radius: 3px; } - pre code, pre tt { - background-color: transparent; - border: none; + padding: 20px; + margin: 0 -20px; + border-radius: 3px; + } + + pre code, pre tt { + background-color: transparent; + border: none; } }
\ No newline at end of file diff --git a/theme/stylesheets/book/navigation.less b/theme/stylesheets/book/navigation.less index 588a341..33cb9be 100644..100755 --- a/theme/stylesheets/book/navigation.less +++ b/theme/stylesheets/book/navigation.less @@ -8,21 +8,21 @@ min-width: 90px; display: flex; - justify-content:center; - align-content:center; - flex-direction:column; + justify-content: center; + align-content: center; + flex-direction: column; font-size: 40px; - color: rgba(0,0,0, 0.5); + color: rgba(0,0,0,0.5); text-align: center; .transition(all 350ms ease); &:hover { - background-color: rgba(0,0,0, 0.06); + background-color: @body-pagination-background; text-decoration: none; - } + } &.navigation-next { right: 0px; @@ -40,6 +40,6 @@ width: 50%; display: inline-block; float: left; - } + } } }
\ No newline at end of file diff --git a/theme/stylesheets/book/progress.less b/theme/stylesheets/book/progress.less index cf4bd00..1cfb3d6 100644..100755 --- a/theme/stylesheets/book/progress.less +++ b/theme/stylesheets/book/progress.less @@ -1,24 +1,18 @@ /* Chrome, Safari, Opera */ -@-webkit-keyframes animate-loading -{ +@-webkit-keyframes animate-loading { from {width: 0%;} to {} } /* Standard syntax */ -@keyframes animate-loading -{ +@keyframes animate-loading { from {width: 0%;} to {} } .book .book-body { - @chapter-size: 16px; - - @bar-background: #eee; - .book-progress { - height: 30px; + height: @progress-height; width: 100%; position: relative; background: #fff; @@ -26,11 +20,11 @@ z-index: 10; .bar { - height: 8px; - position: absolute; - right: 20px; - left: 20px; - top: 11px; + height: @bar-height; + position: @bar-position; + right: @bar-right; + left: @bar-left; + top: @bar-top; background: @bar-background; border-radius: 5px; @@ -40,19 +34,20 @@ height: 100%; width: 0%; - background: @brand-success; + background: @bar-progress-background; -webkit-animation: animate-loading 1s; /* Chrome, Safari, Opera */ animation: animate-loading 1s; .in-inner { height: 100%; width: 50%; - } } } .chapters { + display: @chapter-display; + position: absolute; right: 20px + @chapter-size; left: 20px; @@ -72,7 +67,7 @@ } &.done { - background: @brand-success; + background: @bar-progress-background; box-shadow: none; } diff --git a/theme/stylesheets/book/quiz.less b/theme/stylesheets/book/quiz.less index 9cb3007..d35e148 100644 --- a/theme/stylesheets/book/quiz.less +++ b/theme/stylesheets/book/quiz.less @@ -1,6 +1,36 @@ .book .book-body .page-wrapper .page-inner { section.quiz { - .quiz, .quiz-answers { + padding: 0px; + margin: 20px 0px; + border: 3px solid #2f8cde; + + .header { + padding: 5px 15px; + + color: #fff; + background: #2f8cde; + + h2 { + margin: 0px; + font-size: 20px; + } + } + + .message { + margin: 15px; + } + + .question { + .question-header { + padding: 5px 15px; + color: #fff; + background: #2f8cde; + } + + .question-inner { + padding: 15px; + } + table { margin-bottom: 10px; width: 100%; @@ -16,4 +46,4 @@ } } } -} +}
\ No newline at end of file diff --git a/theme/stylesheets/book/summary.less b/theme/stylesheets/book/summary.less index e51e116..da10aca 100644..100755 --- a/theme/stylesheets/book/summary.less +++ b/theme/stylesheets/book/summary.less @@ -1,39 +1,35 @@ .book { - @searchHeight: 41px; - .book-summary { - @width: 250px; + font-family: @font-family-sans; position: fixed; - top: 40px; - left: -@width; + top: @header-height; + left: -@sidebar-width; bottom: 0px; z-index: 1; - width: @width; - background: #2e3133; - color: #e2edf2; + width: @sidebar-width; + color: @sidebar-color; + background: @sidebar-background; + box-shadow: inset -1px 0 5px hsla(0, 0%, 0%, 0.1); .transition(all 0.5s ease); .book-search { - padding: 6px; - padding-top: 0px; + padding: @sidebar-search-padding; - background: #242628; - border-bottom: 1px solid #333; + background: @sidebar-search-background; position: absolute; - top: -@searchHeight; + top: -@header-height; left: 0px; right: 0px; .transition(top 0.5s ease); - input, input:focus { width: 100%; - border: none; + border: 1px solid @sidebar-search-input-border-color; .box-shadow(none); } } @@ -55,43 +51,46 @@ li { list-style: none; - + &.divider { height: 1px; margin: 7px 0; overflow: hidden; - background: #35393b; + background: @sidebar-divider-color; + box-shadow: 0 1px rgba(255,255,255,0.7); } i.fa-check { display: none; position: absolute; - left: 7px; - top: 14px; + right: 9px; + top: 16px; + font-size: 9px; + color: @sidebar-icon-color; } &.done { > a { - color: @brand-success; + color: @sidebar-link-completed; + font-weight: @sidebar-link-completed-weight; i { display: inline; } } } - + a, span { display: block; - height: 40px; - padding: 11px 15px; + padding: 10px 15px; border-bottom: none; - text-transform: uppercase; - color: #e2edf2; + color: @sidebar-link-color; + background: @sidebar-link-background; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; - padding-left: 26px; + padding-left: 25px; } span { @@ -100,12 +99,13 @@ } &.active > a, a:hover { - background: #242628; + color: @sidebar-link-hover-color; + background: @sidebar-link-hover-background; text-decoration: none; } ul { - padding-left: 35px; + padding-left: @sidebar-nested-padding; } } } @@ -120,7 +120,7 @@ &.with-summary { .book-summary { left: 0px; - } + } } &.without-animation { @@ -136,7 +136,7 @@ } ul.summary { - top: @searchHeight; + top: @header-height; } } } diff --git a/theme/stylesheets/fonts.less b/theme/stylesheets/fonts.less index 395f155..3dfff3f 100644..100755 --- a/theme/stylesheets/fonts.less +++ b/theme/stylesheets/fonts.less @@ -1,8 +1,144 @@ -@font-face -{ - font-family: 'appNormal'; - src: url('@{FontPath}/opensans/OpenSans-Regular.ttf'), - url('@{FontPath}/opensans/OpenSans-Regular.woff'), - url('@{FontPath}/opensans/OpenSans-Regular.eot'), - url('@{FontPath}/opensans/OpenSans-Regular.svg'); +@font-face { + font-family: 'EB Garamond'; + font-style: normal; + font-weight: 400; + src: local('EB Garamond 12 Regular'),url('@{FontPath}/ebgaramond/400.woff') format('woff'); } +@font-face { + font-family: 'EB Garamond'; + font-style: italic; + font-weight: 400i; + src: local('EB Garamond 12 Italic'),url('@{FontPath}/ebgaramond/400i.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 250; + src: local('Merriweather Light'),url('@{FontPath}/merriweather/250.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 250i; + src: local('Merriweather Light Italic'),url('@{FontPath}/merriweather/250i.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 400; + src: local('Merriweather'),url('@{FontPath}/merriweather/400.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 400i; + src: local('Merriweather Italic'),url('@{FontPath}/merriweather/400i.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 600; + src: local(''),url('@{FontPath}/merriweather/600.woff') format('woff'); +} +/*@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 600i; + src: local(''),url('@{FontPath}/merriweather/600i.woff') format('woff'); +}*/ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 700; + src: local('Merriweather Bold'),url('@{FontPath}/merriweather/700.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 700i; + src: local('Merriweather Bold Italic'),url('@{FontPath}/merriweather/700i.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 900; + src: local('Merriweather Heavy'),url('@{FontPath}/merriweather/900.woff') format('woff'); +} +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 900i; + src: local('Merriweather Heavy Italic'),url('@{FontPath}/merriweather/900i.woff') format('woff'); +} +@font-face { + font-family: 'Anonymous Pro'; + font-style: normal; + font-weight: 400; + src: local('Anonymous Pro'),url('@{FontPath}/anonymouspro/400.woff') format('woff'); +} +@font-face { + font-family: 'Anonymous Pro'; + font-style: italic; + font-weight: 400i; + src: local('Anonymous Pro Italic'),url('@{FontPath}/anonymouspro/400i.woff') format('woff'); +} +@font-face { + font-family: 'Anonymous Pro'; + font-style: normal; + font-weight: 700; + src: local('Anonymous Pro Bold'),url('@{FontPath}/anonymouspro/700.woff') format('woff'); +} +@font-face { + font-family: 'Anonymous Pro'; + font-style: italic; + font-weight: 700i; + src: local('Anonymous Pro Bold Italic'),url('@{FontPath}/anonymouspro/700i.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'),url('@{FontPath}/opensans/300.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300i; + src: local('Open Sans Light Italic'),url('@{FontPath}/opensans/300i.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'),url('@{FontPath}/opensans/400.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400i; + src: local('Open Sans Italic'),url('@{FontPath}/opensans/400i.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'),url('@{FontPath}/opensans/600.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600i; + src: local('Open Sans Semibold Italic'),url('@{FontPath}/opensans/600i.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'),url('@{FontPath}/opensans/700.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700i; + src: local('Open Sans Bold Italic'),url('@{FontPath}/opensans/700i.woff') format('woff'); +}
\ No newline at end of file diff --git a/theme/stylesheets/highlight.less b/theme/stylesheets/highlight.less index ae9d1f8..33e0040 100644..100755 --- a/theme/stylesheets/highlight.less +++ b/theme/stylesheets/highlight.less @@ -1,9 +1,8 @@ /* http://jmblog.github.com/color-themes-for-google-code-highlightjs */ /* Tomorrow Comment */ -.hljs-comment, -.hljs-title { - color: #8e908c; +.hljs-comment { + color: hsl(207, 35%, 35%); } /* Tomorrow Red */ @@ -28,9 +27,9 @@ .hljs-pragma, .hljs-built_in, .hljs-literal, -.hljs-params, -.hljs-constant { - color: #f5871f; +.hljs-constant, +.hljs-function .hljs-title { + color: hsl(50, 100%, 60%); } /* Tomorrow Yellow */ @@ -46,7 +45,7 @@ .hljs-header, .ruby .hljs-symbol, .xml .hljs-cdata { - color: #718c00; + color: hsl(0, 100%, 70%); } /* Tomorrow Aqua */ @@ -55,7 +54,7 @@ } /* Tomorrow Blue */ -.hljs-function, +.hljs-function .keyword, .python .hljs-decorator, .python .hljs-title, .ruby .hljs-function .hljs-title, @@ -63,13 +62,13 @@ .perl .hljs-sub, .javascript .hljs-title, .coffeescript .hljs-title { - color: #4271ae; + color: hsl(207, 70%, 60%); } /* Tomorrow Purple */ .hljs-keyword, .javascript .hljs-function { - color: #8959a8; + color: hsl(207, 95%, 70%); } .hljs { @@ -77,6 +76,7 @@ background: white; color: #4d4d4c; padding: 0.5em; + font-family: "Anonymous Pro", "Inconsolata", "Monaco", monospace; } .coffeescript .javascript, diff --git a/theme/stylesheets/main.less b/theme/stylesheets/main.less index aac16bb..d09f0ff 100644..100755 --- a/theme/stylesheets/main.less +++ b/theme/stylesheets/main.less @@ -12,10 +12,10 @@ @import "book/summary.less"; @import "book/body.less"; @import "book/exercise.less"; +@import "book/quiz.less"; @import "book/markdown.less"; @import "book/progress.less"; @import "book/navigation.less"; -@import "book/quiz.less"; * { -webkit-overflow-scrolling: touch; @@ -34,7 +34,7 @@ html, body { } body { - + text-rendering: optimizeLegibility; font-smoothing: antialiased; - font-family: 'appNormal'; + font-family: @font-family-base; } diff --git a/theme/stylesheets/mixins.less b/theme/stylesheets/mixins.less index 0216ea4..0216ea4 100644..100755 --- a/theme/stylesheets/mixins.less +++ b/theme/stylesheets/mixins.less diff --git a/theme/stylesheets/print.less b/theme/stylesheets/print.less index 33fe3d8..33fe3d8 100644..100755 --- a/theme/stylesheets/print.less +++ b/theme/stylesheets/print.less diff --git a/theme/stylesheets/variables.less b/theme/stylesheets/variables.less index c8ce271..5dc9a9e 100644..100755 --- a/theme/stylesheets/variables.less +++ b/theme/stylesheets/variables.less @@ -1,33 +1,83 @@ -/* Base static */ @staticPath: "./"; // Sizes -@mobileMaxWidth: 1240px; +@mobileMaxWidth: 1240px; +// Header +@header-height: 50px; +@header-color: hsl(194, 5%, 52%); +@header-background: white; +@header-button-color: hsl(194, 5%, 52%); +@header-button-hover-color: #151515; +@header-button-hover-background: hsl(207, 15%, 95%); + +// Body +@body-background: white; +@body-pagination-background: hsl(207, 15%, 95%); + +// Sidebar +@sidebar-width: 250px; +@sidebar-color: hsl(207, 15%, 80%); +@sidebar-background: hsl(207, 15%, 95%); + +@sidebar-nested-padding: 10px; + +@sidebar-search-padding: 6px; +@sidebar-search-background: transparent; +@sidebar-search-input-border-color: hsl(207, 15%, 80%); + +@sidebar-divider-color: hsl(207, 15%, 85%); + +@sidebar-link-color: hsl(207, 15%, 50%); +@sidebar-link-background: transparent; +@sidebar-link-hover-color: hsl(207, 100%, 50%); +@sidebar-link-hover-background: transparent; + +@sidebar-icon-color: @bar-progress-background; +@sidebar-link-completed: hsl(207, 15%, 25%); +@sidebar-link-completed-weight: normal; + +// Page +@page-background: white; + +// Progress Bar +@chapter-display: none; +@chapter-size: 16px; + +@progress-height: 0px; + +@bar-height: 2px; +@bar-left: @sidebar-width; +@bar-right: 0; +@bar-top: 50px; +@bar-position: static; +@bar-background: white; +@bar-progress-background: hsl(120, 60%, 50%); // Basics of a navbar -@navbar-height: 50px; -@navbar-margin-bottom: @line-height-computed; -@navbar-default-border: #d5d5d5; -@navbar-border-radius: 0px; -@navbar-padding-horizontal: floor(@grid-gutter-width / 2); -@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-height: 50px; +@navbar-margin-bottom: @line-height-computed; +@navbar-default-border: #d5d5d5; +@navbar-border-radius: 0px; +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); +@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); // Navbar brand label -@navbar-default-color: #333; -@navbar-default-link-color: #333; -@navbar-default-brand-color: @navbar-default-link-color; -@navbar-default-brand-hover-color: @navbar-default-link-color; -@navbar-default-brand-hover-bg: transparent; - -@border-radius-base: 1px; -@border-radius-large: 3px; -@border-radius-small: 1px; +@navbar-default-color: #333; +@navbar-default-link-color: #333; +@navbar-default-brand-color: @navbar-default-link-color; +@navbar-default-brand-hover-color: @navbar-default-link-color; +@navbar-default-brand-hover-bg: transparent; -/* Fonts */ -@font-family-base: 'appNormal'; +// Border Radius +@border-radius-base: 1px; +@border-radius-large: 3px; +@border-radius-small: 1px; +// Fonts +@font-family-serif: Merriweather, "EB Garamond", Georgia, serif; +@font-family-sans: "Open Sans", "Clear Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-base: @font-family-serif; -/* Fonts */ -@FontPath: '@{staticPath}/fonts'; -@fa-font-path: "@{FontPath}/fontawesome"; +@FontPath: '@{staticPath}/fonts'; +@fa-font-path: "@{FontPath}/fontawesome"; diff --git a/theme/stylesheets/vendors/fontawesome/bordered-pulled.less b/theme/stylesheets/vendors/fontawesome/bordered-pulled.less index 0c90eb5..0c90eb5 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/bordered-pulled.less +++ b/theme/stylesheets/vendors/fontawesome/bordered-pulled.less diff --git a/theme/stylesheets/vendors/fontawesome/core.less b/theme/stylesheets/vendors/fontawesome/core.less index 6d223bc..6d223bc 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/core.less +++ b/theme/stylesheets/vendors/fontawesome/core.less diff --git a/theme/stylesheets/vendors/fontawesome/fixed-width.less b/theme/stylesheets/vendors/fontawesome/fixed-width.less index 110289f..110289f 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/fixed-width.less +++ b/theme/stylesheets/vendors/fontawesome/fixed-width.less diff --git a/theme/stylesheets/vendors/fontawesome/font-awesome.less b/theme/stylesheets/vendors/fontawesome/font-awesome.less index a853e0c..a853e0c 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/font-awesome.less +++ b/theme/stylesheets/vendors/fontawesome/font-awesome.less diff --git a/theme/stylesheets/vendors/fontawesome/icons.less b/theme/stylesheets/vendors/fontawesome/icons.less index 948903a..948903a 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/icons.less +++ b/theme/stylesheets/vendors/fontawesome/icons.less diff --git a/theme/stylesheets/vendors/fontawesome/larger.less b/theme/stylesheets/vendors/fontawesome/larger.less index c9d6467..c9d6467 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/larger.less +++ b/theme/stylesheets/vendors/fontawesome/larger.less diff --git a/theme/stylesheets/vendors/fontawesome/list.less b/theme/stylesheets/vendors/fontawesome/list.less index eed9340..eed9340 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/list.less +++ b/theme/stylesheets/vendors/fontawesome/list.less diff --git a/theme/stylesheets/vendors/fontawesome/mixins.less b/theme/stylesheets/vendors/fontawesome/mixins.less index 19e5a64..19e5a64 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/mixins.less +++ b/theme/stylesheets/vendors/fontawesome/mixins.less diff --git a/theme/stylesheets/vendors/fontawesome/path.less b/theme/stylesheets/vendors/fontawesome/path.less index ba09126..ba09126 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/path.less +++ b/theme/stylesheets/vendors/fontawesome/path.less diff --git a/theme/stylesheets/vendors/fontawesome/rotated-flipped.less b/theme/stylesheets/vendors/fontawesome/rotated-flipped.less index 8fff3a6..8fff3a6 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/rotated-flipped.less +++ b/theme/stylesheets/vendors/fontawesome/rotated-flipped.less diff --git a/theme/stylesheets/vendors/fontawesome/spinning.less b/theme/stylesheets/vendors/fontawesome/spinning.less index 60828fe..60828fe 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/spinning.less +++ b/theme/stylesheets/vendors/fontawesome/spinning.less diff --git a/theme/stylesheets/vendors/fontawesome/stacked.less b/theme/stylesheets/vendors/fontawesome/stacked.less index fc53fb0..fc53fb0 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/stacked.less +++ b/theme/stylesheets/vendors/fontawesome/stacked.less diff --git a/theme/stylesheets/vendors/fontawesome/variables.less b/theme/stylesheets/vendors/fontawesome/variables.less index 364b4dc..364b4dc 100644..100755 --- a/theme/stylesheets/vendors/fontawesome/variables.less +++ b/theme/stylesheets/vendors/fontawesome/variables.less |