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.

Sign up for GitHub

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

Replace triangle sidebar trigger with dedicated icon, add icons to sidebar tabs and fix padding #548

Merged
merged 7 commits into from
Jan 9, 2018
Merged

Replace triangle sidebar trigger with dedicated icon, add icons to sidebar tabs and fix padding #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
876d44a
Replace triangle sidebar trigger with dedicated icon
jancborchardt Jan 9, 2018
8c9c127
Padding fixes and icons for tab headers
jancborchardt Jan 9, 2018
9ad16ca
Move style.css to SCSS
jancborchardt Jan 9, 2018
2e146ce
Use variable for text color
jancborchardt Jan 9, 2018
83e1a06
Reduce whitespace between room info and tabs
jancborchardt Jan 9, 2018
43881c4
Add some whitespace to guest name, prevent jumping on edit
jancborchardt Jan 9, 2018
404ef18
Improve wording on Copy link icon
jancborchardt Jan 9, 2018
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
75 changes: 45 additions & 30 deletions css/style.css → css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,12 +445,14 @@ video {
}

#video-fullscreen,
.nameIndicator button {
.nameIndicator button,
#app-sidebar-trigger {
background-color: transparent;
border: none;
margin: 0;
width: 44px;
height: 44px;
background-size: 25px;
background-size: 24px;
}

.nameIndicator button.audio-disabled,
Expand Down Expand Up @@ -672,40 +674,17 @@ video {
position: fixed;
/* Although it would be desirable due to their complementary behaviour, the
* trigger can not be placed at the same position as the close button
* (top: 45px) due to the "Switch to fullscreen" icon shown during calls. */
top: 150px;
* (top: 45px) due to the "Switch to fullscreen" icon shown during calls.
* Set to 45px (header) + 44px (fullscreen icon). */
top: 89px;
right: 0;
width: 48px;
height: 48px;
/* Higher than the z-index of the emptycontent */
z-index: 50;
cursor: pointer;
}

#app-sidebar-trigger .large-outer-left-triangle {
position: absolute;
top: 0;
right: 0;
border-width: 24px;
border-color: #ebebeb;
border-style: solid;
border-left-color: transparent;
border-top-color: transparent;
border-bottom-color: transparent;
cursor: pointer;
}

#app-sidebar-trigger .large-inner-left-triangle {
position: absolute;
top: 2px;
right: 0;
border-width: 22px;
border-color: #fff;
border-style: solid;
border-left-color: transparent;
border-top-color: transparent;
border-bottom-color: transparent;
cursor: pointer;
.icon-menu-people {
background-image: url('../img/menu-people.svg?v=1');
}

#app-sidebar .close {
Expand Down Expand Up @@ -772,6 +751,38 @@ video {
display: inline-block;
}

/* START: move padding fixes and icons-for-tabs capability into core */
.tabHeaders {
margin-top: 0;
}

.tabHeaders .tabHeader {
padding: 12px;
padding-left: 32px;
background-position: 12px;
background-repeat: no-repeat;
opacity: .5;
}

.tabHeaders .tabHeader a {
color: $color-main-text;
}

.tabHeaders .tabHeader.selected,
.tabHeaders .tabHeader:hover,
.tabHeaders .tabHeader:focus {
opacity: 1;
}

#tabHeaderChat {
background-image: url('../../../core/img/actions/comment.svg?v=1');
}

#tabHeaderParticipants {
background-image: url('../../../core/img/places/contacts-dark.svg?v=1');
}
/* END: move padding fixes and icons-for-tabs capability into core */

#app-sidebar.hidden {
display: none !important;
}
Expand Down Expand Up @@ -852,6 +863,10 @@ video {
display: inline-block;
}

.detailCallInfoContainer .guest-name p {
padding: 9px 0;
}

.detailCallInfoContainer .editable-text-label .edit-button {
display: none;
}
Expand Down
1 change: 1 addition & 0 deletions img/menu-people.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions js/views/callinfoview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@
clipboard.on('success', function(e) {
var $input = $(e.trigger);
$input.tooltip('hide')
.attr('data-original-title', t('core', 'Copied!'))
.attr('data-original-title', t('core', 'Link copied!'))
.tooltip('fixTitle')
.tooltip({placement: 'bottom', trigger: 'manual'})
.tooltip('show');
_.delay(function() {
$input.tooltip('hide')
.attr('data-original-title', t('core', 'Copy'))
.attr('data-original-title', t('core', 'Copy link'))
.tooltip('fixTitle');
}, 3000);
});
Expand Down
4 changes: 1 addition & 3 deletions js/views/sidebarview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
OCA.SpreedMe.Views = OCA.SpreedMe.Views || {};

var TEMPLATE =
'<div id="app-sidebar-trigger">' +
' <div class="large-outer-left-triangle"/>' +
' <div class="large-inner-left-triangle"/>' +
'<div id="app-sidebar-trigger" class="icon-menu-people icon-white icon-shadow">' +
'</div>' +
'<div id="app-sidebar" class="detailsView scroll-container">' +
' <div class="detailCallInfoContainer">' +
Expand Down