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

Widget permissions styling and icon #4690

Merged
merged 5 commits into from
Jul 28, 2017
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
1 change: 1 addition & 0 deletions src/skins/vector/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ textarea {
cursor: help;
transition-duration: 200ms;
font-size: smaller;
filter: opacity(0.5);
}

.mx_Beta:hover {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,20 @@ limitations under the License.
border: 1px solid transparent;
}

.mx_AppTileMenuBarWidgetDelete {
filter: none;
}

.mx_AppTileMenuBarWidget:hover {
border: 1px solid $primary-hairline-color;
border-radius: 2px;
}

.mx_AppTileBody{
height: 350px;
overflow: hidden;
}

.mx_AppTileBody iframe {
width: 100%;
height: 350px;
Expand Down Expand Up @@ -167,3 +176,52 @@ form.mx_Custom_Widget_Form div {
margin-top: 10px;
margin-bottom: 10px;
}

.mx_AppPermissionWarning {
text-align: center;
padding: 30px 0;
background-color: $primary-bg-color;
}

.mx_AppPermissionWarningImage {
margin: 10px 0;
}

.mx_AppPermissionWarningImage img {
width: 150px;
}

.mx_AppPermissionWarningText {
max-width: 400px;
margin: 10px auto 10px auto;
color: $primary-fg-color;
}

.mx_AppPermissionWarningTextLabel {
font-weight: bold;
}

.mx_AppPermissionWarningTextURL {
color: $accent-color;
}

.mx_AppPermissionButton {
padding: 5px;
border-radius: 5px;
color: $warning-color;
background-color: $primary-bg-color;
}

.mx_AppPermissionButton:hover {
background-color: $primary-fg-color;
cursor: pointer;
}

.mx_AppLoading {
min-height: 305px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
font-weight: bold;
}
10 changes: 10 additions & 0 deletions src/skins/vector/img/cancel-red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.