Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Modal] Basic Modal and inverted modal on inverted dimmer had wrong close icon color #208

Merged
merged 2 commits into from
Oct 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/definitions/modules/modal.less
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@
.ui.modal .actions > .button {
margin-left: @buttonDistance;
}
.ui.basic.modal > .actions {
border-top:none;
}

/*-------------------
Responsive
Expand Down Expand Up @@ -301,6 +304,7 @@
.ui.basic.modal > .close {
top: @basicModalCloseTop;
right: @basicModalCloseRight;
color: @basicInnerCloseColor;
}

.ui.inverted.dimmer > .basic.modal {
Expand All @@ -324,12 +328,6 @@
top: auto !important;
}

/* Tablet and Mobile */
prudho marked this conversation as resolved.
Show resolved Hide resolved
@media only screen and (max-width : @largestTabletScreen) {
.ui.basic.modal > .close {
color: @basicInnerCloseColor;
}
}


/*******************************
Expand Down Expand Up @@ -432,8 +430,9 @@
right: @innerCloseRight;
color: @innerCloseColor;
}


.ui.basic.fullscreen.modal > .close {
color: @basicInnerCloseColor;
}
/*--------------
Size
---------------*/
Expand Down Expand Up @@ -607,13 +606,13 @@
border-top: @invertedActionBorder;
}

.ui.fullscreen.inverted.modal > .close {
color: @invertedInnerCloseColor;
ColinFrick marked this conversation as resolved.
Show resolved Hide resolved
.ui.inverted.dimmer > .modal > .close {
color: @invertedDimmerCloseColor;
}


@media only screen and (max-width: @largestTabletScreen) {
.ui.inverted.modal > .close {
.ui.dimmer .inverted.modal > .close {
color: @invertedCloseColor;
}
}
Expand All @@ -622,9 +621,7 @@
color: @invertedCloseColor;
}

.ui.inverted.dimmer > .modal > .close {
color: @invertedDimmerCloseColor;
}



.loadUIOverrides();
1 change: 0 additions & 1 deletion src/themes/default/modules/modal.variables
Original file line number Diff line number Diff line change
Expand Up @@ -200,5 +200,4 @@
@invertedHeaderBackgroundColor: @darkTextColor;
@invertedActionBackground: #191A1B;
@invertedActionBorder: 1px solid rgba(34, 36, 38, 0.85);
@invertedInnerCloseColor: rgba(255, 255, 255, 0.13);
@invertedDimmerCloseColor: rgba(0,0,0,.85);