Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git-scm.com.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Long <jlong@github.com>2018-01-17 04:12:28 +0300
committerJason Long <jlong@github.com>2018-01-17 04:12:28 +0300
commitb560dacf8839cce3165f36c4d21b8a849f91920e (patch)
tree9e951e811c7f94e3042c18b5d28781466f2c449d
parentee8b5cc1ab254ff2c1d4967617cce2ff26615aa0 (diff)
More basic lint fixes
-rw-r--r--app/assets/stylesheets/git-scm.scss8
-rw-r--r--app/assets/stylesheets/layout.scss145
2 files changed, 100 insertions, 53 deletions
diff --git a/app/assets/stylesheets/git-scm.scss b/app/assets/stylesheets/git-scm.scss
index f45c2d65..ff110454 100644
--- a/app/assets/stylesheets/git-scm.scss
+++ b/app/assets/stylesheets/git-scm.scss
@@ -17,18 +17,18 @@
code {
display: inline;
- padding: 0px 5px;
+ padding: 0 5px;
}
pre {
display: block;
padding: 10px 15px 13px;
margin-bottom: 1em;
+ overflow: auto;
+ font-family: $fixed-width-font-family;
+ line-height: 18px;
color: #f14e32;
background-color: #fff;
- font-family: Courier, monospace;
- line-height: 18px;
- overflow: auto
border: solid 1px #efeee6;
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;
}
}
}