diff options
author | Jason Long <jlong@github.com> | 2018-01-17 04:44:06 +0300 |
---|---|---|
committer | Jason Long <jlong@github.com> | 2018-01-17 04:44:06 +0300 |
commit | 57f302323641ec0df02f8b72d53a8cd876322dde (patch) | |
tree | 0c71162ac3563213032b6de8623b92c233153073 | |
parent | f4df954d387dbc8c0624773c80dac1f43200ed0f (diff) |
And even more basic lint fixes
-rw-r--r-- | app/assets/stylesheets/downloads.scss | 52 | ||||
-rw-r--r-- | app/assets/stylesheets/front-page.scss | 205 | ||||
-rw-r--r-- | app/assets/stylesheets/search.scss | 65 |
3 files changed, 184 insertions, 138 deletions
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/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/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; } |