Skip to content

G
gitlab-ce
Commit 1674752f authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Merge branch 'ee-10516-env-css' into 'master' 

Moves EE specific env CSS into EE folder

Closes #10516

See merge request gitlab-org/gitlab-ee!10307
parents c90503fb 88641993
Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 293 deletions
app/assets/stylesheets/pages/environments.scss
View file @ 1674752f
...@@ -123,166 +123,6 @@ ...@@ -123,166 +123,6 @@
} }
} }
/**
* Deploy boards
*/
.deploy-board {
padding: 10px;
background-color: $gray-light;
min-height: 20px;
.fa-spinner {
margin: 0 auto;
width: 20px;
display: block;
font-size: 20px;
}
> div {
display: flex;
justify-content: space-between;
.deploy-board-information {
order: 1;
display: flex;
width: 70px;
flex-wrap: wrap;
justify-content: center;
margin: 20px 0 20px 5px;
> span {
text-align: center;
}
.percentage {
color: $gl-text-color;
}
.text {
color: $gl-text-color-secondary;
}
}
.deploy-board-instances {
order: 2;
margin-left: 20px;
width: 100%;
.text {
color: $gl-text-color-secondary;
font-size: 12px;
}
.deploy-board-instances-container {
display: flex;
flex-wrap: wrap;
flex-direction: row;
margin-top: -8px;
}
}
.deploy-board-actions {
order: 3;
align-self: center;
min-width: 150px;
margin-left: 10px;
}
&.deploy-board-error-message {
justify-content: center;
}
.deploy-board-empty-state-svg {
order: 1;
width: 90px;
margin: auto 0 auto 20px;
}
.deploy-board-empty-state-text {
order: 2;
flex-wrap: wrap;
margin: auto auto 15px 0;
.title {
order: 1;
display: flex;
font-size: 17px;
line-height: 40px;
}
}
}
}
.deploy-board-instance {
width: 15px;
height: 15px;
border-radius: 3px;
border-width: 1px;
border-style: solid;
margin: 1px;
display: flex;
justify-content: center;
align-items: center;
&-running {
background-color: $green-100;
border-color: $green-400;
// EE-specific start
&:hover {
background-color: $green-300;
border-color: $green-500;
}
// EE-specific end
}
&-succeeded {
background-color: $green-50;
border-color: $green-400;
}
&-failed {
background-color: $red-200;
border-color: $red-500;
}
&-unknown {
background-color: $red-200;
border-color: $red-500;
}
&-pending {
background-color: $white-light;
border-color: $border-color;
}
&.deploy-board-instance-canary {
&::after {
width: 7px;
height: 7px;
border: 1px solid $white-light;
background-color: $orange-300;
border-radius: 50%;
content: '';
}
}
}
.deploy-board-icon {
display: none;
@include media-breakpoint-up(md) {
float: left;
display: block;
}
i {
cursor: pointer;
color: $layout-link-gray;
padding-right: 10px;
}
}
.gl-responsive-table-row { .gl-responsive-table-row {
.branch-commit { .branch-commit {
max-width: 100%; max-width: 100%;
...@@ -634,136 +474,3 @@ ...@@ -634,136 +474,3 @@
.prometheus-table-row-highlight { .prometheus-table-row-highlight {
background-color: $gray-100; background-color: $gray-100;
} }
// EE-only
.cluster-health-graphs {
.prometheus-state {
.state-svg img {
max-height: 120px;
}
.state-description,
.state-button {
display: none;
}
}
}
.alert-dropdown-button {
margin-left: $btn-side-margin;
.dropdown.open & {
background: $white-normal;
outline: 0;
}
svg {
margin: 0;
+ svg {
margin-left: -$gl-padding-4;
}
&.chevron {
color: $gl-text-color-secondary;
}
}
}
.alert-dropdown-menu {
right: 0;
left: auto;
z-index: $zindex-popover + 5; // must be higher than graph flag popover
.dropdown-title {
margin: 0;
}
}
.alert-error-message {
color: $red-500;
vertical-align: middle;
}
.alert-current-setting {
color: $gl-text-color-disabled;
vertical-align: middle;
}
.alert-form {
padding: $gl-padding $gl-padding $gl-padding-8;
label {
font-weight: normal;
}
.btn-group,
.action-group {
display: flex;
.btn {
flex: 1 auto;
box-shadow: none;
}
}
.action-group .btn + .btn {
margin-left: $gl-padding-8;
}
}
// ee-only start
.canary-deployment-callout {
border-bottom: 1px solid $border-white-normal;
display: flex;
@include media-breakpoint-down(sm) {
display: none;
}
&-lock {
height: 82px;
width: 92px;
}
&-message {
max-width: 600px;
color: $gray-700;
}
&-close {
color: $gray-700;
cursor: pointer;
}
&-button {
border-color: $blue-500;
color: $blue-500;
&:not(:disabled):not(.disabled):active {
background-color: $blue-200;
border: 2px solid $blue-600;
color: $blue-700;
height: 34px;
padding: 5px 9px;
}
&:focus {
background-color: $blue-100;
border: 2px solid $blue-500;
box-shadow: 0 0 4px 1px $blue-200;
color: $blue-600;
height: 34px;
padding: 5px 9px;
}
&:hover {
background-color: $blue-100;
border: 2px solid $blue-500;
color: $blue-600;
height: 34px;
padding: 5px 9px;
}
}
}
// ee-only end
ee/app/assets/stylesheets/pages/environments.scss 0 → 100644
View file @ 1674752f
/**
* Deploy boards
*/
.deploy-board {
padding: 10px;
background-color: $gray-light;
min-height: 20px;
.fa-spinner {
margin: 0 auto;
width: 20px;
display: block;
font-size: 20px;
}
> div {
display: flex;
justify-content: space-between;
.deploy-board-information {
order: 1;
display: flex;
width: 70px;
flex-wrap: wrap;
justify-content: center;
margin: 20px 0 20px 5px;
> span {
text-align: center;
}
.percentage {
color: $gl-text-color;
}
.text {
color: $gl-text-color-secondary;
}
}
.deploy-board-instances {
order: 2;
margin-left: 20px;
width: 100%;
.text {
color: $gl-text-color-secondary;
font-size: 12px;
}
.deploy-board-instances-container {
display: flex;
flex-wrap: wrap;
flex-direction: row;
margin-top: -8px;
}
}
.deploy-board-actions {
order: 3;
align-self: center;
min-width: 150px;
margin-left: 10px;
}
&.deploy-board-error-message {
justify-content: center;
}
.deploy-board-empty-state-svg {
order: 1;
width: 90px;
margin: auto 0 auto 20px;
}
.deploy-board-empty-state-text {
order: 2;
flex-wrap: wrap;
margin: auto auto 15px 0;
.title {
order: 1;
display: flex;
font-size: 17px;
line-height: 40px;
}
}
}
}
.deploy-board-instance {
width: 15px;
height: 15px;
border-radius: 3px;
border-width: 1px;
border-style: solid;
margin: 1px;
display: flex;
justify-content: center;
align-items: center;
&-running {
background-color: $green-100;
border-color: $green-400;
&:hover {
background-color: $green-300;
border-color: $green-500;
}
}
&-succeeded {
background-color: $green-50;
border-color: $green-400;
}
&-failed {
background-color: $red-200;
border-color: $red-500;
}
&-unknown {
background-color: $red-200;
border-color: $red-500;
}
&-pending {
background-color: $white-light;
border-color: $border-color;
}
&.deploy-board-instance-canary {
&::after {
width: 7px;
height: 7px;
border: 1px solid $white-light;
background-color: $orange-300;
border-radius: 50%;
content: '';
}
}
}
.deploy-board-icon {
display: none;
@include media-breakpoint-up(md) {
float: left;
display: block;
}
i {
cursor: pointer;
color: $layout-link-gray;
padding-right: 10px;
}
}
.cluster-health-graphs {
.prometheus-state {
.state-svg img {
max-height: 120px;
}
.state-description,
.state-button {
display: none;
}
}
}
.alert-dropdown-button {
margin-left: $btn-side-margin;
.dropdown.open & {
background: $white-normal;
outline: 0;
}
svg {
margin: 0;
+ svg {
margin-left: -$gl-padding-4;
}
&.chevron {
color: $gl-text-color-secondary;
}
}
}
.alert-dropdown-menu {
right: 0;
left: auto;
z-index: $zindex-popover + 5; // must be higher than graph flag popover
.dropdown-title {
margin: 0;
}
}
.alert-error-message {
color: $red-500;
vertical-align: middle;
}
.alert-current-setting {
color: $gl-text-color-disabled;
vertical-align: middle;
}
.alert-form {
padding: $gl-padding $gl-padding $gl-padding-8;
label {
font-weight: normal;
}
.btn-group,
.action-group {
display: flex;
.btn {
flex: 1 auto;
box-shadow: none;
}
}
.action-group .btn + .btn {
margin-left: $gl-padding-8;
}
}
.canary-deployment-callout {
border-bottom: 1px solid $border-white-normal;
display: flex;
@include media-breakpoint-down(sm) {
display: none;
}
&-lock {
height: 82px;
width: 92px;
}
&-message {
max-width: 600px;
color: $gray-700;
}
&-close {
color: $gray-700;
cursor: pointer;
}
&-button {
border-color: $blue-500;
color: $blue-500;
&:not(:disabled):not(.disabled):active {
background-color: $blue-200;
border: 2px solid $blue-600;
color: $blue-700;
height: 34px;
padding: 5px 9px;
}
&:focus {
background-color: $blue-100;
border: 2px solid $blue-500;
box-shadow: 0 0 4px 1px $blue-200;
color: $blue-600;
height: 34px;
padding: 5px 9px;
}
&:hover {
background-color: $blue-100;
border: 2px solid $blue-500;
color: $blue-600;
height: 34px;
padding: 5px 9px;
}
}
}
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