diff options
author | Jason Long <jason@jasonlong.me> | 2018-01-17 16:48:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 16:48:13 +0300 |
commit | 717f3f3696e29492d4d06af6d9a9860dfb6e0305 (patch) | |
tree | 9a7f790b422ba1754e4743c1b166b7cbe4eaa9dc | |
parent | fa39d69d042c407ab3a6687b3ef454df0e984d95 (diff) | |
parent | 4bf4247b6a0ad7f1b7f52cdbd9d3257d828a603c (diff) |
Merge pull request #1121 from jasonlong/lint-fixes-part1
First pass at stylelint fixes
-rw-r--r-- | app/assets/stylesheets/blog.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/book.scss | 54 | ||||
-rw-r--r-- | app/assets/stylesheets/book2.scss | 201 | ||||
-rw-r--r-- | app/assets/stylesheets/downloads.scss | 52 | ||||
-rw-r--r-- | app/assets/stylesheets/forms.scss | 28 | ||||
-rw-r--r-- | app/assets/stylesheets/front-page.scss | 205 | ||||
-rw-r--r-- | app/assets/stylesheets/git-scm.scss | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/layout.scss | 145 | ||||
-rw-r--r-- | app/assets/stylesheets/lists.scss | 77 | ||||
-rw-r--r-- | app/assets/stylesheets/man-pages.scss | 30 | ||||
-rw-r--r-- | app/assets/stylesheets/reference.scss | 140 | ||||
-rw-r--r-- | app/assets/stylesheets/search.scss | 65 | ||||
-rw-r--r-- | app/assets/stylesheets/sidebar.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/typography.scss | 125 |
14 files changed, 686 insertions, 474 deletions
diff --git a/app/assets/stylesheets/blog.scss b/app/assets/stylesheets/blog.scss index 5c006fa6..604cacbf 100644 --- a/app/assets/stylesheets/blog.scss +++ b/app/assets/stylesheets/blog.scss @@ -4,9 +4,9 @@ .subheader { display: block; + padding-left: 2px; font-size: 16px; font-weight: normal; - color: $light-font-color; line-height: 15px; - padding-left:2px; + color: $light-font-color; } diff --git a/app/assets/stylesheets/book.scss b/app/assets/stylesheets/book.scss index 651f41f1..a61c979e 100644 --- a/app/assets/stylesheets/book.scss +++ b/app/assets/stylesheets/book.scss @@ -3,14 +3,15 @@ } #book-container { - position: relative; @extend .callout; - background-color: transparent ! important; - border: solid 1px lighten($base-border-color, 10%); - padding-top: 20px ! important; - padding-bottom: 20px ! important; + position: relative; + padding-top: 20px !important; + padding-bottom: 20px !important; + background-color: transparent !important; overflow: hidden; + border: solid 1px lighten($base-border-color, 10%); } + #book-intro { position: absolute; top: 40px; @@ -18,34 +19,39 @@ width: 200px; font-size: 13px; text-align: center; + p { padding-bottom: 20px; } + img.creative-commons { display: block; margin: 10px auto; } + .license { font-size: 11px; line-height: 1.3; color: $light-font-color; } + a#open-book { - font-weight: bold; display: block; margin-top: 10px; margin-bottom: 10px; + font-weight: bold; } } #about-book { + @include background-image-2x("/images/icons/info", 18px, 17px, 40px 1px); display: none; - text-indent: 40px; - text-align: center; + padding-left: 22px; font-size: 12px; color: $light-font-color; - padding-left: 22px; - @include background-image-2x('/images/icons/info', 18px, 17px, 40px 1px); + text-align: center; + text-indent: 40px; + &.visible { display: inline-block; } @@ -54,15 +60,19 @@ ol.book-toc { @extend .unstyled; margin: 30px 36px; + li.chapter { margin-bottom: 0.6em; } + ol { list-style: none; } + h2 { color: $font-color; } + a { padding-left: 4px; } @@ -81,22 +91,24 @@ ol.book-toc { .book table.commands { font-size: 1.2em; } + .book table.commands tr td { padding: 2px; } + .book table.commands tr td small { - color: #777; font-size: 0.8em; + color: #777; } .book table.ref { + width: 100%; margin-bottom: 10px; - width: 100%; } .book table.ref tr { - border-color: #777; border: 1px solid; + border-color: #777; } .book table.ref th, td { @@ -104,27 +116,33 @@ ol.book-toc { } .book table.ref th:nth-child(1), td:nth-child(1) { - padding: 5px; width: 25%; + padding: 5px; } #book-chapters { @extend .section-nav-container; + #chapters-dropdown { - padding: 12px; top: 30px; + padding: 12px; } + ol { margin: 0; + li { - line-height: $base-line-height * .8; + line-height: $base-line-height * 0.8; + h2 { margin: 14px 0; font-size: 14px; line-height: normal; } + ol { margin-left: 0; + a { font-weight: normal; } @@ -133,4 +151,6 @@ ol.book-toc { } } -.switch a { color: #aaa; } +.switch a { + color: #aaa; +} diff --git a/app/assets/stylesheets/book2.scss b/app/assets/stylesheets/book2.scss index 5d2deb0a..ac41e374 100644 --- a/app/assets/stylesheets/book2.scss +++ b/app/assets/stylesheets/book2.scss @@ -1,24 +1,22 @@ .edition2 { - * { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; box-sizing: border-box; } body { - max-width: 700px; - margin: 0 auto; padding-top: 80px; + margin: 0 auto; + max-width: 700px; } /* general blocks */ - p, dd { /* general text styles */ + p, + dd { /* general text styles */ font-family: sans-serif; - text-indent: 0px; font-size: 14px; line-height: 22px; + text-indent: 0; } section[data-type="preface"] > h1 + p, @@ -58,9 +56,9 @@ } section[data-type="titlepage"] h1 { - border-bottom: 1px solid #333; - margin-top: 100px; padding-bottom: 10px; + margin-top: 100px; + border-bottom: 1px solid #333; } section[data-type="titlepage"] h1 { @@ -69,9 +67,9 @@ } section[data-type="titlepage"] h2 { + margin-top: 20px; font-size: 1.2em; line-height: 120%; - margin-top: 20px; } /* styling and positioning for author names and other text */ @@ -81,12 +79,12 @@ } section[data-type="titlepage"] p { + float: none; + margin-top: 0; + margin-bottom: 0; font-family: sans-serif; font-size: 13pt; line-height: 16pt; - margin-top: 0pt; - margin-bottom: 0pt; - float: none; text-indent: 0; } @@ -102,25 +100,26 @@ } section[data-type="copyright-page"] p { + margin: 0; font-family: sans-serif; font-size: 0.8em; - margin: 0; text-indent: 0; } /* dedication */ section[data-type="dedication"] { + padding-top: 100px; font-family: serif; font-style: italic; page-break-after: always; text-align: center; - padding-top: 100px; } /* table of contents */ /* global styles for the table of contents */ + /* table of contents is a series of nested lists in a nav element */ nav[data-type="toc"] a { /* all table of contents entries are also links */ @@ -132,10 +131,10 @@ } nav[data-type="toc"] > h1 { /* table of contents heading */ - font-size: 1.5em; - line-height: 120%; margin-top: 80px; margin-bottom: 50px; + font-size: 1.5em; + line-height: 120%; text-align: center; } @@ -152,9 +151,9 @@ nav[data-type="toc"] li[data-type="chapter"], nav[data-type="toc"] li[data-type="part"], nav[data-type="toc"] li[data-type="appendix"] { + margin-left: 0; font-size: 1em; line-height: 120%; - margin-left: 0; text-indent: 0; } @@ -165,9 +164,9 @@ } nav[data-type="toc"] li[data-type="part"] > a { - border-bottom: 1px solid #333; - width: 100%; display: inline-block; + width: 100%; + border-bottom: 1px solid #333; } nav[data-type="toc"] li[data-type="part"] ol { @@ -189,10 +188,10 @@ /* entries for sub-sections */ nav[data-type="toc"] li[data-type="chapter"] ol { + margin-left: 20px; font-family: sans-serif; font-size: 1em; line-height: 120%; - margin-left: 20px; text-indent: -10px; } @@ -249,8 +248,8 @@ section[data-type="preface"] > h1, section[data-type="chapter"] > h1, section[data-type="appendix"] > h1 { - font-size: 1.8em; margin-top: 70px; + font-size: 1.8em; margin-bottom: 40px; text-align: left; } @@ -258,30 +257,30 @@ /* section headings */ section[data-type="sect1"] h1 { /* A-level headings */ - font-size: 1.5em; margin-top: 40px; margin-bottom: 20px; + font-size: 1.5em; } section[data-type="sect2"] h2 { /* B-level headings */ - font-size: 1.1em; margin-top: 30px; margin-bottom: 10px; + font-size: 1.1em; } section[data-type="sect3"] h3 { /* C-level headings */ - font-size: 1.1em; margin-top: 20px; margin-bottom: 10px; + font-size: 1.1em; } /* parts */ div[data-type="part"] > h1 { - font-size: 1.8em; - text-align: center; margin-top: 100px; margin-bottom: 70px; + font-size: 1.8em; + text-align: center; } /* lists */ @@ -290,12 +289,14 @@ margin: 15px 0 15px 40px; } - ul li, ol li, - ul li p, ol li p { + ul li, + ol li, + ul li p, + ol li p { + margin-top: 5px; font-family: sans-serif; font-size: 1em; line-height: 120%; - margin-top: 5px; text-indent: 0; } @@ -304,16 +305,16 @@ } dt { /* definition list terms */ + margin-top: 15px; + margin-bottom: 4px; font-family: sans-serif; font-size: 0.9em; line-height: 120%; - margin-top: 15px; - margin-bottom: 4px; } dd { /* definition list descriptions */ - text-indent: 0; margin-left: 20px; + text-indent: 0; } dd p { @@ -325,17 +326,17 @@ table { margin-top: 30px; margin-bottom: 30px; - border-bottom: 1px solid #888; border-collapse: collapse; + border-bottom: 1px solid #888; } table caption { + margin: 0 0 20px; + padding: 0; font-family: sans-serif; font-size: 0.8em; line-height: 120%; text-align: left; - margin: 0 0 20px 0; - padding: 0; } tr { @@ -343,11 +344,11 @@ } th { /* table heading rows */ + margin-top: 0; font-family: sans-serif; font-size: 0.8em; line-height: 120%; text-align: left; - margin-top: 0; border-top: 1px solid #888; border-bottom: 1px solid #888; } @@ -363,95 +364,98 @@ } table p { /* table body text */ - text-indent: 0; margin-top: 6px; + text-indent: 0; } - td pre.programlisting, td pre.screen, td pre.literallayout, td code { /* allow code in tables to wrap */ - white-space: pre-wrap; + td pre.programlisting, + td pre.screen, + td pre.literallayout, + td code { /* allow code in tables to wrap */ word-wrap: break-word; + white-space: pre-wrap; } /* figures */ figure { /* figure containers */ + display: block; + padding: 0; margin-top: 30px; margin-bottom: 30px; - padding: 0; - display: block; page-break-inside: avoid; } figure img { /* figure images */ - border-top: 1px solid #888; - border-bottom: 1px solid #888; - padding: 5px 0 5px 0; max-width: 100%; + padding: 5px 0 5px 0; margin: 0; + border-top: 1px solid #888; + border-bottom: 1px solid #888; } figcaption { + display: block; font-family: serif; font-size: 1em; font-style: italic; line-height: 120%; - display: block; } /* sidebars */ aside { /* sidebar containers */ + padding: 20px 20px 10px; + margin: 30px 0; background-color: #d8d8d8; border: 1px solid #d8d8d8; - padding: 20px 20px 10px 20px; - margin: 30px 0 30px 0; } aside h5 { /* sidebar titles */ + padding: 0; + margin: 0; font-family: sans-serif; font-size: 1em; line-height: 120%; text-align: center; - margin: 0; - padding: 0; } aside h6 { /* sidebar subtitles */ font-family: sans-serif; - font-weight: bold; font-size: 0.9em; + font-weight: bold; line-height: 120%; } aside p { /* sidebar text */ + margin-top: 6px; font-family: serif; font-size: 1em; line-height: 130%; text-indent: 0; - margin-top: 6px; } /* admonitions */ div[data-type="note"], div[data-type="warning"] { /* admonition containers */ + padding: 10px 0; + margin: 30px; border-top: 2px solid #888; border-bottom: 1px solid #d8d8d8; - padding: 10px 0; - margin: 30px 30px 30px 30px; page-break-inside: avoid; /* avoid breaking admonitions across pages */ } div[data-type="note"] h1, div[data-type="warning"] h1 { /* admonition titles */ - color: #000; + padding: 0; + margin: 4px 0; font-family: sans-serif; - font-weight: bold; font-size: 0.8em; - text-transform: uppercase; + font-weight: bold; + color: #000; text-align: center; - margin: 4px 0; - padding: 0; + text-transform: uppercase; } div[data-type="note"] p, @@ -459,37 +463,39 @@ font-family: serif; font-size: 1em; line-height: 120%; - text-indent: 0in; + text-indent: 0; } /* code */ - pre, code { /* monospace font for both code blocks and inline code */ + pre, + code { /* monospace font for both code blocks and inline code */ font-family: monospace; } pre { background: #eee; + code { display: inline; - border: 0px; background: #eee; + border: 0; } } pre { /* code blocks */ + margin: 10px 0; + overflow-x: auto; font-size: 0.9em; line-height: 120%; - margin: 10px 0px; - overflow-x: auto; color: #333; } code { /* inline code */ - border: 1px solid #f5f5f5; - padding: 0px; - background: #eee; + padding: 0; color: #333; + background: #eee; + border: 1px solid #f5f5f5; } table pre { /* code blocks within tables */ @@ -505,22 +511,22 @@ } div[data-type="example"] h5 { /* titles for formal code examples */ + padding-bottom: 6px; + margin-top: 30px; font-family: sans-serif; font-size: 0.8em; line-height: 120%; border-bottom: 1px solid #d8d8d8; - padding-bottom: 6px; - margin-top: 30px; } /* blockquote */ blockquote { + margin-right: 30px; + margin-left: 30px; font-family: sans-serif; font-size: 0.9em; line-height: 130%; - margin-left: 30px; - margin-right: 30px; } blockquote p { @@ -530,37 +536,37 @@ /* website nav element */ div.navbar { - font-family: sans-serif; - background-color: #E8E8E8; position: fixed; top: 0; left: 0; width: 100%; - padding: 10px 20px 10px 20px; + padding: 10px 20px; + font-family: sans-serif; + background-color: #e8e8e8; border-bottom: 1px solid #d8d8d8; } div.navbar h1 { float: left; - font-size: 1em; - font-weight: normal; padding: 0; margin: 0; + font-size: 1em; + font-weight: normal; color: #999; } div.navbar p { float: right; - font-size: 1em; - font-weight: normal; padding: 0; margin: 0; font-family: sans-serif; + font-size: 1em; + font-weight: normal; } div.navbar p a { - text-decoration: none; color: #999; + text-decoration: none; } /* iPad @@ -584,24 +590,23 @@ /* website nav element */ - div.navbar { - position: relative; - padding: 10px 20px 10px 20px; - border-bottom: 2px solid #e8e8e8; - box-shadow: 0px 0px 0px #f0f0f0; - text-align: center; - } - - div.navbar h1 { - float: none; - margin-bottom: 10px; - } + div.navbar { + position: relative; + padding: 10px 20px; + text-align: center; + border-bottom: 2px solid #e8e8e8; + box-shadow: 0 0 0 #f0f0f0; + } - div.navbar p { - float: none; - text-indent: 0; - } + div.navbar h1 { + float: none; + margin-bottom: 10px; + } + div.navbar p { + float: none; + text-indent: 0; + } } /* syntax highlighting and coloring text in general */ @@ -687,15 +692,15 @@ /* Chacon's additions to make command line look more like a command line */ pre[data-code-language="console"] { - background: #eee; padding: 10px; + background: #eee; } pre[data-code-language="console"] code.go { - color: #555; font-size: 1.0em; + color: #555; } pre[data-code-language="console"] code.gp { - color: #009900; font-weight: bold; + color: #009900; } } diff --git a/app/assets/stylesheets/downloads.scss b/app/assets/stylesheets/downloads.scss index 52bc49dd..a375f9e5 100644 --- a/app/assets/stylesheets/downloads.scss +++ b/app/assets/stylesheets/downloads.scss @@ -1,15 +1,18 @@ #logo-license { @extend .callout; + padding: 20px !important; margin-top: 2em; - padding: 20px ! important; + p { - color: $light-font-color; font-size: 12px; line-height: 1.4; + color: $light-font-color; } + p + p { margin-top: 14px; } + img { float: left; margin-right: 20px; @@ -20,9 +23,11 @@ .column-left { width: 47%; } + .column-right { width: 45%; } + p { padding-bottom: 1em; line-height: 1.4; @@ -30,22 +35,25 @@ } .callout.downloading { - background: $callout-color url(/images/icons/download.png) 24px 24px no-repeat; + background: $callout-color url("/images/icons/download.png") 24px 24px no-repeat; padding: 20px 30px 20px 100px !important; + h3 { font-size: 18px; color: $orange; } + p { + margin-bottom: 15px !important; font-size: 15px; line-height: 1.3em; - margin-bottom: 15px ! important; } + p.small { + margin-bottom: 0 !important; font-size: 12px; - color: $light-font-color; line-height: 1.4; - margin-bottom: 0 ! important; + color: $light-font-color; } } @@ -53,53 +61,53 @@ @include clearfix; @extend .unstyled; padding-top: 24px; + li { display: block; - width: 200px; float: left; + width: 200px; margin-bottom: 20px; } + li + li { margin-left: 20px; } + a { display: block; color: $font-color; text-align: center; - background-position: 0 0; background-repeat: no-repeat; - -webkit-transition-property: color; - -moz-transition-property: color; - transition-property: color; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; + background-position: 0 0; transition-duration: 0.3s; + transition-property: color; + img { display: block; - margin: 0 auto 10px auto; + margin: 0 auto 10px; opacity: 0.9; - -webkit-transition-property: opacity; - -moz-transition-property: opacity; - transition-property: opacity; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; transition-duration: 0.3s; + transition-property: opacity; image-rendering: -webkit-optimize-contrast; } + h3 { font-size: 18px; font-weight: bold; color: $orange; } + p { font-size: 13px; line-height: $base-line-height * 0.8; } } + a:hover { img { opacity: 1; } + h3 { color: darken($orange, 5%); } @@ -107,9 +115,9 @@ } #os-filter-count { - color: $orange; - display: none; - left: 12px; position: relative; top: 8px; + left: 12px; + display: none; + color: $orange; } diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss index 55701e47..e3b110d9 100644 --- a/app/assets/stylesheets/forms.scss +++ b/app/assets/stylesheets/forms.scss @@ -19,39 +19,41 @@ input, textarea { font-size: 14px; outline: none; } -.windows.chrome input, .windows.chrome textarea, -.windows.ie8 input, .windows.chrome textarea { - font-family: $base-font-family-fallback ! important; + +.windows.chrome input, +.windows.chrome textarea, +.windows.ie8 input, +.windows.chrome textarea { + font-family: $base-font-family-fallback !important; } form#search { position: absolute; - z-index: 1000; - right: 0; top: 10px; + right: 0; + z-index: 1000; width: 262px; padding-left: 32px; - @include background-image-2x('/images/icons/search', 17px, 17px, 10px 50%); - background-color: #fcfcfa ! important; + @include background-image-2x("/images/icons/search", 17px, 17px, 10px 50%); + background-color: #fcfcfa !important; border: solid 1px #ceccc5; @include border-radius(20px); @include box-shadow(inset 0 1px 4px #ddd); input { @include border-radius(20px); - border: none; + width: 100%; + height: 20px; margin-top: 5px; margin-bottom: 1px; line-height: 1em; - width: 100%; - height: 20px; - background-color: transparent; color: $font-color; -// padding: 6px 0 2px 0; + background-color: transparent; + border: 0; } + &.focus { border-color: #007175; background-color: #fff; } } - diff --git a/app/assets/stylesheets/front-page.scss b/app/assets/stylesheets/front-page.scss index b7976d5e..06c5bebf 100644 --- a/app/assets/stylesheets/front-page.scss +++ b/app/assets/stylesheets/front-page.scss @@ -3,70 +3,74 @@ overflow: visible; #front-navigation { - width: 618px; float: left; - border-right: solid 1px $base-border-color; + width: 618px; margin-bottom: 24px; + border-right: solid 1px $base-border-color; } } #front-nav { @include clearfix; + ul { @extend .unstyled; padding-top: 24px; + li { display: block; - width: 280px; float: left; + width: 280px; margin-bottom: 20px; - &#nav-about, &#nav-downloads { + + &#nav-about, + &#nav-downloads { margin-right: 30px; } - &#nav-about, &#nav-documentation { + + &#nav-about, + &#nav-documentation { margin-bottom: 40px; } } } + a { - height: 86px; display: block; - color: $font-color; + height: 86px; padding-left: 90px; - background-position: 0 0; + color: $font-color; background-repeat: no-repeat; - -webkit-transition-property: color; - -moz-transition-property: color; - transition-property: color; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; + background-position: 0 0; transition-duration: 0.3s; + transition-property: color; + img { - margin-left: -90px; - margin-right: -90px; float: left; + margin-right: -90px; + margin-left: -90px; opacity: 0.9; - -webkit-transition-property: opacity; - -moz-transition-property: opacity; - transition-property: opacity; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; transition-duration: 0.3s; + transition-property: opacity; } + h3 { font-size: 18px; font-weight: bold; color: $orange; } + p { font-size: 13px; line-height: $base-line-height * 0.8; } } + a:hover { img { opacity: 1; } + h3 { color: darken($orange, 5%); } @@ -74,14 +78,16 @@ } #front-book { - padding-top: 20px; float: left; width: 590px; + padding-top: 20px; border-top: solid 1px $base-border-color; + img { float: left; margin-right: 20px; } + p { margin-top: 16px; } @@ -91,8 +97,8 @@ $monitor-width: 313px; $monitor-height: 271px; #front-downloads { - width: 313px; float: right; + width: 313px; position: relative; .monitor { @@ -105,9 +111,11 @@ $monitor-height: 271px; position: absolute; top: $monitor-height; left: 24px; + td { padding: 8px 20px 6px 0; } + a { font-weight: bold; } @@ -115,87 +123,84 @@ $monitor-height: 271px; } .monitor { - @include background-image-2x('/images/monitor-default', $monitor-width, $monitor-height); + @include background-image-2x("/images/monitor-default", $monitor-width, $monitor-height); + width: $monitor-width - 40; + height: $monitor-height - 45; padding-top: 45px; padding-left: 40px; - height: $monitor-height - 45; - width: $monitor-width - 40; color: #fff; text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2); + h4 { font-weight: normal; color: #fff; font-size: 16px; } + span.version { display: block; - font-weight: bold; - font-size: 28px; margin-bottom: 6px; + font-size: 28px; + font-weight: bold; } + a { color: #59d6de; font-size: 12px; } + span.release-date { font-size: 12px; } + a.button { + @include border-radius(2px); + @include box-shadow(0 1px 0 #148a92); display: block; + width: 224px; + padding: 5px 0; margin-top: 10px; + font-size: 16px; + color: #fff; + text-align: center; + background-image: linear-gradient(#1c868c, #186368); border-top: solid 1px #085e64; - border-left: solid 1px #1f6367; border-right: solid 1px #1f6367; border-bottom: solid 1px #134143; - text-align: center; - color: #fff; - font-size: 16px; - width: 224px; - padding: 5px 0; - @include border-radius(2px); - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1c868c), color-stop(100%, #186368)); - background-image: -webkit-linear-gradient(#1c868c, #186368); - background-image: -moz-linear-gradient(#1c868c, #186368); - background-image: -o-linear-gradient(#1c868c, #186368); - background-image: linear-gradient(#1c868c, #186368); - @include box-shadow(0 1px 0 #148a92); - -webkit-transition-property: background-image; - -moz-transition-property: background-image; - -o-transition-property: background-image; - transition-property: background-image; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; - -o-transition-duration: 0.3s; + border-left: solid 1px #1f6367; transition-duration: 0.3s; + transition-property: background-image; + &:hover { - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1a7e84), color-stop(100%, #165b60)); - background-image: -webkit-linear-gradient(#1a7e84, #165b60); - background-image: -moz-linear-gradient(#1a7e84, #165b60); - background-image: -o-linear-gradient(#1a7e84, #165b60); background-image: linear-gradient(#1a7e84, #165b60); } } + &.mac { - @include background-image-2x('/images/monitor-mac', $monitor-width, $monitor-height); + @include background-image-2x("/images/monitor-mac", $monitor-width, $monitor-height); + width: $monitor-width - 40; + height: $monitor-height - 36; padding-top: 36px; padding-left: 40px; - height: $monitor-height - 36; - width: $monitor-width - 40; } + &.windows { - @include background-image-2x('/images/monitor-windows', $monitor-width, $monitor-height); + @include background-image-2x("/images/monitor-windows", $monitor-width, $monitor-height); } + &.linux { - @include background-image-2x('/images/monitor-linux', $monitor-width, $monitor-height); + @include background-image-2x("/images/monitor-linux", $monitor-width, $monitor-height); } } #companies-projects { + padding-top: 20px; clear: both; border-top: solid 1px $base-border-color; - padding-top: 20px; + ul { @extend .unstyled; + li { display: block; float: left; @@ -203,99 +208,119 @@ $monitor-height: 271px; height: 65px; margin: 0 4px 25px 5px; } + a { display: block; width: 108px; height: 65px; + text-indent: -9999px; + background-repeat: no-repeat; + background-position: 0 0; opacity: 0.85; - -webkit-transition-property: opacity; - -moz-transition-property: opacity; - transition-property: opacity; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; transition-duration: 0.3s; - background-position: 0 0; - background-repeat: no-repeat; - text-indent: -9999px; + transition-property: opacity; + &:hover { opacity: 1; } + &.facebook { - background-image: url(/images/company-project-logos/facebook.png); + background-image: url("/images/company-project-logos/facebook.png"); } + &.google { - @include background-image-2x('/images/company-project-logos/google', 108px, 65px); + @include background-image-2x("/images/company-project-logos/google", 108px, 65px); } + &.twitter { - @include background-image-2x('/images/company-project-logos/twitter', 108px, 65px); + @include background-image-2x("/images/company-project-logos/twitter", 108px, 65px); } + &.microsoft { - @include background-image-2x('/images/company-project-logos/microsoft', 108px, 65px); + @include background-image-2x("/images/company-project-logos/microsoft", 108px, 65px); } + &.netflix { - @include background-image-2x('/images/company-project-logos/netflix', 108px, 65px); + @include background-image-2x("/images/company-project-logos/netflix", 108px, 65px); } + &.linked-in { - @include background-image-2x('/images/company-project-logos/linked-in', 108px, 65px); + @include background-image-2x("/images/company-project-logos/linked-in", 108px, 65px); } + &.linux { - @include background-image-2x('/images/company-project-logos/linux', 108px, 65px); + @include background-image-2x("/images/company-project-logos/linux", 108px, 65px); } + &.perl { - @include background-image-2x('/images/company-project-logos/perl', 108px, 65px); + @include background-image-2x("/images/company-project-logos/perl", 108px, 65px); } + &.postgresql { - @include background-image-2x('/images/company-project-logos/postgresql', 108px, 65px); + @include background-image-2x("/images/company-project-logos/postgresql", 108px, 65px); } + &.facebook { - @include background-image-2x('/images/company-project-logos/facebook', 108px, 65px); + @include background-image-2x("/images/company-project-logos/facebook", 108px, 65px); } + &.android { - @include background-image-2x('/images/company-project-logos/android', 108px, 65px); + @include background-image-2x("/images/company-project-logos/android", 108px, 65px); } &.rails { - @include background-image-2x('/images/company-project-logos/rails', 108px, 65px); + @include background-image-2x("/images/company-project-logos/rails", 108px, 65px); } + &.qt { - @include background-image-2x('/images/company-project-logos/qt', 108px, 65px); + @include background-image-2x("/images/company-project-logos/qt", 108px, 65px); } + &.gnome { - @include background-image-2x('/images/company-project-logos/gnome', 108px, 65px); + @include background-image-2x("/images/company-project-logos/gnome", 108px, 65px); } + &.eclipse { - @include background-image-2x('/images/company-project-logos/eclipse', 108px, 65px); + @include background-image-2x("/images/company-project-logos/eclipse", 108px, 65px); } + &.kde { - @include background-image-2x('/images/company-project-logos/kde', 108px, 65px); + @include background-image-2x("/images/company-project-logos/kde", 108px, 65px); } + &.x { - @include background-image-2x('/images/company-project-logos/x', 108px, 65px); + @include background-image-2x("/images/company-project-logos/x", 108px, 65px); } } } } a.icon { - padding-left: 30px; + display: inline-block; height: 30px; + padding-left: 30px; line-height: 36px; - display: inline-block; + &.gui { - @include background-image-2x('/images/icons/gui', 18px, 24px, 6px 3px); + @include background-image-2x("/images/icons/gui", 18px, 24px, 6px 3px); } + &.older-releases { - @include background-image-2x('/images/icons/box', 22px, 20px, 0 6px); + @include background-image-2x("/images/icons/box", 22px, 20px, 0 6px); } + &.windows { - @include background-image-2x('/images/icons/windows', 24px, 21px, 0 6px); + @include background-image-2x("/images/icons/windows", 24px, 21px, 0 6px); } + &.mac { - @include background-image-2x('/images/icons/apple', 17px, 21px, 5px 4px); + @include background-image-2x("/images/icons/apple", 17px, 21px, 5px 4px); } + &.linux { - @include background-image-2x('/images/icons/linux', 17px, 21px, 6px 6px); + @include background-image-2x("/images/icons/linux", 17px, 21px, 6px 6px); } + &.source { - @include background-image-2x('/images/icons/source-code', 25px, 20px, 0 6px); + @include background-image-2x("/images/icons/source-code", 25px, 20px, 0 6px); } } diff --git a/app/assets/stylesheets/git-scm.scss b/app/assets/stylesheets/git-scm.scss index d8076a18..ff110454 100644 --- a/app/assets/stylesheets/git-scm.scss +++ b/app/assets/stylesheets/git-scm.scss @@ -17,20 +17,18 @@ code { display: inline; - padding: 0px 5px 0px 5px; + padding: 0 5px; } pre { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; display: block; - padding: 10px 15px 13px 15px; + padding: 10px 15px 13px; margin-bottom: 1em; + overflow: auto; + font-family: $fixed-width-font-family; + line-height: 18px; + color: #f14e32; background-color: #fff; border: solid 1px #efeee6; - color: #f14e32; - font-family: Courier, monospace; - line-height: 18px; - overflow: auto + border-radius: 3px; } diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7768e514..d93a8dc1 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1,17 +1,17 @@ body { - margin: 0; padding: 0; + margin: 0; + font-family: $base-font-family; font-size: $base-font-size; line-height: $base-line-height; - font-family: $base-font-family; color: $font-color; - background: #f0efe7 url(/images/bg/body.jpg); + background: #f0efe7 url("/images/bg/body.jpg"); } // windows chrome makes a mess of Adelle web font .windows.chrome body, .windows.ie8 body { - font-family: $base-font-family-fallback ! important; + font-family: $base-font-family-fallback !important; } // High level structure @@ -24,67 +24,72 @@ body { } aside { - width: 218px; float: left; + width: 218px; margin-bottom: 35px; } .banner-message { - background-color: #fcbda5; - color: #855; - padding: 1.0em 100px; + position: relative; + padding: 1em 100px; margin-bottom: 30px; font-size: 100%; - position: relative; + color: #855; + background-color: #fcbda5; a { - color: #C22; + color: #c22; } .dismiss { position: absolute; top: 0; right: 0; - border: none; - background: none; width: 2em; - line-height: 2em; padding: 0; + line-height: 2em; + background: none; + border: 0; } } #content { - width: 702px; float: right; + width: 702px; } #main { + padding: 22px; + margin-bottom: 35px; background-color: #fcfcfa; border: solid 1px #e2e0d8; @include border-radius(5px); - padding: 22px; - margin-bottom: 35px; .two-column { @include clearfix; + .column-left { width: 47%; float: left; } + .column-right { width: 47%; float: right; } } + .callout { background-color: $callout-color; @include border-radius(3px); - padding: 8px 14px 4px 14px; + padding: 8px 14px 4px; margin-bottom: 1.4em; + p { margin-bottom: 0; } } + img { max-width: 100%; } @@ -94,22 +99,27 @@ aside { height: 295px; margin-top: -20px; margin-bottom: 2em; - @include background-image-2x('/images/bg/isometric-grid', 35px, 21px, top right, repeat); + @include background-image-2x("/images/bg/isometric-grid", 35px, 21px, top right, repeat); + .inner { padding-top: 20px; + p { width: 558px; + margin-bottom: 1.2em; font-size: 18px; line-height: $base-line-height * 1.2; - margin-bottom: 1.2em; } + .promo { font-weight: bold; + img { position: relative; top: -6px; } } + img.illustration { position: absolute; right: -30px; @@ -120,18 +130,20 @@ aside { // Header header { - margin-top: 14px; position: relative; padding-bottom: 26px; + margin-top: 14px; + #tagline { - display: block; position: absolute; top: 11px; left: 120px; + display: block; margin-top: 1px; - color: $light-font-color; font-size: 24px; line-height: 24px; + color: $light-font-color; + em { letter-spacing: 1px; } @@ -140,6 +152,7 @@ header { ul.related-material { font-weight: normal; + li { a { display: inline @@ -149,31 +162,38 @@ ul.related-material { // Navigation aside nav ul { - list-style: none; + margin-bottom: 1.4em; + margin-left: 0; font-size: 16px; font-weight: bold; - margin-left: 0; - margin-bottom: 1.4em; + list-style: none; + li { margin-bottom: 0.5em; + a { color: #413932; + &.active, &:hover { color: $orange; } } + ul { display: none; margin-top: 0.3em; margin-left: 20px; - font-weight: normal; font-size: 13px; + font-weight: normal; + li { margin-bottom: 0; + a.active { font-weight: bold; } } + &.expanded { display: block; } @@ -186,9 +206,11 @@ aside nav ul { @include clearfix; margin-top: 2em; font-weight: bold; + .previous { float: left; } + .next { float: right; } @@ -198,6 +220,7 @@ section.about { &.current { display: block; } + .bottom-nav { display: none; } @@ -209,16 +232,19 @@ p.center { #logo-license { @extend .callout; + padding: 20px !important; margin-top: 2em; - padding: 20px ! important; + p { - color: $light-font-color; font-size: 12px; line-height: 1.4; + color: $light-font-color; } + p + p { margin-top: 14px; } + img { float: left; margin-right: 20px; @@ -228,20 +254,23 @@ p.center { .callout.downloading { background: $callout-color url(/images/icons/download.png) 24px 24px no-repeat; padding: 20px 30px 20px 100px !important; + h3 { font-size: 18px; color: $orange; } + p { + margin-bottom: 15px !important; font-size: 15px; line-height: 1.3em; - margin-bottom: 15px ! important; } + p.small { + margin-bottom: 0 !important; font-size: 12px; - color: $light-font-color; line-height: 1.4; - margin-bottom: 0 ! important; + color: $light-font-color; } } @@ -249,36 +278,43 @@ p.center { @extend .unstyled; position: relative; background-color: #ebe9e1; - background-color: rgba(223, 221, 213, .33); + background-color: rgba(223, 221, 213, 0.33); @include border-radius(3px); - padding: 8px 12px 6px 12px; + padding: 8px 12px 6px; margin-bottom: 10px; font-size: 13px; font-weight: bold; + .light { font-weight: normal; } + a { font-weight: bold; position: relative; } + .dropdown-panel { top: 33px; + .three-column { @include clearfix; + .column-left { - width: 31%; float: left; - padding-right: 3% + width: 31%; + padding-right: 3%; } + .column-middle { - width: 31%; float: left; - padding-right: 3% + width: 31%; + padding-right: 3%; } + .column-right { - width: 31%; float: left; + width: 31%; } } } @@ -288,28 +324,31 @@ p.center { a.dropdown-trigger { padding: 4px 5px; border: solid 1px transparent; + &.active { position: relative; z-index: 200; - background-color: #fff ! important; + background-color: #fff !important; @include border-top-left-radius(3px); @include border-top-right-radius(3px); border: solid 1px darken($base-border-color, 8%); - border-bottom: none; + border-bottom: 0; } } .dropdown-panel { + position: absolute; + z-index: 199; display: none; background-color: #fff; border: solid 1px darken($base-border-color, 8%); - position: absolute; - z-index: 199; @include border-radius(3px); @include box-shadow(0 1px 2px #ccc); + &.left { @include border-top-left-radius(0); } + &.right { @include border-top-right-radius(0); } @@ -317,25 +356,29 @@ a.dropdown-trigger { // Footer footer { + padding: 20px 0 40px; + margin-top: 35px; clear: both; @include clearfix; - margin-top: 35px; - border-top: solid 1px $base-border-color; - padding: 20px 0 40px 0; - color: $light-font-color; font-size: 12px; line-height: $base-line-height * 0.7; + color: $light-font-color; + border-top: solid 1px $base-border-color; + a { color: darken($light-font-color, 35%); + &:hover { color: darken($light-font-color, 55%); } } + .site-source { float: left; - @include background-image-2x('/images/icons/code', 38px, 23px, 0 2px); padding-left: 46px; + @include background-image-2x("/images/icons/code", 38px, 23px, 0 2px); } + .sfc-member { float: right; text-align: right; @@ -346,20 +389,24 @@ table.benchmarks { width: 100%; padding: 20px; margin-bottom: 20px; + tr { th.right { text-align: center; } + td.desc { font-size: 0.8em; color: #888; } + td.number { - text-align: right; font-family:monospace; + text-align: right; } + td { - padding: 0 10px; + padding: 0 10px; } } } diff --git a/app/assets/stylesheets/lists.scss b/app/assets/stylesheets/lists.scss index 77c69048..692bb151 100644 --- a/app/assets/stylesheets/lists.scss +++ b/app/assets/stylesheets/lists.scss @@ -1,9 +1,11 @@ .content-list { @extend .unstyled; margin-left: 0; + li { margin-bottom: 1em; } + .description { font-size: 12px; line-height: $base-line-height * 0.7; @@ -17,10 +19,11 @@ ul.gui-thumbnails { li { margin-bottom: 2em; + img { display: block; - margin-bottom: 5px; padding: 3px; + margin-bottom: 5px; border: solid 1px $base-border-color; } } @@ -31,6 +34,7 @@ ul.gui-thumbnails { display: inline-block; width: 49%; } + li.masked { display: none; } @@ -38,23 +42,26 @@ ul.gui-thumbnails { ul.books-list { @extend .content-list; + li { @include clearfix; padding-left: 125px; + img { + float: left; width: 109px; - margin-left: -125px; margin-right: -125px; - float: left; + margin-left: -125px; border: solid 1px #b7b7b7; + &.creative-commons { - width: auto; - margin-left: 0; - margin-right: 0; + display: block; float: none; - border: none; + width: auto; margin-top: 2em; - display: block; + margin-right: 0; + margin-left: 0; + border: 0; } } } @@ -63,44 +70,52 @@ ul.books-list { ol#about-nav { @extend .unstyled; @include clearfix; + li { display: inline; float: left; + width: 80px; + height: 85px; + padding-right: 5px; margin-right: 7px; + &:last-child { margin-right: 0; } - width: 80px; - height: 85px; - padding-right: 5px; + a { + display: block; width: 60px; height: 80px; - display: block; - opacity: 0.9; - text-align: center; padding: 0 15px; font-size: 13px; line-height: 20px; + text-align: center; color: $font-color; - @include background-image-2x('/images/icons/nav-circles', 90px, 180px); + opacity: 0.9; + @include background-image-2x("/images/icons/nav-circles", 90px, 180px); + &.current { - @include background-image-2x('/images/icons/nav-circles', 90px, 180px, 0 -90px); + @include background-image-2x("/images/icons/nav-circles", 90px, 180px, 0 -90px); color: #fff; opacity: 1; } + &.one-line { - padding-top: 35px; height: 55px; + padding-top: 35px; } + &.two-line { - padding-top: 28px; height: 62px; + padding-top: 28px; } + &.three-line { - padding-top: 17px; height: 73px; + padding-top: 17px; } + &:hover { opacity: 1; } @@ -110,21 +125,25 @@ ol#about-nav { ul.related-material { @extend .unstyled; - font-size: 12px; margin-bottom: 3em; + font-size: 12px; + li { + min-height: 17px; + padding-left: 25px; margin-bottom: 1em; line-height: 1.5; - padding-left: 25px; - min-height: 17px; + &.reference { - @include background-image-2x('/images/icons/document-sm', 12px, 17px, 3px 0); + @include background-image-2x("/images/icons/document-sm", 12px, 17px, 3px 0); } + &.book { - @include background-image-2x('/images/icons/book-sm', 17px, 17px, 0 0); + @include background-image-2x("/images/icons/book-sm", 17px, 17px, 0 0); } + &.video { - @include background-image-2x('/images/icons/film-sm', 17px, 17px, 2px 0); + @include background-image-2x("/images/icons/film-sm", 17px, 17px, 2px 0); } } } @@ -132,20 +151,25 @@ ul.related-material { ul.stackoverflow { @extend .unstyled; font-size: 12px; + li { margin-bottom: 1em; } + a { display: block; line-height: 1.2; font-weight: bold; } + span { display: block; color: $light-font-color; + strong { color: darken($light-font-color, 10%); } + em { color: lighten($light-font-color, 20%); } @@ -154,10 +178,11 @@ ul.stackoverflow { table.binaries { td { - padding: 8px 20px 6px 0; position: relative; width: auto; + padding: 8px 20px 6px 0; } + a { font-weight: bold; border: solid 1px transparent; diff --git a/app/assets/stylesheets/man-pages.scss b/app/assets/stylesheets/man-pages.scss index 1f486b68..3f159e2f 100644 --- a/app/assets/stylesheets/man-pages.scss +++ b/app/assets/stylesheets/man-pages.scss @@ -1,11 +1,12 @@ .man-page { p { em { - color: $fixed-width-font-color; font-family: $fixed-width-font-family !important; - font-weight: bold; font-style: normal; + font-weight: bold; + color: $fixed-width-font-color; } + tt { @extend code; display: inline; @@ -14,16 +15,16 @@ } p.nutshell { - background-color: #e8e7dd; padding: 1em; + background-color: #e8e7dd; } .literalblock { .content pre tt { - background-color: #eee0b5; + display: block; padding: 2px; font-family: $fixed-width-font-family !important; - display: block; + background-color: #eee0b5; } margin-bottom: 15px; } @@ -35,18 +36,16 @@ // Man pages div.verseblock { pre.content { - background-color: #e8e7dd; padding: 1em; margin-bottom: 1em; - white-space: pre; - color: $fixed-width-font-color; font-family: $fixed-width-font-family !important; line-height: $fixed-width-line-height; - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ + color: $fixed-width-font-color; word-wrap: break-word; /* Internet Explorer 5.5+ */ + white-space: pre; + white-space: pre-wrap; /* css-3 */ + background-color: #e8e7dd; + em { font-weight: bold; font-style: normal; @@ -61,9 +60,10 @@ } .quoteblock { - margin-left: 1em; padding-left: 1em; + margin-left: 1em; border-left: 5px solid $base-border-color; + .content { .paragraph p { color: $light-font-color; @@ -74,18 +74,22 @@ .admonitionblock { table { margin-bottom: 1em; + td { padding: 0 1em; + .title { font-weight: bold; color: $orange; } + &:first-child { border-right: solid 2px $base-border-color; } } } } + #footer { color: $light-font-color; } diff --git a/app/assets/stylesheets/reference.scss b/app/assets/stylesheets/reference.scss index d31eccc0..b1cd5cec 100644 --- a/app/assets/stylesheets/reference.scss +++ b/app/assets/stylesheets/reference.scss @@ -1,87 +1,102 @@ .topics h3, .topics ul li { padding-left: 23px; } + h3.setup { - @include background-image-2x('/images/icons/setup-sm', 17px, 17px, 0 50%); + @include background-image-2x("/images/icons/setup-sm", 17px, 17px, 0 50%); } h3.projects { - @include background-image-2x('/images/icons/projects-sm', 17px, 13px, 0 50%); + @include background-image-2x("/images/icons/projects-sm", 17px, 13px, 0 50%); } h3.snapshotting { - @include background-image-2x('/images/icons/camera-sm', 17px, 12px, 0 50%); + @include background-image-2x("/images/icons/camera-sm", 17px, 12px, 0 50%); } h3.branching { - @include background-image-2x('/images/icons/branch-sm', 12px, 15px, 4px 50%); + @include background-image-2x("/images/icons/branch-sm", 12px, 15px, 4px 50%); } h3.sharing { - @include background-image-2x('/images/icons/sharing-sm', 14px, 14px, 2px 50%); + @include background-image-2x("/images/icons/sharing-sm", 14px, 14px, 2px 50%); } h3.inspection { - @include background-image-2x('/images/icons/inspection-sm', 14px, 14px, 1px 50%); + @include background-image-2x("/images/icons/inspection-sm", 14px, 14px, 1px 50%); } h3.patching { - @include background-image-2x('/images/icons/patching-sm', 18px, 11px, 1px 50%); + @include background-image-2x("/images/icons/patching-sm", 18px, 11px, 1px 50%); } h3.debugging { - @include background-image-2x('/images/icons/debugging-sm', 17px, 16px, 1px 50%); + @include background-image-2x("/images/icons/debugging-sm", 17px, 16px, 1px 50%); } h3.email { - @include background-image-2x('/images/icons/email-sm', 17px, 12px, 1px 50%); + @include background-image-2x("/images/icons/email-sm", 17px, 12px, 1px 50%); } h3.external { - @include background-image-2x('/images/icons/external-sm', 17px, 15px, 0 50%); + @include background-image-2x("/images/icons/external-sm", 17px, 15px, 0 50%); } h3.admin { - @include background-image-2x('/images/icons/admin-sm', 16px, 16px, 2px 50%); + @include background-image-2x("/images/icons/admin-sm", 16px, 16px, 2px 50%); } h3.server-admin { - @include background-image-2x('/images/icons/server-admin-sm', 15px, 15px, 2px 50%); + @include background-image-2x("/images/icons/server-admin-sm", 15px, 15px, 2px 50%); } h3.plumbing { - @include background-image-2x('/images/icons/plumbing-sm', 17px, 14px, 2px 50%); + @include background-image-2x("/images/icons/plumbing-sm", 17px, 14px, 2px 50%); } // ยง section sign anchor links #content { - h1>a.anchor,h2>a.anchor,h3>a.anchor,dt.hdlist1>a.anchor { + h1>a.anchor, + h2>a.anchor, + h3>a.anchor, + dt.hdlist1>a.anchor { position: absolute; + display: block; + width: 2em; margin-left: -1.5em; + font-weight: lighter; text-align: center; - display: block; visibility: hidden; - width: 2em; - font-weight: lighter } - h1>a.anchor:before,h2>a.anchor:before,h3>a.anchor:before,dt.hdlist1>a.anchor:before { - content:"\00A7"; - font-size:.9em; - display:block + + h1>a.anchor:before, + h2>a.anchor:before, + h3>a.anchor:before, + dt.hdlist1>a.anchor:before { + display: block; + font-size: 0.9em; + content: "\00A7"; } - h1:hover>a.anchor,h2:hover>a.anchor,h3:hover>a.anchor,dt.hdlist1:hover>a.anchor { + + h1:hover>a.anchor, + h2:hover>a.anchor, + h3:hover>a.anchor, + dt.hdlist1:hover>a.anchor { visibility:visible } } #reference-version { @extend .section-nav-container; + a { top: -5px; + &#reference-versions-trigger { float: left; margin-right: 6px; } + &#reference-topics-trigger { float: right; } @@ -89,31 +104,34 @@ h3.plumbing { } #previous-versions-dropdown { - padding-top: 6px; width: 330px; + padding-top: 6px; + header { padding: 0 12px; margin: 0; font-size: 12px; font-weight: normal; } + footer { - margin-top: 0; padding: 4px 12px; - background-color: #eae9e0; - font-weight: normal; + margin-top: 0; font-size: 11px; + font-weight: normal; color: $font-color; + background-color: #eae9e0; @include border-bottom-left-radius(3px); @include border-bottom-right-radius(3px); + input { + width: 70px; + padding: 1px 3px; font-size: 11px; - border: solid 1px #e2e0d8; - background-color: #f0efe8; color: $font-color; - width: 70px; + background-color: #f0efe8; + border: solid 1px #e2e0d8; @include border-radius(1px); - padding: 1px 3px; } } } @@ -124,29 +142,33 @@ h3.plumbing { } #topics-dropdown { + width: 650px; right: 12px; padding: 12px; - width: 650px; font-weight: normal; line-height: 1; + ul { margin-bottom: 10px; &:last-child { margin-bottom: 0; } } + li { - line-height: $base-line-height * .8; padding-left: 23px; + line-height: $base-line-height * 0.8; } + h3 { - font-size: 13px; min-height: 20px; padding-top: 4px; + padding-left: 23px; margin-bottom: 8px; + font-size: 13px; line-height: 15px; - padding-left: 23px; } + a { font-weight: normal; padding: 0; @@ -158,85 +180,97 @@ ol.reference-previous-versions { margin-top: 3px; margin-bottom: 0; border-top: dotted 1px #e3e3e1; + li { a { @include clearfix; - top: 0 ! important; + top: 0 !important; display: block; padding: 2px 12px; border-bottom: dotted 1px #e3e3e1; + &:hover { background-color: #edf7f8; } + &.more { font-size: 11px; } + span.version { float: left; min-width: 40px; } + span.diff { - padding-left: 12px; padding-right: 16px; + padding-left: 12px; + img { display: inline-block; margin-right: -1px; } } + em.date { float: right; margin-right: 150px; font-size: 11px; - color: $light-font-color; - font-weight: normal; font-style: normal; + font-weight: normal; + color: $light-font-color; } + &.more { - border-bottom: none; + border-bottom: 0; } } + &.no-change { @include clearfix; position: absolute; - right: 0px; - margin-top: -6px; - width: auto; + right: 0; z-index: 10; + width: auto; padding: 0; - font-weight: normal; + margin-top: -6px; font-size: 11px; + font-weight: normal; line-height: 1.2; color: $light-font-color; text-align: center; + span { float: left; - display: inline-block; + padding: 0 5px; @include border-top-left-radius(10px); @include border-bottom-left-radius(10px); font-size: 10px; font-style: italic; background-color: #f5f5f3; - padding: 0 5px; } } } } .callout.quickref { - @include background-image-2x('/images/icons/document', 15px, 21px, 14px 7px); - padding-left: 36px ! important; + @include background-image-2x("/images/icons/document", 15px, 21px, 14px 7px); + padding-left: 36px !important; + a { font-weight: bold; } } .callout.ref-manual { - @include background-image-2x('/images/icons/book', 54px, 72px, 24px 20px); - background-color: $callout-color; + @include background-image-2x("/images/icons/book", 54px, 72px, 24px 20px); padding: 20px 30px 20px 100px !important; + background-color: $callout-color; + h3 { font-size: 18px; } + p { font-size: 15px; line-height: 1.3em; @@ -244,10 +278,11 @@ ol.reference-previous-versions { } p.quickref { - @include background-image-2x('/images/icons/document', 15px, 21px, 0 0); + @include background-image-2x("/images/icons/document", 15px, 21px, 0 0); padding-left: 22px ! important; margin-top: -0.4em; margin-bottom: 1em; + a { font-weight: bold; } @@ -257,13 +292,14 @@ p.quickref { h3 { padding-left: 26px; } + ul { padding-left: 28px; } } #video-container { - background-color: $callout-color; - padding: 10px 10px 2px 10px; + padding: 10px 10px 2px; margin-bottom: 20px; + background-color: $callout-color; } diff --git a/app/assets/stylesheets/search.scss b/app/assets/stylesheets/search.scss index 009262a8..f6e7acdc 100644 --- a/app/assets/stylesheets/search.scss +++ b/app/assets/stylesheets/search.scss @@ -1,116 +1,129 @@ #search-results { - display: none; position: absolute; - z-index: 900; top: 2px; right: -8px; + z-index: 900; + display: none; width: 384px; - background: #398a94 url(/images/bg/search-header.jpg) 0 1px repeat-x; + background: #398a94 url("/images/bg/search-header.jpg") 0 1px repeat-x; @include border-radius(3px); @include box-shadow(0 0 7px rgba(0, 0, 0, 0.25)); border-bottom: solid 1px $base-border-color; + header { - text-indent: -9999px; height: 44px; - border: solid 1px #366769; padding: 0; margin: 0; + text-indent: -9999px; + border: solid 1px #366769; @include border-top-right-radius(3px); @include border-top-left-radius(3px); } + table { width: 100%; + line-height: 1; background-color: #fff; @include border-bottom-right-radius(3px); @include border-bottom-left-radius(3px); - line-height: 1; + td { border-top: solid 1px #cfddde; } + td.category { - font-size: 11px; - vertical-align: top; - text-align: right; width: 67px; padding: 10px 12px 0 0; + font-size: 11px; color: $blue; - opacity: 0.75; + text-align: right; + vertical-align: top; background-color: #f5fbfb; border-right: solid 1px #cfddde; + opacity: 0.75; } + td.matches { + padding: 0 !important; font-size: 12px; font-weight: bold; - padding: 0 ! important; + a { display: block; - color: $font-color; padding: 5px 12px; margin-bottom: 0; - -webkit-transition-duration: 0s; - -moz-transition-duration: 0s; + color: $font-color; transition-duration: 0s; + span.metadata { - line-height: 1; + display: block; margin-top: -3px; margin-bottom: 3px; - display: block; - color: $light-font-color; - font-weight: normal; font-size: 11px; + font-weight: normal; + line-height: 1; + color: $light-font-color; } - &:hover, &.highlight { + + &:hover, + &.highlight { color: #fff; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); background: #55bec4; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #55bec4), color-stop(100%, #54b2b7)); - background-image: -webkit-linear-gradient(#55bec4, #54b2b7); - background-image: -moz-linear-gradient(#55bec4, #54b2b7); background-image: linear-gradient(#55bec4, #54b2b7); + span { color: #fff; } } } } + ul { @extend .unstyled; margin-bottom: 0; } + tr.show-all td { border-top: none; } - } } ol.full-search-results { @extend .unstyled; + li { margin-bottom: 2em; + &:last-child { margin-bottom: 0; } } + h3 { line-height: 1.4; padding-bottom: 0; margin-bottom: 0; } + span.relevancy { float: right; padding-left: 5px; margin-left: 30px; + img { position: relative; top: -2px; } } + a.url { display: block; + margin-bottom: 0.4em; font-size: 12px; color: $light-font-color; - margin-bottom: 0.4em; + &:hover { color: darken($light-font-color, 25%); } @@ -118,6 +131,6 @@ ol.full-search-results { } .callout.top-matches { - padding-top: 1em ! important; - margin-bottom: 2em ! important; + padding-top: 1em !important; + margin-bottom: 2em !important; } diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss index 30fa05cf..ba0315b3 100644 --- a/app/assets/stylesheets/sidebar.scss +++ b/app/assets/stylesheets/sidebar.scss @@ -1,25 +1,27 @@ hr.sidebar { - border: none ! important; - height: 12px; width: 218px; - @include background-image-2x('/images/sidebar-divider', 218px, 12px); + height: 12px; margin-bottom: 2em; + border: 0 !important; + @include background-image-2x("/images/sidebar-divider", 218px, 12px); } aside.sidebar { - font-size: 13px ! important; + font-size: 13px !important; line-height: $base-line-height * 0.75; + p { - font-size: 13px ! important; + font-size: 13px !important; line-height: $base-line-height * 0.75; } .callout { - background-color: #ebe9e1; - background-color: rgba(223, 221, 213, .33); - @include border-radius(3px); padding: 20px; color: lighten($font-color, 20%); + background-color: #ebe9e1; + background-color: rgba(223, 221, 213, 0.33); + @include border-radius(3px); + p { margin-bottom: 0; } diff --git a/app/assets/stylesheets/typography.scss b/app/assets/stylesheets/typography.scss index cb7acb7d..61575b66 100644 --- a/app/assets/stylesheets/typography.scss +++ b/app/assets/stylesheets/typography.scss @@ -5,6 +5,7 @@ p { margin: 0 0 $base-line-height / 2; font-size: $base-font-size; line-height: $base-line-height; + small { font-size: $base-font-size - 2; color: $light-font-color; @@ -14,110 +15,132 @@ p { a { color: $link-color; text-decoration: none; - -webkit-transition-property: color; - -moz-transition-property: color; - transition-property: color; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; transition-duration: 0.3s; + transition-property: color; } - // HEADINGS // -------- -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { margin: 0; font-weight: normal; color: $font-color; text-rendering: optimizelegibility; // Fix the character spacing for headings + small { font-weight: normal; color: $light-font-color; } } + h1 { + margin-bottom: 0.4em; font-size: 36px; line-height: $base-line-height * 2; - margin-bottom: 0.4em; + small { font-size: 18px; } } + h2 { + margin-top: 20px; font-size: 18px; + font-weight: bold; line-height: $base-line-height * 2; color: $orange; - font-weight: bold; - margin-top: 20px; + small { font-size: 18px; } } + .callout h2:first-child { - margin-top: 0; + margin-top: 0; } + h3 { line-height: $base-line-height * 1.5; font-size: 16px; font-weight: bold; + small { font-size: 14px; } } -h4, h5, h6 { + +h4, +h5, +h6 { line-height: $base-line-height; } + h4 { font-size: 14px; font-weight: bold; + small { font-size: 12px; } } + aside h4 { + margin-bottom: 1em; color: $light-font-color; line-height: 1.4; - margin-bottom: 1em; } + h5 { font-size: 12px; } + h6 { font-size: 11px; color: $light-font-color; text-transform: uppercase; } - // LISTS // ----- // Unordered and Ordered lists -ul, ol { +ul, +ol { padding: 0; margin: 0 0 $base-line-height / 2 25px; } + ul ul, ul ol, ol ol, ol ul { margin-bottom: 0; } + ul { list-style: disc; } + ol { list-style: decimal; } + li { line-height: $base-line-height; } + ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } + ul.bullets li { padding-bottom: 10px; } @@ -126,25 +149,30 @@ ul.bullets li { dl { margin-bottom: $base-line-height; } + dt, dd { line-height: $base-line-height; } + dt { font-weight: bold; line-height: $base-line-height - 1; // fix jank Helvetica Neue font bug } + dd { margin-left: $base-line-height / 2; } + // Horizontal layout (like forms) .dl-horizontal { dt { float: left; - clear: left; width: 120px; + clear: left; text-align: right; } + dd { margin-left: 130px; } @@ -164,9 +192,11 @@ hr { strong { font-weight: bold; } + em { font-style: italic; } + .muted { color: $light-font-color; } @@ -176,6 +206,7 @@ abbr[title] { border-bottom: 1px dotted #ddd; cursor: help; } + abbr.initialism { font-size: 90%; text-transform: uppercase; @@ -186,13 +217,16 @@ blockquote { padding: 0 0 0 15px; margin: 0 0 $base-line-height; border-left: 5px solid $base-border-color; + p { margin-bottom: 0; } + small { display: block; line-height: $base-line-height; color: $light-font-color; + &:before { content: '\2014 \00A0'; } @@ -201,10 +235,11 @@ blockquote { // Float right with text-align: right &.pull-right { float: right; - padding-left: 0; padding-right: 15px; - border-left: 0; + padding-left: 0; border-right: 5px solid $base-border-color; + border-left: 0; + p, small { text-align: right; @@ -215,14 +250,14 @@ blockquote { code { @include border-radius(3px); display: block; - padding: 10px 15px 13px 15px; + padding: 10px 15px 13px; margin-bottom: 1em; - background-color: #fff; - border: solid 1px #efeee6; - color: $orange; + overflow: auto; font-family: $fixed-width-font-family; line-height: $fixed-width-line-height; - overflow: auto; + color: $orange; + background-color: #fff; + border: solid 1px #efeee6; } // Quotes @@ -237,8 +272,8 @@ blockquote:after { address { display: block; margin-bottom: $base-line-height; - line-height: $base-line-height; font-style: normal; + line-height: $base-line-height; } // Tables @@ -246,20 +281,25 @@ table { th { font-weight: bold; } + &.data { margin-bottom: 24px; - th, td { + + th, + td { padding: 2px 0; border-bottom: solid 1px lighten($base-border-color, 10%); } } + td.sweet { - color: #25b028; font-weight: bold; + color: #25b028; } + td.compare { - color: $orange; font-weight: bold; + color: $orange; } } @@ -267,57 +307,44 @@ table { .light { color: $light-font-color; } + small { font-size: 100%; } + cite { font-style: normal; } a.subtle-button { display: inline-block; + padding: 3px 20px; + font-size: 12px; + text-align: center; + background-image: linear-gradient(#f1f1e9, #eae9e1); border-top: solid 1px #dedcd4; - border-left: solid 1px #dedcd4; border-right: solid 1px #dedcd4; border-bottom: solid 1px #cdcbc4; - text-align: center; - font-size: 12px; - padding: 3px 20px; + border-left: solid 1px #dedcd4; @include border-radius(3px); - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f1f1e9), color-stop(100%, #eae9e1)); - background-image: -webkit-linear-gradient(#f1f1e9, #eae9e1); - background-image: -moz-linear-gradient(#f1f1e9, #eae9e1); - background-image: -o-linear-gradient(#f1f1e9, #eae9e1); - background-image: linear-gradient(#f1f1e9, #eae9e1); @include box-shadow(0 1px 0 #f1f1e9); - -webkit-transition-property: background-image; - -moz-transition-property: background-image; - transition-property: background-image; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; transition-duration: 0.3s; + transition-property: background-image; &:hover { color: $link-color; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #edede3), color-stop(100%, #e6e5db)); - background-image: -webkit-linear-gradient(#edede3, #e6e5db); - background-image: -moz-linear-gradient(#edede3, #e6e5db); - background-image: -o-linear-gradient(#edede3, #e6e5db); background-image: linear-gradient(#edede3, #e6e5db); } } a.subtle-button.selected { - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d7d7c1), color-stop(100%, #cbc9b4)); - background-image: -webkit-linear-gradient(#d7d7c1, #cbc9b4); - background-image: -moz-linear-gradient(#d7d7c1, #cbc9b4); - background-image: -o-linear-gradient(#d7d7c1, #cbc9b4); background-image: linear-gradient(#d7d7c1, #cbc9b4); } a#gui-os-filter { display: none; margin-top: 15px; + &.visible { display: inline-block; } |