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

Improve tab header styles, center headings, flexbox #568

Merged
merged 2 commits into from
Jan 10, 2018
Merged
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
34 changes: 21 additions & 13 deletions css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -802,32 +802,40 @@ video {

/* START: move padding fixes and icons-for-tabs capability into core */
.tabHeaders {
display: flex;
margin-top: 0;
margin-bottom: 10px;
min-height: 44px;
}

.tabHeaders .tabHeader {
flex-basis: 50%;
flex-grow: 0;
padding: 12px;
padding-left: 32px;
background-position: 12px;
background-repeat: no-repeat;
opacity: .5;
}

.tabHeaders .tabHeader a {
color: $color-main-text;
text-align: center;
border-bottom: 1px solid $color-border;
margin-bottom: 0;

a {
padding-left: 32px;
background-position: 12px;
background-repeat: no-repeat;
color: $color-main-text;
opacity: .5;
}
}

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw this breaks when apps are not installed in an app folder in root,
Should fix for 3.1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I only used it because it was already used in the code – by you ;)
https://github.com/nextcloud/spreed/blame/93e0a82f2e91537941c56b1cb31f29e9e4a9338e/css/style.scss#L906

But yes – the reason why I needed to use it like that is because I needed to insert a class (.icon-comment in this case) into the tabHeader, or rather the link inside of it. If we can do that in the code rather, we don’t need that CSS.

}

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