Skip to content

Commit

Permalink
Merge pull request #4690 from vector-im/rxl881/widgetPermissions
Browse files Browse the repository at this point in the history
Widget permissions styling and icon
  • Loading branch information
rxl881 authored Jul 28, 2017
2 parents 068a2b8 + 317ff8c commit ca5fdff
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 0 deletions.
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
58 changes: 58 additions & 0 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
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.

0 comments on commit ca5fdff

Please sign in to comment.