Skip to content

G
gitlab-ce
Commit 6c0eea63 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett
Browse files
Options

Fix scss_lint offenses in repo, variables and layout sheets

parent c42aa99b
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 184 deletions
app/assets/stylesheets/framework/layout.scss
View file @ 6c0eea63
...@@ -120,9 +120,10 @@ of the body element here, we negate cascading side effects but allow momentum sc ...@@ -120,9 +120,10 @@ of the body element here, we negate cascading side effects but allow momentum sc
.page-with-sidebar { .page-with-sidebar {
-webkit-overflow-scrolling: auto; -webkit-overflow-scrolling: auto;
} }
.truncate { .truncate {
width: 250px; width: 250px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
\ No newline at end of file
app/assets/stylesheets/framework/variables.scss
View file @ 6c0eea63
...@@ -587,3 +587,10 @@ Convdev Index ...@@ -587,3 +587,10 @@ Convdev Index
$color-high-score: $green-400; $color-high-score: $green-400;
$color-average-score: $orange-400; $color-average-score: $orange-400;
$color-low-score: $red-400; $color-low-score: $red-400;
/*
Repo editor
*/
$repo-editor-grey: #f6f7f9;
$repo-editor-grey-darker: #e9ebee;
$repo-editor-linear-gradient: linear-gradient(to right, $repo-editor-grey 0%, $repo-editor-grey-darker, 20%, $repo-editor-grey 40%, $repo-editor-grey 100%);
app/assets/stylesheets/pages/repo.scss
View file @ 6c0eea63
...@@ -2,12 +2,14 @@ ...@@ -2,12 +2,14 @@
display: none; display: none;
} }
.fade-enter-active, .fade-leave-active { .fade-enter-active,
transition: opacity .5s .fade-leave-active {
transition: opacity .5s;
} }
.fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ { .fade-enter,
opacity: 0 .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
opacity: 0;
} }
.commit-message { .commit-message {
...@@ -19,210 +21,216 @@ ...@@ -19,210 +21,216 @@
border-radius: $border-radius-default; border-radius: $border-radius-default;
color: $almost-black; color: $almost-black;
header { header {
background: $gray-light; background: $gray-light;
padding: 10px 15px; padding: 10px 15px;
} }
.panel-right{ .panel-right {
display: inline-block; display: inline-block;
width: 85%; width: 85%;
.monaco-editor.vs {
.line-numbers{
cursor: pointer;
&:hover { .monaco-editor.vs {
text-decoration: underline; .line-numbers {
cursor: pointer;
&:hover {
text-decoration: underline;
}
} }
}
.cursor {
background: rgba(255,255,255,0);
border-color: rgba(255,255,255,0);
}
}
&.edit-mode {
.monaco-editor.vs {
.cursor { .cursor {
background: #000; background: $black;
border-color: #000; border-color: $black;
} }
} }
}
#tabs { &.edit-mode {
height: 41px; .monaco-editor.vs {
border-bottom: 1px solid $white-normal; .cursor {
padding-left: 0; background: $black;
margin-bottom: 0; border-color: $black;
display: inline-block; }
white-space: nowrap; }
width: 100%; }
overflow-y: none;
overflow-x: scroll;
li { #tabs {
-webkit-animation: fadein 0.5s; height: 41px;
list-style-type: none; border-bottom: 1px solid $white-normal;
background: $gray-normal; padding-left: 0;
margin-bottom: 0;
display: inline-block; display: inline-block;
padding: 10px 18px;
border-right: 1px solid $border-color;
white-space: nowrap; white-space: nowrap;
width: 100%;
overflow-y: none;
overflow-x: scroll;
li {
animation: fadein 0.5s;
list-style-type: none;
background: $gray-normal;
display: inline-block;
padding: 10px 18px;
border-right: 1px solid $border-color;
white-space: nowrap;
&.active { &.active {
background: $white-light; background: $white-light;
} }
a {
color: $black;
}
a { i.fa.fa-times,
color: black; i.fa.fa-circle {
float: right;
margin-top: 3px;
margin-left: 15px;
color: $gray-darkest;
}
} }
}
#ide {
height: 70vh;
}
#repo-file-buttons {
background: $gray-light;
padding: 5px;
margin-top: -5px;
border-bottom: 1px solid $white-normal;
}
#binary-viewer {
height: 70vh;
overflow: auto;
margin-top: 5px;
margin-left: 10px;
i.fa.fa-times, i.fa.fa-circle { .blob-viewer {
float: right; padding-top: 20px;
margin-top: 3px; padding-left: 20px;
margin-left: 15px;
color: $gray-darkest;
} }
} }
} }
#ide {
height: 70vh;
}
#repo-file-buttons { #commit-area {
background: $gray-light; background: $gray-light;
padding: 5px; padding: 20px;
margin-top: -5px; }
#view-toggler {
height: 41px;
position: relative;
display: block;
border-bottom: 1px solid $white-normal; border-bottom: 1px solid $white-normal;
background: $white-light;
margin-top: -5px;
} }
#binary-viewer { #binary-viewer {
height: 70vh; img {
overflow: auto; max-width: 100%;
margin-top: 5px;
margin-left: 10px;
.blob-viewer {
padding-top: 20px;
padding-left: 20px;
} }
} }
}
#commit-area { #sidebar {
background: $gray-light;
padding: 20px;
}
#view-toggler { &.sidebar-mini {
height: 41px; display: inline-block;
position: relative; vertical-align: top;
display: block; width: 15%;
border-bottom: 1px solid $white-normal; border-right: 1px solid $white-normal;
background: white; height: 80vh;
margin-top: -5px; overflow: auto;
} }
#binary-viewer { tr {
img { animation: fadein 0.5s;
max-width: 100%;
}
}
#sidebar { &.repo-file-options td {
padding: 0;
border-top: none;
background: $gray-light;
width: 190px;
display: inline-block;
&.sidebar-mini { &:hover {
display: inline-block; .title {
vertical-align: top; width: 105px;
width: 15%; }
border-right: 1px solid $white-normal;
height: 80vh;
overflow: auto;
}
tr { ul {
-webkit-animation: fadein 0.5s; display: inline-block;
&.repo-file-options td { }
padding: 0;
border-top: none; }
background: $gray-light;
width: 190px;
display: inline-block;
border-top: none;
&:hover {
.title { .title {
width: 105px; display: inline-block;
font-size: 10px;
text-transform: uppercase;
font-weight: bold;
color: $gray-darkest;
width: 185px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;
padding: 2px 16px;
} }
ul { ul {
display: inline-block; display: none;
float: right;
margin: 0 10px 0 0;
padding: 1px 0;
li {
display: inline-block;
padding: 0 2px;
border-bottom: none;
}
} }
}
.title {
display: inline-block;
font-size: 10px;
text-transform: uppercase;
font-weight: bold;
color: $gray-darkest;
width: 185px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;
padding: 2px 16px;
} }
ul {
display: none;
float: right;
margin: 0 10px 0 0;
padding: 1px 0;
li { .fa {
display: inline-block; margin-right: 5px;
padding: 0px 2px;
border-bottom: none;
}
} }
} }
.fa {
margin-right: 5px; a {
color: $almost-black;
display: inline-block;
vertical-align: middle;
} }
}
a { ul {
color: $almost-black; list-style-type: none;
display: inline-block; padding: 0;
vertical-align: middle;
}
ul { li {
list-style-type: none; border-bottom: 1px solid $border-gray-normal;
padding: 0; padding: 10px 20px;
li { a {
border-bottom: 1px solid $border-gray-normal; color: $almost-black;
padding: 10px 20px; }
a { .fa {
color: $almost-black; font-size: $code_font_size;
} margin-right: 5px;
.fa { }
font-size: $code_font_size;
margin-right: 5px;
} }
} }
} }
}
} }
.animation-container { .animation-container {
background: #f6f7f9; background: $repo-editor-grey;
height: 40px; height: 40px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
...@@ -230,14 +238,14 @@ header { ...@@ -230,14 +238,14 @@ header {
&.animation-container-small { &.animation-container-small {
height: 12px; height: 12px;
} }
&::before { &::before {
-webkit-animation-duration: 1s; animation-duration: 1s;
-webkit-animation-fill-mode: forwards; animation-fill-mode: forwards;
-webkit-animation-iteration-count: infinite; animation-iteration-count: infinite;
-webkit-animation-name: blockTextShine; animation-name: blockTextShine;
-webkit-animation-timing-function: linear; animation-timing-function: linear;
background-image: linear-gradient(to right, #f6f7f9 0%, #e9ebee 20%, #f6f7f9 40%, #f6f7f9 100%); background-image: $repo-editor-linear-gradient;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 800px 45px; background-size: 800px 45px;
content: ' '; content: ' ';
...@@ -245,42 +253,42 @@ header { ...@@ -245,42 +253,42 @@ header {
height: 100%; height: 100%;
position: relative; position: relative;
} }
div { div {
background: #fff; background: $white-light;
height: 6px; height: 6px;
left: 0; left: 0;
position: absolute; position: absolute;
right: 0 right: 0;
} }
.line-of-code-1 { .line-of-code-1 {
left: 0; left: 0;
top: 8px; top: 8px;
} }
.line-of-code-2 { .line-of-code-2 {
left: 150px; left: 150px;
top: 0px; top: 0;
height: 10px; height: 10px;
} }
.line-of-code-3 { .line-of-code-3 {
left: 0; left: 0;
top: 23px; top: 23px;
} }
.line-of-code-4 { .line-of-code-4 {
left: 0; left: 0;
top: 38px; top: 38px;
} }
.line-of-code-5 { .line-of-code-5 {
left: 200px; left: 200px;
top: 28px; top: 28px;
height: 10px; height: 10px;
} }
.line-of-code-6 { .line-of-code-6 {
top: 14px; top: 14px;
left: 230px; left: 230px;
...@@ -288,16 +296,22 @@ header { ...@@ -288,16 +296,22 @@ header {
} }
} }
@-webkit-keyframes blockTextShine { @keyframes blockTextShine {
0% { 0% {
transform: translateX(-468px) transform: translateX(-468px);
} }
100% {
transform: translateX(468px) 100% {
} transform: translateX(468px);
}
} }
@-webkit-keyframes fadein { @keyframes fadein {
from { opacity: 0; } from {
to { opacity: 1; } opacity: 0;
} }
\ No newline at end of file
to {
opacity: 1;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7