Skip to content

G
gitlab-ce
Commit 43cd96e9 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Merge branch 'border-zero-scss' into 'master' 

Replace all instances of border: none to border: 0 for scss-lint

See merge request gitlab-org/gitlab-ee!3288
parents dde9cd12 163787c0
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 110 deletions
.scss-lint.yml
View file @ 43cd96e9
......@@ -14,7 +14,7 @@ linters:
# Whether or not to prefer `border: 0` over `border: none`.
BorderZero:
enabled: false
enabled: true
# Reports when you define a rule set using a selector with chained classes
# (a.k.a. adjoining classes).
......
app/assets/stylesheets/framework/avatar.scss
View file @ 43cd96e9
......@@ -59,11 +59,11 @@
&.avatar-tile {
border-radius: 0;
border: none;
border: 0;
}
&.avatar-placeholder {
border: none;
border: 0;
}
&:not([href]):hover {
......@@ -100,7 +100,7 @@
.avatar {
border-radius: 0;
border: none;
border: 0;
height: auto;
width: 100%;
margin: 0;
......
app/assets/stylesheets/framework/blocks.scss
View file @ 43cd96e9
......@@ -39,7 +39,7 @@
}
&.top-block {
border-top: none;
border-top: 0;
}
&.middle-block {
......@@ -59,7 +59,7 @@
&.footer-block {
margin-top: 0;
border-bottom: none;
border-bottom: 0;
margin-bottom: -$gl-padding;
}
......@@ -96,7 +96,7 @@
&.build-content {
background-color: $white-light;
border-top: none;
border-top: 0;
}
&.top-block .container-fluid {
......@@ -287,12 +287,12 @@
cursor: pointer;
color: $blue-300;
z-index: 1;
border: none;
border: 0;
background-color: transparent;
&:hover,
&:focus {
border: none;
border: 0;
color: $blue-400;
}
}
......
app/assets/stylesheets/framework/buttons.scss
View file @ 43cd96e9
......@@ -308,7 +308,7 @@
}
.btn-clipboard {
border: none;
border: 0;
padding: 0 5px;
}
......
app/assets/stylesheets/framework/common.scss
View file @ 43cd96e9
......@@ -28,7 +28,7 @@
pre {
&.clean {
background: none;
border: none;
border: 0;
margin: 0;
padding: 0;
}
......@@ -131,7 +131,7 @@ li.note {
img { max-width: 100%; }
.note-title {
li {
border-bottom: none !important;
border-bottom: 0 !important;
}
}
}
......@@ -176,7 +176,7 @@ li.note {
pre {
background: $white-light;
border: none;
border: 0;
font-size: 12px;
}
}
......@@ -385,7 +385,7 @@ table {
}
.hide-bottom-border {
border-bottom: none !important;
border-bottom: 0 !important;
}
.gl-accessibility {
......
app/assets/stylesheets/framework/files.scss
View file @ 43cd96e9
......@@ -142,7 +142,7 @@
*/
&.blame {
table {
border: none;
border: 0;
margin: 0;
}
......@@ -150,20 +150,20 @@
border-bottom: 1px solid $blame-border;
&:last-child {
border-bottom: none;
border-bottom: 0;
}
}
td {
border-top: none;
border-bottom: none;
border-top: 0;
border-bottom: 0;
&:first-child {
border-left: none;
border-left: 0;
}
&:last-child {
border-right: none;
border-right: 0;
}
}
......
app/assets/stylesheets/framework/filters.scss
View file @ 43cd96e9
......@@ -255,7 +255,7 @@
.clear-search {
width: 35px;
background-color: $white-light;
border: none;
border: 0;
outline: none;
z-index: 1;
......@@ -418,7 +418,7 @@
.droplab-dropdown .dropdown-menu .filter-dropdown-item {
.btn {
border: none;
border: 0;
width: 100%;
text-align: left;
padding: 8px 16px;
......
app/assets/stylesheets/framework/header.scss
View file @ 43cd96e9
......@@ -10,7 +10,7 @@
z-index: 1000;
margin-bottom: 0;
min-height: $header-height;
border: none;
border: 0;
border-bottom: 1px solid $border-color;
position: fixed;
top: 0;
......@@ -169,7 +169,7 @@
.navbar-collapse {
flex: 0 0 auto;
border-top: none;
border-top: 0;
padding: 0;
@media (max-width: $screen-xs-max) {
......
app/assets/stylesheets/framework/highlight.scss
View file @ 43cd96e9
.file-content.code {
border: none;
border: 0;
box-shadow: none;
margin: 0;
padding: 0;
......@@ -7,7 +7,7 @@
pre {
padding: 10px 0;
border: none;
border: 0;
border-radius: 0;
font-family: $monospace_font;
font-size: $code_font_size;
......
app/assets/stylesheets/framework/lists.scss
View file @ 43cd96e9
......@@ -42,7 +42,7 @@
}
&:last-child {
border-bottom: none;
border-bottom: 0;
&.bottom {
background: $gray-light;
......@@ -92,7 +92,7 @@ ul.unstyled-list {
}
ul.unstyled-list > li {
border-bottom: none;
border-bottom: 0;
}
// Generic content list
......@@ -184,7 +184,7 @@ ul.content-list {
// When dragging a list item
&.ui-sortable-helper {
border-bottom: none;
border-bottom: 0;
}
&.list-placeholder {
......@@ -301,7 +301,7 @@ ul.indent-list {
}
> .group-list-tree > .group-row.has-children:first-child {
border-top: none;
border-top: 0;
}
}
......@@ -419,7 +419,7 @@ ul.indent-list {
padding: 0;
&.has-children {
border-top: none;
border-top: 0;
}
&:first-child {
......
app/assets/stylesheets/framework/mixins.scss
View file @ 43cd96e9
......@@ -36,7 +36,7 @@
margin: 0;
&:last-child {
border-bottom: none;
border-bottom: 0;
}
&.active {
......
app/assets/stylesheets/framework/responsive_tables.scss
View file @ 43cd96e9
......@@ -24,7 +24,7 @@
@media (min-width: $screen-md-min) {
margin: 0;
padding: $gl-padding 0;
border: none;
border: 0;
&:not(:last-child) {
border-bottom: 1px solid $white-normal;
......
app/assets/stylesheets/framework/secondary-navigation-elements.scss
View file @ 43cd96e9
......@@ -63,7 +63,7 @@
.nav-links {
margin-bottom: 0;
border-bottom: none;
border-bottom: 0;
float: left;
&.wide {
......@@ -362,7 +362,7 @@
border-bottom: 1px solid $border-color;
.nav-links {
border-bottom: none;
border-bottom: 0;
}
}
}
......
app/assets/stylesheets/framework/selects.scss
View file @ 43cd96e9
......@@ -17,7 +17,7 @@
.select2-arrow {
background-image: none;
background-color: transparent;
border: none;
border: 0;
padding-top: 12px;
padding-right: 20px;
font-size: 10px;
......
app/assets/stylesheets/framework/sidebar.scss
View file @ 43cd96e9
......@@ -9,7 +9,7 @@
&.container-blank {
background: none;
padding: 0;
border: none;
border: 0;
}
}
}
......@@ -111,7 +111,7 @@
}
.block:last-of-type {
border: none;
border: 0;
}
}
......
app/assets/stylesheets/framework/tables.scss
View file @ 43cd96e9
......@@ -33,7 +33,7 @@ table {
th {
background-color: $gray-light;
font-weight: $gl-font-weight-normal;
border-bottom: none;
border-bottom: 0;
&.wide {
width: 55%;
......
app/assets/stylesheets/framework/timeline.scss
View file @ 43cd96e9
......@@ -21,7 +21,7 @@
}
&.text-file .diff-file {
border-bottom: none;
border-bottom: 0;
}
}
......@@ -66,5 +66,5 @@
.discussion .timeline-entry {
margin: 0;
border-right: none;
border-right: 0;
}
app/assets/stylesheets/framework/typography.scss
View file @ 43cd96e9
......@@ -167,7 +167,7 @@
&.plain-readme {
background: none;
border: none;
border: 0;
padding: 0;
margin: 0;
font-size: 14px;
......
app/assets/stylesheets/framework/zen.scss
View file @ 43cd96e9
......@@ -9,7 +9,7 @@
z-index: 1031;
textarea {
border: none;
border: 0;
box-shadow: none;
border-radius: 0;
color: $black;
......
app/assets/stylesheets/pages/builds.scss
View file @ 43cd96e9
......@@ -48,7 +48,7 @@
overflow-x: auto;
font-size: 12px;
border-radius: 0;
border: none;
border: 0;
.bash {
display: block;
......
app/assets/stylesheets/pages/ci_projects.scss
View file @ 43cd96e9
......@@ -36,7 +36,7 @@
pre.commit-message {
background: none;
padding: 0;
border: none;
border: 0;
margin: 20px 0;
border-radius: 0;
}
......
app/assets/stylesheets/pages/commits.scss
View file @ 43cd96e9
.commit-description {
background: none;
border: none;
border: 0;
padding: 0;
margin-top: 10px;
word-break: normal;
......@@ -251,7 +251,7 @@
word-break: normal;
pre {
border: none;
border: 0;
background: inherit;
padding: 0;
margin: 0;
......
app/assets/stylesheets/pages/cycle_analytics.scss
View file @ 43cd96e9
......@@ -75,7 +75,7 @@
.panel {
.content-block {
padding: 24px 0;
border-bottom: none;
border-bottom: 0;
position: relative;
@media (max-width: $screen-xs-max) {
......@@ -222,11 +222,11 @@
}
&:first-child {
border-top: none;
border-top: 0;
}
&:last-child {
border-bottom: none;
border-bottom: 0;
}
.stage-nav-item-cell {
......@@ -290,7 +290,7 @@
border-bottom: 1px solid $gray-darker;
&:last-child {
border-bottom: none;
border-bottom: 0;
margin-bottom: 0;
}
......
app/assets/stylesheets/pages/diff.scss
View file @ 43cd96e9
......@@ -47,7 +47,7 @@
table {
width: 100%;
font-family: $monospace_font;
border: none;
border: 0;
border-collapse: separate;
margin: 0;
padding: 0;
......@@ -105,7 +105,7 @@
.new_line {
@include user-select(none);
margin: 0;
border: none;
border: 0;
padding: 0 5px;
border-right: 1px solid;
text-align: right;
......@@ -133,7 +133,7 @@
display: block;
margin: 0;
padding: 0 1.5em;
border: none;
border: 0;
position: relative;
&.parallel {
......@@ -359,7 +359,7 @@
cursor: pointer;
&:first-child {
border-left: none;
border-left: 0;
}
&:hover {
......@@ -384,7 +384,7 @@
.file-content .diff-file {
margin: 0;
border: none;
border: 0;
}
.diff-file .line_content {
......@@ -400,7 +400,7 @@
}
.files-changed {
border-bottom: none;
border-bottom: 0;
}
.diff-stats-summary-toggler {
......
app/assets/stylesheets/pages/editor.scss
View file @ 43cd96e9
......@@ -3,13 +3,13 @@
border-top: 1px solid $border-color;
border-right: 1px solid $border-color;
border-left: 1px solid $border-color;
border-bottom: none;
border-bottom: 0;
border-radius: $border-radius-small $border-radius-small 0 0;
background: $gray-normal;
}
#editor {
border: none;
border: 0;
border-radius: 0;
height: 500px;
margin: 0;
......@@ -171,7 +171,7 @@
width: 100%;
margin: 5px 0;
padding: 0;
border-left: none;
border-left: 0;
}
}
......
app/assets/stylesheets/pages/environments.scss
View file @ 43cd96e9
......@@ -117,7 +117,7 @@
}
.no-btn {
border: none;
border: 0;
background: none;
outline: none;
width: 100%;
......@@ -293,11 +293,11 @@
}
.folder-row {
border-left: none;
border-right: none;
border-left: 0;
border-right: 0;
@media (min-width: $screen-sm-max) {
border-top: none;
border-top: 0;
}
}
......
app/assets/stylesheets/pages/events.scss
View file @ 43cd96e9
......@@ -85,7 +85,7 @@
}
pre {
border: none;
border: 0;
background: $gray-light;
border-radius: 0;
color: $events-pre-color;
......@@ -128,14 +128,14 @@
}
}
&:last-child { border: none; }
&:last-child { border: 0; }
.event_commits {
li {
&.commit {
background: transparent;
padding: 0;
border: none;
border: 0;
.commit-row-title {
font-size: $gl-font-size;
......
app/assets/stylesheets/pages/groups.scss
View file @ 43cd96e9
......@@ -217,7 +217,7 @@
margin-top: $gl-padding;
.pipeline-quota {
border-top: none;
border-top: 0;
}
}
......
app/assets/stylesheets/pages/issuable.scss
View file @ 43cd96e9
......@@ -79,7 +79,7 @@
.title {
padding: 0;
margin-bottom: 16px;
border-bottom: none;
border-bottom: 0;
}
.btn-edit {
......@@ -155,7 +155,7 @@
}
&:last-child {
border: none;
border: 0;
}
span {
......@@ -340,7 +340,7 @@
.block {
width: $gutter_collapsed_width - 2px;
padding: 15px 0 0;
border-bottom: none;
border-bottom: 0;
overflow: hidden;
}
......@@ -401,7 +401,7 @@
}
.btn-clipboard {
border: none;
border: 0;
color: $issuable-sidebar-color;
&:hover {
......
app/assets/stylesheets/pages/login.scss
View file @ 43cd96e9
......@@ -115,7 +115,7 @@
border-left: 1px solid $border-color;
&:first-of-type {
border-left: none;
border-left: 0;
border-top-left-radius: $border-radius-default;
}
......@@ -141,7 +141,7 @@
border-bottom: 1px solid $border-color;
a {
border: none;
border: 0;
border-bottom: 2px solid $link-underline-blue;
margin-right: 0;
color: $black;
......
app/assets/stylesheets/pages/merge_conflicts.scss
View file @ 43cd96e9
......@@ -262,7 +262,7 @@ $colors: (
.editor {
pre {
height: 350px;
border: none;
border: 0;
border-radius: 0;
margin-bottom: 0;
}
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 43cd96e9
......@@ -733,7 +733,7 @@
}
.unapprove-btn {
border: none;
border: 0;
background: transparent;
cursor: pointer;
......
app/assets/stylesheets/pages/note_form.scss
View file @ 43cd96e9
......@@ -16,7 +16,7 @@
.discussion {
.new-note {
margin: 0;
border: none;
border: 0;
}
}
......@@ -106,7 +106,7 @@
background-color: $orange-100;
border-radius: $border-radius-default $border-radius-default 0 0;
border: 1px solid $border-gray-normal;
border-bottom: none;
border-bottom: 0;
padding: 3px 12px;
margin: auto;
align-items: center;
......@@ -117,7 +117,7 @@
}
.disabled-comment .issuable-note-warning {
border: none;
border: 0;
border-radius: $label-border-radius;
padding-top: $gl-vert-padding;
padding-bottom: $gl-vert-padding;
......
app/assets/stylesheets/pages/notes.scss
View file @ 43cd96e9
......@@ -317,7 +317,7 @@ ul.notes {
td {
border: 1px solid $white-normal;
border-left: none;
border-left: 0;
&.notes_line {
vertical-align: middle;
......@@ -657,7 +657,7 @@ ul.notes {
.timeline-entry-inner {
padding-left: $gl-padding;
padding-right: $gl-padding;
border-bottom: none;
border-bottom: 0;
}
}
}
......@@ -678,7 +678,7 @@ ul.notes {
padding: 90px 0;
&.discussion-locked {
border: none;
border: 0;
background-color: $white-light;
}
......@@ -758,7 +758,7 @@ ul.notes {
top: 0;
padding: 0;
background-color: transparent;
border: none;
border: 0;
outline: 0;
color: $gray-darkest;
transition: color $general-hover-transition-duration $general-hover-transition-curve;
......
app/assets/stylesheets/pages/pipelines.scss
View file @ 43cd96e9
......@@ -288,7 +288,7 @@
&::after {
content: '';
width: 0;
border: none;
border: 0;
}
}
}
......@@ -304,7 +304,7 @@
.pipeline-actions {
@include new-style-dropdown;
border-bottom: none;
border-bottom: 0;
}
.tab-pane {
......@@ -334,7 +334,7 @@
}
.build-log {
border: none;
border: 0;
line-height: initial;
}
}
......@@ -395,13 +395,13 @@
// Remove right connecting horizontal line from first build in last stage
&:first-child {
&::after {
border: none;
border: 0;
}
}
// Remove right curved connectors from all builds in last stage
&:not(:first-child) {
&::after {
border: none;
border: 0;
}
}
// Remove opposite curve
......@@ -419,7 +419,7 @@
// Remove left curved connectors from all builds in first stage
&:not(:first-child) {
&::before {
border: none;
border: 0;
}
}
// Remove opposite curve
......@@ -528,7 +528,7 @@
.dropdown-menu-toggle {
background-color: transparent;
border: none;
border: 0;
padding: 0;
&:focus {
......@@ -963,7 +963,7 @@ a.linked-pipeline-mini-item {
.terminal-container {
.content-block {
border-bottom: none;
border-bottom: 0;
}
#terminal {
......@@ -981,7 +981,7 @@ a.linked-pipeline-mini-item {
* Play button with icon in dropdowns
*/
.ci-table .no-btn {
border: none;
border: 0;
background: none;
outline: none;
width: 100%;
......
app/assets/stylesheets/pages/profile.scss
View file @ 43cd96e9
......@@ -113,7 +113,7 @@
li {
padding: 3px 0;
border: none;
border: 0;
}
}
......
app/assets/stylesheets/pages/projects.scss
View file @ 43cd96e9
......@@ -88,7 +88,7 @@
.project-feature-settings {
background: $gray-lighter;
border-top: none;
border-top: 0;
margin-bottom: 16px;
}
......@@ -135,7 +135,7 @@
.project-feature-toggle {
position: relative;
border: none;
border: 0;
outline: 0;
display: block;
width: 100px;
......@@ -490,7 +490,7 @@ a.deploy-project-label {
flex: 1;
padding: 0;
background: transparent;
border: none;
border: 0;
line-height: 34px;
margin: 0;
......@@ -1030,7 +1030,7 @@ a.allowed-to-push {
margin: 0;
border-radius: 0 0 1px 1px;
padding: 20px 0;
border: none;
border: 0;
}
.table-bordered {
......@@ -1213,7 +1213,7 @@ a.allowed-to-push {
table-layout: fixed;
&.table-responsive {
border: none;
border: 0;
}
.variable-key {
......
app/assets/stylesheets/pages/promotions.scss
View file @ 43cd96e9
......@@ -54,7 +54,7 @@
}
.bordered-box.content-block {
border: none;
border: 0;
padding: 20px 0;
justify-content: left;
......@@ -76,7 +76,7 @@
}
.modal-header {
border-bottom: none;
border-bottom: 0;
}
.modal-body {
......@@ -85,7 +85,7 @@
}
.modal-footer {
border-top: none;
border-top: 0;
}
}
......@@ -139,7 +139,7 @@
margin: 0 -25px;
padding: 0;
overflow: initial;
border-bottom: none;
border-bottom: 0;
}
.btn {
......
app/assets/stylesheets/pages/repo.scss
View file @ 43cd96e9
......@@ -64,7 +64,7 @@
.monaco-editor.vs {
.current-line {
border: none;
border: 0;
background: $well-light-border;
}
......@@ -139,7 +139,7 @@
&.active {
background: $white-light;
border-bottom: none;
border-bottom: 0;
}
a {
......@@ -181,7 +181,7 @@
&.tabs-divider {
width: 100%;
background-color: $white-light;
border-right: none;
border-right: 0;
border-top-right-radius: 2px;
}
}
......
app/assets/stylesheets/pages/search.scss
View file @ 43cd96e9
......@@ -5,7 +5,7 @@
margin-bottom: $gl-padding;
&:last-child {
border-bottom: none;
border-bottom: 0;
}
}
......@@ -57,7 +57,7 @@ input[type="checkbox"]:hover {
}
.search-input {
border: none;
border: 0;
font-size: 14px;
padding: 0 20px 0 0;
margin-left: 5px;
......
app/assets/stylesheets/pages/todos.scss
View file @ 43cd96e9
......@@ -141,7 +141,7 @@
}
pre {
border: none;
border: 0;
background: $gray-light;
border-radius: 0;
color: $todo-body-pre-color;
......
app/assets/stylesheets/pages/tree.scss
View file @ 43cd96e9
......@@ -252,7 +252,7 @@
margin-top: 20px;
padding: 0;
border-top: 1px solid $white-dark;
border-bottom: none;
border-bottom: 0;
}
.commit-stats li {
......
app/views/admin/background_jobs/show.html.haml
View file @ 43cd96e9
......@@ -42,4 +42,4 @@
.panel.panel-default
%iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: none" }
%iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" }
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