diff options
Diffstat (limited to 'app/assets/stylesheets/pages')
19 files changed, 124 insertions, 169 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index b3c5c693824..024c0230ee4 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -90,20 +90,14 @@ } .with-performance-bar & { - height: calc( - 100vh - #{$issue-board-list-difference-xs} - #{$performance-bar-height} - ); + height: calc(100vh - #{$issue-board-list-difference-xs} - #{$performance-bar-height}); @include media-breakpoint-only(sm) { - height: calc( - 100vh - #{$issue-board-list-difference-sm} - #{$performance-bar-height} - ); + height: calc(100vh - #{$issue-board-list-difference-sm} - #{$performance-bar-height}); } @include media-breakpoint-up(md) { - height: calc( - 100vh - #{$issue-board-list-difference-md} - #{$performance-bar-height} - ); + height: calc(100vh - #{$issue-board-list-difference-md} - #{$performance-bar-height}); } } } @@ -475,8 +469,7 @@ .right-sidebar.right-sidebar-expanded { &.boards-sidebar-slide-enter-active, &.boards-sidebar-slide-leave-active { - transition: width $sidebar-transition-duration, - padding $sidebar-transition-duration; + transition: width $sidebar-transition-duration, padding $sidebar-transition-duration; } &.boards-sidebar-slide-enter, diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 11966931a6c..670e320dbc2 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -342,11 +342,11 @@ } &.invalid { - @include status-color($gray-dark, color("gray"), $gray-darkest); + @include status-color($gray-dark, color('gray'), $gray-darkest); border-color: $gray-darkest; &:not(span):hover { - color: color("gray"); + color: color('gray'); } } } diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index f0228768b5a..5af0f1f0973 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -41,7 +41,6 @@ width: 20%; } - .fa { color: $cycle-analytics-light-gray; @@ -330,7 +329,6 @@ // Custom Styles for stage items .item-build-component { - .item-title { .icon-build-status { float: left; diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index 04570c057d1..fcc9f41532d 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -60,7 +60,7 @@ max-width: 420px; float: left; - @media(max-width: map-get($grid-breakpoints, lg)-1) { + @media (max-width: map-get($grid-breakpoints, lg)-1) { width: 180px; } } @@ -105,7 +105,6 @@ } } - @include media-breakpoint-down(sm) { .file-editor { .file-title { @@ -150,7 +149,7 @@ vertical-align: top; display: inline-block; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; margin: 19px 0 12px; } @@ -163,7 +162,7 @@ padding: 0 0 0 14px; border-left: 1px solid $border-color; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; width: 100%; margin: 5px 0; @@ -178,7 +177,7 @@ margin-top: 6px; line-height: 21px; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; margin: 5px 0; } @@ -190,7 +189,7 @@ vertical-align: top; margin: 5px 0 0 8px; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; width: 100%; margin: 0 0 16px; @@ -206,7 +205,7 @@ font-family: $regular_font; margin-top: -5px; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; width: 100%; margin: 5px 0; @@ -220,13 +219,12 @@ width: 250px; vertical-align: top; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; width: 100%; margin: 5px 0; } } - } } @@ -234,7 +232,7 @@ display: inline-block; margin: 7px 0 0 10px; - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { display: block; width: 100%; margin: 20px 0; diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 79984c1a546..b94a413aa6b 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -365,7 +365,7 @@ } .arrow-shadow { - content: ""; + content: ''; position: absolute; width: 7px; height: 7px; diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index a91d44805ee..5ef14ac9db9 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -127,7 +127,9 @@ } } - &:last-child { border: 0; } + &:last-child { + border: 0; + } .event_commits { li { diff --git a/app/assets/stylesheets/pages/graph.scss b/app/assets/stylesheets/pages/graph.scss index 4fb1a956fab..9467e7fe691 100644 --- a/app/assets/stylesheets/pages/graph.scss +++ b/app/assets/stylesheets/pages/graph.scss @@ -80,9 +80,15 @@ } @keyframes flickerAnimation { - 0% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 1; } + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } } .animate-flicker { diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss index 2c23f31c240..161d4dbfb22 100644 --- a/app/assets/stylesheets/pages/help.scss +++ b/app/assets/stylesheets/pages/help.scss @@ -30,7 +30,7 @@ .key { @extend .badge.badge-pill; background-color: $label-inverse-bg; - font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; + font: 11px Consolas, 'Liberation Mono', Menlo, Courier, monospace; padding: 3px 5px; } } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 62a9f97caa9..178b6155345 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -144,11 +144,9 @@ color: $blue-800; .avatar { - border-color: rgba($gray-normal, .2); + border-color: rgba($gray-normal, 0.2); } - } - } .btn-link { @@ -231,7 +229,7 @@ } a.edit-link:not([href]):hover { - color: rgba($gray-normal, .2); + color: rgba($gray-normal, 0.2); } .lock-edit, // uses same style, different js behaviour @@ -560,7 +558,6 @@ @include dropdown-item-hover; } } - } } @@ -607,7 +604,6 @@ margin: -7px; } - .user-list { display: flex; flex-wrap: wrap; @@ -720,7 +716,6 @@ .issuable-list { li { - .issue-box { display: -webkit-flex; display: flex; @@ -789,7 +784,7 @@ } } - @media(max-width: map-get($grid-breakpoints, lg)-1) { + @media (max-width: map-get($grid-breakpoints, lg)-1) { .task-status, .issuable-due-date, .project-ref-path { @@ -816,9 +811,7 @@ padding-bottom: 0; border-bottom: 0; - .sidebar-collapsed-icon { - > .stopwatch-svg { display: inline-block; } @@ -876,11 +869,11 @@ } .help-state-toggle-enter-active { - transition: all .8s ease; + transition: all 0.8s ease; } .help-state-toggle-leave-active { - transition: all .5s ease; + transition: all 0.5s ease; } .help-state-toggle-enter, diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index fa0ab1a3bae..0425739c82a 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -139,7 +139,7 @@ // 3 LDAP servers configured (in addition to standard login) and they are not using especially long names for any // of them. If either condition is false, this will work as expected. If both are true, there may be a missing border // above one of the bottom row elements. If you know a better way, please implement it! - &:nth-child(n+5) { + &:nth-child(n + 5) { border-top: 1px solid $border-color; } } @@ -189,7 +189,7 @@ margin-top: 16px; } - input[type="submit"] { + input[type='submit'] { @extend .btn-block; margin-bottom: 0; } diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index d26659701e1..603c97d85ed 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -1,100 +1,76 @@ // Disabled to use the color map for creating color schemes // scss-lint:disable ColorVariable $colors: ( - white-header-head-neutral : #e1fad7, - white-line-head-neutral : #effdec, - white-button-head-neutral : #9adb84, - - white-header-head-chosen : #baf0a8, - white-line-head-chosen : #e1fad7, - white-button-head-chosen : #52c22d, - - white-header-origin-neutral : #e0f0ff, - white-line-origin-neutral : #f2f9ff, - white-button-origin-neutral : #87c2fa, - - white-header-origin-chosen : #add8ff, - white-line-origin-chosen : #e0f0ff, - white-button-origin-chosen : #268ced, - - white-header-not-chosen : #f0f0f0, - white-line-not-chosen : $gray-light, - - dark-header-head-neutral : rgba(#3f3, .2), - dark-line-head-neutral : rgba(#3f3, .1), - dark-button-head-neutral : #40874f, - - dark-header-head-chosen : rgba(#3f3, .33), - dark-line-head-chosen : rgba(#3f3, .2), - dark-button-head-chosen : #258537, - - dark-header-origin-neutral : rgba(#2878c9, .4), - dark-line-origin-neutral : rgba(#2878c9, .3), - dark-button-origin-neutral : #2a5c8c, - - dark-header-origin-chosen : rgba(#2878c9, .6), - dark-line-origin-chosen : rgba(#2878c9, .4), - dark-button-origin-chosen : #1d6cbf, - - dark-header-not-chosen : rgba(#fff, .25), - dark-line-not-chosen : rgba(#fff, .1), - - monokai-header-head-neutral : rgba(#a6e22e, .25), - monokai-line-head-neutral : rgba(#a6e22e, .1), - monokai-button-head-neutral : #376b20, - - monokai-header-head-chosen : rgba(#a6e22e, .4), - monokai-line-head-chosen : rgba(#a6e22e, .25), - monokai-button-head-chosen : #39800d, - - monokai-header-origin-neutral : rgba(#60d9f1, .35), - monokai-line-origin-neutral : rgba(#60d9f1, .15), - monokai-button-origin-neutral : #38848c, - - monokai-header-origin-chosen : rgba(#60d9f1, .5), - monokai-line-origin-chosen : rgba(#60d9f1, .35), - monokai-button-origin-chosen : #3ea4b2, - - monokai-header-not-chosen : rgba(#76715d, .24), - monokai-line-not-chosen : rgba(#76715d, .1), - - solarized-light-header-head-neutral : rgba(#859900, .37), - solarized-light-line-head-neutral : rgba(#859900, .2), - solarized-light-button-head-neutral : #afb262, - - solarized-light-header-head-chosen : rgba(#859900, .5), - solarized-light-line-head-chosen : rgba(#859900, .37), - solarized-light-button-head-chosen : #94993d, - - solarized-light-header-origin-neutral : rgba(#2878c9, .37), - solarized-light-line-origin-neutral : rgba(#2878c9, .15), - solarized-light-button-origin-neutral : #60a1bf, - - solarized-light-header-origin-chosen : rgba(#2878c9, .6), - solarized-light-line-origin-chosen : rgba(#2878c9, .37), - solarized-light-button-origin-chosen : #2482b2, - - solarized-light-header-not-chosen : rgba(#839496, .37), - solarized-light-line-not-chosen : rgba(#839496, .2), - - solarized-dark-header-head-neutral : rgba(#859900, .35), - solarized-dark-line-head-neutral : rgba(#859900, .15), - solarized-dark-button-head-neutral : #376b20, - - solarized-dark-header-head-chosen : rgba(#859900, .5), - solarized-dark-line-head-chosen : rgba(#859900, .35), - solarized-dark-button-head-chosen : #39800d, - - solarized-dark-header-origin-neutral : rgba(#2878c9, .35), - solarized-dark-line-origin-neutral : rgba(#2878c9, .15), - solarized-dark-button-origin-neutral : #086799, - - solarized-dark-header-origin-chosen : rgba(#2878c9, .6), - solarized-dark-line-origin-chosen : rgba(#2878c9, .35), - solarized-dark-button-origin-chosen : #0082cc, - - solarized-dark-header-not-chosen : rgba(#839496, .25), - solarized-dark-line-not-chosen : rgba(#839496, .15) + white-header-head-neutral: #e1fad7, + white-line-head-neutral: #effdec, + white-button-head-neutral: #9adb84, + white-header-head-chosen: #baf0a8, + white-line-head-chosen: #e1fad7, + white-button-head-chosen: #52c22d, + white-header-origin-neutral: #e0f0ff, + white-line-origin-neutral: #f2f9ff, + white-button-origin-neutral: #87c2fa, + white-header-origin-chosen: #add8ff, + white-line-origin-chosen: #e0f0ff, + white-button-origin-chosen: #268ced, + white-header-not-chosen: #f0f0f0, + white-line-not-chosen: $gray-light, + dark-header-head-neutral: rgba(#3f3, 0.2), + dark-line-head-neutral: rgba(#3f3, 0.1), + dark-button-head-neutral: #40874f, + dark-header-head-chosen: rgba(#3f3, 0.33), + dark-line-head-chosen: rgba(#3f3, 0.2), + dark-button-head-chosen: #258537, + dark-header-origin-neutral: rgba(#2878c9, 0.4), + dark-line-origin-neutral: rgba(#2878c9, 0.3), + dark-button-origin-neutral: #2a5c8c, + dark-header-origin-chosen: rgba(#2878c9, 0.6), + dark-line-origin-chosen: rgba(#2878c9, 0.4), + dark-button-origin-chosen: #1d6cbf, + dark-header-not-chosen: rgba(#fff, 0.25), + dark-line-not-chosen: rgba(#fff, 0.1), + monokai-header-head-neutral: rgba(#a6e22e, 0.25), + monokai-line-head-neutral: rgba(#a6e22e, 0.1), + monokai-button-head-neutral: #376b20, + monokai-header-head-chosen: rgba(#a6e22e, 0.4), + monokai-line-head-chosen: rgba(#a6e22e, 0.25), + monokai-button-head-chosen: #39800d, + monokai-header-origin-neutral: rgba(#60d9f1, 0.35), + monokai-line-origin-neutral: rgba(#60d9f1, 0.15), + monokai-button-origin-neutral: #38848c, + monokai-header-origin-chosen: rgba(#60d9f1, 0.5), + monokai-line-origin-chosen: rgba(#60d9f1, 0.35), + monokai-button-origin-chosen: #3ea4b2, + monokai-header-not-chosen: rgba(#76715d, 0.24), + monokai-line-not-chosen: rgba(#76715d, 0.1), + solarized-light-header-head-neutral: rgba(#859900, 0.37), + solarized-light-line-head-neutral: rgba(#859900, 0.2), + solarized-light-button-head-neutral: #afb262, + solarized-light-header-head-chosen: rgba(#859900, 0.5), + solarized-light-line-head-chosen: rgba(#859900, 0.37), + solarized-light-button-head-chosen: #94993d, + solarized-light-header-origin-neutral: rgba(#2878c9, 0.37), + solarized-light-line-origin-neutral: rgba(#2878c9, 0.15), + solarized-light-button-origin-neutral: #60a1bf, + solarized-light-header-origin-chosen: rgba(#2878c9, 0.6), + solarized-light-line-origin-chosen: rgba(#2878c9, 0.37), + solarized-light-button-origin-chosen: #2482b2, + solarized-light-header-not-chosen: rgba(#839496, 0.37), + solarized-light-line-not-chosen: rgba(#839496, 0.2), + solarized-dark-header-head-neutral: rgba(#859900, 0.35), + solarized-dark-line-head-neutral: rgba(#859900, 0.15), + solarized-dark-button-head-neutral: #376b20, + solarized-dark-header-head-chosen: rgba(#859900, 0.5), + solarized-dark-line-head-chosen: rgba(#859900, 0.35), + solarized-dark-button-head-chosen: #39800d, + solarized-dark-header-origin-neutral: rgba(#2878c9, 0.35), + solarized-dark-line-origin-neutral: rgba(#2878c9, 0.15), + solarized-dark-button-origin-neutral: #086799, + solarized-dark-header-origin-chosen: rgba(#2878c9, 0.6), + solarized-dark-line-origin-chosen: rgba(#2878c9, 0.35), + solarized-dark-button-origin-chosen: #0082cc, + solarized-dark-header-not-chosen: rgba(#839496, 0.25), + solarized-dark-line-not-chosen: rgba(#839496, 0.15), ); // scss-lint:enable ColorVariable @@ -190,25 +166,24 @@ $colors: ( } #conflicts { - .white { - @include color-scheme('white') + @include color-scheme('white'); } .dark { - @include color-scheme('dark') + @include color-scheme('dark'); } .monokai { - @include color-scheme('monokai') + @include color-scheme('monokai'); } .solarized-light { - @include color-scheme('solarized-light') + @include color-scheme('solarized-light'); } .solarized-dark { - @include color-scheme('solarized-dark') + @include color-scheme('solarized-dark'); } .diff-wrap-lines .line_content { @@ -285,7 +260,7 @@ $colors: ( } .resolve-info { - @media(max-width: map-get($grid-breakpoints, lg)-1) { + @media (max-width: map-get($grid-breakpoints, lg)-1) { margin-bottom: $gl-padding; } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 45382d4ea43..d244a098862 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -47,7 +47,6 @@ } } - .mr-widget-heading { position: relative; border: 1px solid $border-color; @@ -455,7 +454,7 @@ .mr-list { .merge-request { - padding: 10px 0 10px 15px; + padding: 10px 0 10px 15px; position: relative; display: -webkit-flex; display: flex; @@ -469,7 +468,6 @@ margin-bottom: 2px; .ci-status-link { - svg { height: 16px; width: 16px; @@ -699,7 +697,6 @@ .table-holder { .ci-table { - th { background-color: $white-light; color: $gl-text-color-secondary; @@ -776,7 +773,7 @@ &.affix { left: 0; - transition: right .15s; + transition: right 0.15s; @include media-breakpoint-down(xs) { right: 0; @@ -885,7 +882,7 @@ } > *:not(:last-child) { - margin-right: .3em; + margin-right: 0.3em; } svg { @@ -918,7 +915,7 @@ &[disabled] { cursor: not-allowed; box-shadow: none; - opacity: .65; + opacity: 0.65; &:hover { color: $gl-gray-500; diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 4268e194ed7..14a0477f6f3 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -61,8 +61,7 @@ padding: $gl-padding-top $gl-padding; border: 1px solid $border-color; border-radius: $border-radius-base; - transition: border-color ease-in-out 0.15s, - box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; &.is-focused { @extend .form-control:focus; @@ -75,8 +74,7 @@ &.is-dropzone-hover { border-color: $green-500; - box-shadow: 0 0 2px $black-transparent, - 0 0 4px $green-500-focus; + box-shadow: 0 0 2px $black-transparent, 0 0 4px $green-500-focus; .comment-toolbar, .nav-links { @@ -430,7 +428,7 @@ .uploading-error-message { @include media-breakpoint-down(xs) { &::after { - content: "\a"; + content: '\a'; white-space: pre; } } diff --git a/app/assets/stylesheets/pages/pages.scss b/app/assets/stylesheets/pages/pages.scss index fb42dee66d2..92e0b4954d8 100644 --- a/app/assets/stylesheets/pages/pages.scss +++ b/app/assets/stylesheets/pages/pages.scss @@ -13,17 +13,14 @@ .domain-name { flex-grow: 1; } - } &.has-verification-status > li { padding-left: 3 * $gl-padding; } - } .status-badge { - display: inline-flex; margin-bottom: $gl-padding-8; @@ -56,5 +53,4 @@ border-bottom-right-radius: $border-radius-default; border-top-right-radius: $border-radius-default; } - } diff --git a/app/assets/stylesheets/pages/reports.scss b/app/assets/stylesheets/pages/reports.scss index ecd51aa06a4..27b0a77b73a 100644 --- a/app/assets/stylesheets/pages/reports.scss +++ b/app/assets/stylesheets/pages/reports.scss @@ -80,7 +80,6 @@ .license-packages { font-size: $label-font-size; } - } } diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index dbf8692d69b..f60562fed04 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -70,7 +70,7 @@ animation: none; } - @media(max-width: map-get($grid-breakpoints, md)-1) { + @media (max-width: map-get($grid-breakpoints, md)-1) { padding-right: 20px; } diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 7d59dd3b5d1..f4d568d02ac 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -33,7 +33,7 @@ border-color: $gl-text-color; &:not(span):hover { - background-color: rgba($gl-text-color, .07); + background-color: rgba($gl-text-color, 0.07); } } @@ -54,7 +54,7 @@ border-color: $gl-text-color-secondary; &:not(span):hover { - background-color: rgba($gl-text-color-secondary, .07); + background-color: rgba($gl-text-color-secondary, 0.07); } } } diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss index 3fc37e20c36..7a7f45c4907 100644 --- a/app/assets/stylesheets/pages/todos.scss +++ b/app/assets/stylesheets/pages/todos.scss @@ -60,13 +60,13 @@ .todo-avatar, .todo-item { - opacity: .6; + opacity: 0.6; } } .todo-avatar, .todo-item { - opacity: .2; + opacity: 0.2; } .btn { diff --git a/app/assets/stylesheets/pages/ui_dev_kit.scss b/app/assets/stylesheets/pages/ui_dev_kit.scss index 84c617c7ec0..7744fd814d0 100644 --- a/app/assets/stylesheets/pages/ui_dev_kit.scss +++ b/app/assets/stylesheets/pages/ui_dev_kit.scss @@ -10,7 +10,7 @@ margin-bottom: 15px; &::before { - content: "Example"; + content: 'Example'; color: $ui-dev-kit-example-color; } } |