Merge remote-tracking branch 'origin/styling/add-groups-link' into groups-updates
* origin/styling/add-groups-link: (31 commits) Comment out the "groups" button until ready to reveal. Changed the method of adding main navigation icons. Created a png sprite sized @2x based on largest usage (for retina). This will fix some rendering issues caused by using svg images. It will allow adding depth and more color / shading if we choose later. intents fix federation fix two more federation fixes Removed unused imports Removed unused PublicTimeline component Updated CommunityTimeline to add option for "all federated" content Removed unused import in unauthorized_modal Updated registration legal links Updated compose_form to account for if compose modal open Added empty message to pinned statuses page Updated nextProps withReplies for account timeline Added empty message to account_gallery media page Updated timeline/notification dequeue to be in componentDidMount Added TimelineQueueButtonHeader to status_list Added queue functionality status_list_container for status timelines Updated all Redis.current.publish, PushUpdateWorker.perform_async to work again Added timeline dequeue functionality to onSubmitCompose action Added redux functionality for queueing/dequeueing timelines ...
This commit is contained in:
2458773093
@@ -1380,6 +1380,7 @@ a.account__display-name {
|
||||
.ui {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 0 0 100px 0;
|
||||
|
||||
.page {
|
||||
display: flex;
|
||||
@@ -5103,3 +5104,25 @@ noscript {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.timeline-queue-header {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 52px;
|
||||
position: relative;
|
||||
background-color: darken($ui-base-color, 8%);
|
||||
border-bottom: 1px solid;
|
||||
border-top: 1px solid;
|
||||
border-color: darken($ui-base-color, 4%);
|
||||
|
||||
&__btn {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
text-align: center;
|
||||
line-height: 52px;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
color: $secondary-text-color;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
.tabs-bar__link {
|
||||
display: flex;
|
||||
@@ -126,72 +126,101 @@
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
// NOTE - Explore not using SVG for the navigation icons.
|
||||
// The icon pixels shift around too much on crappy screens in certain situations
|
||||
// If switched to an @2x png sprite, subtle shading and color can be introduced
|
||||
|
||||
background-image: url('../images/sprite-main-navigation-links.png');
|
||||
background-size: auto 84px;
|
||||
@media screen and (max-width: $nav-breakpoint-1) {
|
||||
background-size: auto 120px;
|
||||
width: 46px;
|
||||
height: 42px;
|
||||
margin: 4px 0 0 0;
|
||||
padding: 0 !important;
|
||||
&.active {
|
||||
height: 38px;
|
||||
border-bottom: 4px solid $gab-default-text-light;
|
||||
}
|
||||
& span {display: none;}
|
||||
}
|
||||
&.home {
|
||||
padding: 16px 0 0 25px;
|
||||
background-image: url('../images/gab-icons/icon-home-sprite.svg');
|
||||
background-size: 17px 114px;
|
||||
background-position: 0 -82px;
|
||||
&.active{background-position: 0 18px;}
|
||||
background-position: 0 18px;
|
||||
&.active {background-position: 0 -52px;}
|
||||
@media screen and (max-width: $nav-breakpoint-1) {
|
||||
background-size: 24px 160.94px;
|
||||
@-moz-document url-prefix() {
|
||||
&.active{background-position: center 10px !important;}
|
||||
}
|
||||
background-position: 11px 11px;
|
||||
&.active {background-position: 11px -89px;}
|
||||
}
|
||||
}
|
||||
&.explore,
|
||||
&.notifications,
|
||||
&.messages,
|
||||
&.groups,
|
||||
&.optional {
|
||||
&.notifications {
|
||||
padding: 16px 0 0 23px;
|
||||
background-size: 14px 114px;
|
||||
background-position: -140px 18px;
|
||||
&.active {background-position: -140px -52px;}
|
||||
@media screen and (max-width: $nav-breakpoint-1) {
|
||||
background-size: 20px 160.94px;
|
||||
background-position: -186px 11px;
|
||||
&.active {background-position: -186px -89px;}
|
||||
}
|
||||
}
|
||||
&.groups {
|
||||
padding: 16px 0 0 28px;
|
||||
background-position: -280px 18px;
|
||||
&.active {background-position: -280px -52px;}
|
||||
@media screen and (max-width: $nav-breakpoint-1) {
|
||||
background-position: -390px 11px;
|
||||
&.active {background-position: -390px -89px;}
|
||||
}
|
||||
|
||||
background-position: 0 -82px;
|
||||
&.active{background-position: 0 18px;}
|
||||
}
|
||||
&.explore {background-image: url('../images/gab-icons/icon-explore-sprite.svg');}
|
||||
&.notifications {background-image: url('../images/gab-icons/icon-notifications-sprite.svg');}
|
||||
&.messages {background-image: url('../images/gab-icons/icon-messages-sprite.svg');}
|
||||
&.optional {background-image: url('../images/gab-icons/icon-search-sprite.svg');}
|
||||
&.groups {background-image: url('../images/gab-icons/icon-explore-sprite.svg');}
|
||||
|
||||
|
||||
&.optional {
|
||||
display: none;
|
||||
@media screen and (max-width: $nav-breakpoint-2) {display: flex;}
|
||||
@media screen and (max-width: $nav-breakpoint-2) {
|
||||
display: flex;
|
||||
background-position: -987px 11px;
|
||||
&.active {background-position: -987px -89px;}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// &.notifications,
|
||||
// &.explore,
|
||||
// &.messages,
|
||||
// &.optional {
|
||||
// padding: 16px 0 0 23px;
|
||||
// background-size: 14px 114px;
|
||||
// @media screen and (max-width: $nav-breakpoint-1) {background-size: 20px 160.94px;}
|
||||
// background-position: 0 -82px;
|
||||
// &.active{background-position: 0 18px;}
|
||||
// }
|
||||
// &.explore {background-image: url('../images/gab-icons/icon-explore-sprite.svg');}
|
||||
// &.notifications {background-image: url('../images/gab-icons/icon-notifications-sprite.svg');}
|
||||
// &.messages {background-image: url('../images/gab-icons/icon-messages-sprite.svg');}
|
||||
// &.groups {background-image: url('../images/gab-icons/icon-groups-sprite.svg');}
|
||||
// &.optional {background-image: url('../images/gab-icons/icon-search-sprite.svg');}
|
||||
// &.optional {
|
||||
// display: none;
|
||||
// @media screen and (max-width: $nav-breakpoint-2) {display: flex;}
|
||||
// }
|
||||
|
||||
|
||||
// REWORK THIS BECAUSE OF FIREFOX BUGS
|
||||
|
||||
@media screen and (max-width: $nav-breakpoint-1) {
|
||||
&.home,
|
||||
&.explore,
|
||||
&.notifications,
|
||||
&.messages,
|
||||
&.optional {
|
||||
width: 46px;
|
||||
height: 42px;
|
||||
margin: 4px 0 0 0;
|
||||
padding: 0;
|
||||
background-position: center -130px;
|
||||
&.active {
|
||||
height: 38px;
|
||||
border-bottom: 4px solid $gab-default-text-light;
|
||||
background-position: center 11px;
|
||||
}
|
||||
}
|
||||
& span {display: none;}
|
||||
}
|
||||
// @media screen and (max-width: $nav-breakpoint-1) {
|
||||
// &.home,
|
||||
// &.notifications,
|
||||
// &.groups,
|
||||
// &.explore,
|
||||
// &.messages,
|
||||
// &.optional {
|
||||
// width: 46px;
|
||||
// height: 42px;
|
||||
// margin: 4px 0 0 0;
|
||||
// padding: 0;
|
||||
// background-position: center -130px;
|
||||
// &.active {
|
||||
// height: 38px;
|
||||
// border-bottom: 4px solid $gab-default-text-light;
|
||||
// background-position: center 11px;
|
||||
// }
|
||||
// }
|
||||
// & span {display: none;}
|
||||
// }
|
||||
|
||||
// END REWORK
|
||||
|
||||
|
||||
@@ -15,11 +15,8 @@
|
||||
height: 100%;
|
||||
display: inline-block;
|
||||
border-radius: 4px;
|
||||
background: darken($ui-primary-color, 14%);
|
||||
|
||||
&.leading {
|
||||
background: $ui-highlight-color;
|
||||
}
|
||||
background: rgba($gab-placeholder-accent, .3);
|
||||
&.leading {background: rgba($gab-placeholder-accent, .6);}
|
||||
}
|
||||
|
||||
&__text {
|
||||
@@ -31,7 +28,7 @@
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
color: #fff;
|
||||
input[type=radio],
|
||||
input[type=checkbox] {
|
||||
display: none;
|
||||
|
||||
@@ -2,41 +2,35 @@
|
||||
// Content containers are meant to behave much differently than the mastodon default UI
|
||||
// For now linking default gab colors to replace the base UI colors and formulas
|
||||
|
||||
html {
|
||||
scrollbar-color: lighten($gab-background-container, 4%) $gab-background-container;
|
||||
}
|
||||
|
||||
html {scrollbar-color: lighten($gab-background-container, 4%) $gab-background-container;}
|
||||
::-webkit-scrollbar {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: lighten($gab-background-container, 4%);
|
||||
border: none;
|
||||
border: none;
|
||||
background: rgba($gab-placeholder-accent, .5);
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-container-light, .3);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: lighten($gab-background-container, 6%);
|
||||
background: rgba($gab-placeholder-accent, .75);
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-container-light, .4);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:active {
|
||||
background: lighten($gab-background-container, 4%);
|
||||
background: $gab-placeholder-accent;
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-container-light, .5);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
border: none;
|
||||
background: $gab-background-container;
|
||||
border: none;
|
||||
background: rgba($gab-background-container, .5);
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-base, .3);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track:hover {
|
||||
background: lighten($gab-background-container, 4%);
|
||||
background: rgba($gab-background-container, .75);
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-base, .4);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track:active {
|
||||
background: $gab-background-container;
|
||||
background: $gab-background-container;
|
||||
@at-root body.theme-gabsocial-light#{&} {background: rgba($gab-background-base, .5);}
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-corner {
|
||||
background: transparent;
|
||||
}
|
||||
::-webkit-scrollbar-corner {background: transparent;}
|
||||
Reference in New Issue
Block a user