remove scss file which should not be here after merge

This commit is contained in:
Audric Ackermann 2020-01-16 12:36:46 +11:00
parent adae5b6bf0
commit 396c2fa0d6
3 changed files with 81 additions and 520 deletions

View File

@ -1,6 +1,7 @@
$session-compose-margin: 20px;
.module-conversation-list-item {
transition: $session-transition-duration;
@at-root .light-theme #{&} {
@include session-dark-background-lighter;
&:hover {
@ -23,7 +24,7 @@ $session-compose-margin: 20px;
.module-conversation {
&-list-item {
&--has-unread {
border-left: 4px solid $session-color-green !important;
border-left: $session-element-border-green !important;
}
&__unread-count {
@ -146,9 +147,18 @@ $session-compose-margin: 20px;
.module-avatar,
.session-icon-button {
margin: 30px auto 30px auto;
cursor: pointer;
padding: 30px;
&:last-child {
margin: auto auto 30px auto;
margin: auto auto 0px auto;
/* Hide theme icon until light theme is ready */
display: none;
}
&:first-child {
padding: 0;
margin: 30px auto;
}
}
}
@ -156,7 +166,7 @@ $session-compose-margin: 20px;
&__header {
display: flex;
flex-direction: row;
padding: 28px 7px 28px 0px;
margin: 15px 7px 14px 0px;
@at-root .light-theme #{&} {
background-color: $session-color-white;
@ -184,10 +194,16 @@ $session-compose-margin: 20px;
cursor: pointer;
padding-right: $session-margin-sm;
padding-left: $session-margin-sm;
transition: $session-transition-duration;
}
&__list {
height: -webkit-fill-available;
&-popup {
width: -webkit-fill-available;
height: -webkit-fill-available;
position: absolute;
}
}
&-compose {
@ -197,7 +213,11 @@ $session-compose-margin: 20px;
@at-root .dark-theme #{&} {
@include session-dark-background-lighter;
}
}
&-overlay {
background: linear-gradient(180deg, #171717 0%, #121212 100%);
box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5);
display: flex;
flex-direction: column;
align-items: center;
@ -269,6 +289,7 @@ $session-compose-margin: 20px;
width: -webkit-fill-available;
flex-shrink: 0;
user-select: all;
overflow: hidden;
}
.session-button {
@ -279,11 +300,27 @@ $session-compose-margin: 20px;
}
}
}
.module-search-results {
flex-grow: 1;
}
.module-conversations-list-content {
overflow-x: hidden;
display: flex;
flex-direction: column;
flex-grow: 1;
}
.session-left-pane-section-content {
display: flex;
flex-direction: column;
flex-grow: 1;
}
.user-search-dropdown {
width: 100%;
flex-grow: 1;
overflow-y: scroll;
overflow-y: auto;
}
.session-search-input {
@ -292,6 +329,7 @@ $session-compose-margin: 20px;
margin-right: 1px;
margin-bottom: 10px;
display: inline-flex;
flex-shrink: 0;
@at-root .light-theme #{&} {
color: $session-color-black;
@ -327,26 +365,9 @@ $session-compose-margin: 20px;
}
}
.session-logo {
&-128 {
@include session-filter-color-green();
width: 128px;
height: 128px;
}
&-text {
font-size: 70px;
font-weight: bold;
margin: 0px;
font-family: $session-font-family;
@at-root .light-theme #{&} {
color: $session-color-black;
}
@at-root .dark-theme #{&} {
color: $session-color-white;
}
}
.session-full-logo {
width: 250px;
height: 250px;
}
.app-loading-screen {
@ -428,12 +449,12 @@ $session-compose-margin: 20px;
text-align: center;
border-radius: 50%;
font-weight: bold;
cursor: pointer;
transition: $session-transition-duration;
@at-root .light-theme #{&} {
color: $session-color-white;
}
@at-root .dark-theme #{&} {
color: $session-color-black;
color: $session-color-white;
&:hover {
filter: brightness(80%);
}
}
@ -442,8 +463,14 @@ $session-compose-margin: 20px;
&-content {
display: flex;
flex-direction: column;
flex-grow: 1;
.module-conversation-list-item {
&--has-friend-request {
&:first-child {
border-top: none !important;
}
border: 1px solid $session-shade-8 !important;
.module-conversation__user__profile-number,
@ -466,6 +493,10 @@ $session-compose-margin: 20px;
}
}
&-content {
@include session-dark-background-lighter;
}
&-bottom-buttons {
@include bottom-buttons();
}
@ -489,9 +520,9 @@ $session-compose-margin: 20px;
align-items: center;
height: 74px;
line-height: 1.4;
padding: 0px 12px;
flex-shrink: 0;
@include session-dark-background;
cursor: pointer;
transition: $session-transition-duration !important;
@ -544,9 +575,26 @@ $session-compose-margin: 20px;
fill: $session-color-green;
}
}
.session-button.square-outline.square.green,
.session-button.square-outline.square.white {
flex-grow: 1;
border: 1px solid $session-shade-8;
height: 50px;
line-height: 50px;
}
}
}
.friend-request-title {
font-weight: bold;
font-size: 13px;
padding: 11px;
border-right: 1px solid #2f2f2f !important;
border-top: 1px solid #2f2f2f !important;
border-left: 1px solid #2f2f2f !important;
@include session-dark-background-lighter;
}
.panel-text-divider {
width: 100%;
text-align: center;
@ -557,7 +605,7 @@ $session-compose-margin: 20px;
span {
padding: 5px 10px;
border-radius: 50px;
background-color: $session-shade-18;
background-color: #121212;
color: $session-color-light-grey;
border: 1px solid $session-color-dark-grey;
}

View File

@ -1,486 +0,0 @@
$session-compose-margin: 20px;
.dark-theme {
.module-conversation-list-item {
@include session-dark-background-lighter;
transition: $session-transition-duration;
&:hover {
@include session-dark-background-hover;
}
}
.gutter {
width: 380px !important;
background: none !important;
padding-right: 5px !important;
}
.module-conversation {
&-list-item {
&--has-unread {
border-left: $session-element-border-green !important;
}
&__unread-count {
color: $color-white !important;
background-color: $session-shade-10 !important;
position: static !important;
font-weight: 700 !important;
box-shadow: none !important;
margin: 0 !important;
}
&__header__date,
&__header__date--has-unread {
flex-grow: 1 !important;
text-align: end !important;
}
&__message__text {
color: $session-shade-17;
&--has-unread {
color: $session-color-white !important;
}
}
&__header__name {
flex-grow: 0 !important;
padding-right: 5px !important;
color: $session-shade-17;
}
&__header__name--with-unread .module-conversation__user__profile-number,
&__header__name--with-unread .module-conversation__user__profile-name {
color: $session-color-white;
}
}
&__user__profile {
&-number,
&-name {
color: $session-shade-17;
font-size: 15px;
}
}
}
.module-conversation-list-item--is-selected {
background-color: $color-dark-70;
.module-conversation__user__profile-number,
.module-conversation__user__profile-name,
.module-conversation-list-item__message__text {
color: $session-color-white;
}
}
}
.module-left-pane {
border-right: none !important;
width: 300px;
height: -webkit-fill-available;
background: $session-shade-4 !important;
&-session {
display: flex;
}
&__sections-container {
height: -webkit-fill-available;
width: 80px;
display: inline-flex;
flex-direction: column;
.module-avatar,
.session-icon-button {
cursor: pointer;
padding: 30px;
&:last-child {
margin: auto auto 0px auto;
/* Hide theme icon until light theme is ready */
display: none;
}
&:first-child {
padding: 0;
margin: 30px auto;
}
}
}
&__header {
display: flex;
flex-direction: row;
margin: 15px 7px 14px 0px;
.session-button {
margin-left: auto;
}
}
&__title {
cursor: pointer;
padding-right: $session-margin-sm;
padding-left: $session-margin-sm;
transition: $session-transition-duration;
}
&__list {
&-popup {
width: -webkit-fill-available;
height: -webkit-fill-available;
position: absolute;
}
}
&-overlay {
background: linear-gradient(180deg, #171717 0%, #121212 100%);
box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5);
display: flex;
flex-direction: column;
align-items: center;
height: -webkit-fill-available;
.session-icon .exit {
padding: 13px;
}
h3,
h2 {
text-align: center;
}
h3 {
padding-top: 22px;
}
h4 {
text-transform: uppercase;
}
&-border-container {
width: -webkit-fill-available;
position: relative;
margin-bottom: 50px;
.green {
position: absolute;
color: $session-color-green;
background-color: $session-color-green;
height: 6px;
width: 130px;
left: 50%;
margin-left: -65px;
top: 50%;
margin-top: 6px;
border: none;
}
.white {
position: absolute;
color: none;
height: 1px;
width: -webkit-fill-available;
opacity: 0.3;
}
}
.exit {
margin-top: 10px;
margin-left: 13px;
align-self: flex-start;
}
.session-search-input {
margin: 10px $session-compose-margin 0 $session-compose-margin;
width: -webkit-fill-available;
}
.module-search-results {
width: -webkit-fill-available;
}
.session-description-long {
font-size: 14px;
margin: 0px 20px;
}
.session-id-editable {
margin: 0px 20px;
width: -webkit-fill-available;
flex-shrink: 0;
user-select: all;
overflow: hidden;
}
.session-button {
width: fit-content;
margin-top: auto;
margin-bottom: 16px;
flex-shrink: 0;
}
}
}
.module-search-results {
flex-grow: 1;
}
.module-conversations-list-content {
overflow-x: hidden;
display: flex;
flex-direction: column;
flex-grow: 1;
}
.session-left-pane-section-content {
display: flex;
flex-direction: column;
flex-grow: 1;
}
.user-search-dropdown {
width: 100%;
flex-grow: 1;
overflow-y: auto;
}
.session-search-input {
height: $session-search-input-height;
margin-right: 1px;
margin-bottom: 10px;
background: $session-shade-4;
color: $session-color-white;
display: inline-flex;
.session-icon-button {
margin: auto 10px;
}
input {
width: inherit;
height: inherit;
background: $session-shade-4;
color: $session-color-white;
border: none;
flex-grow: 1;
&:focus {
outline: none !important;
}
}
}
.session-full-logo {
width: 250px;
height: 250px;
}
.app-loading-screen {
@include session-dark-background;
}
@mixin bottom-buttons() {
display: flex;
flex-direction: row;
background-color: $session-shade-2;
.session-button.square-outline.square.green,
.session-button.square-outline.square.white,
.session-button.square-outline.square.danger {
flex-grow: 1;
border: 1px solid $session-shade-7;
height: 50px;
line-height: 50px;
}
}
.contacts-dropdown {
width: -webkit-fill-available;
&-row {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 8px 20px;
margin: 0px $session-compose-margin;
background: $session-shade-4;
color: $session-color-light-grey;
&-selected,
&:hover {
font-weight: bold;
color: $session-color-white;
background: $session-shade-8;
}
}
}
.contact-notification-count-bubble {
background: $session-color-danger;
line-height: 30px;
width: 30px;
height: 30px;
font-size: 14px;
margin-left: auto;
text-align: center;
border-radius: 50%;
color: $session-color-white;
font-weight: bold;
cursor: pointer;
transition: $session-transition-duration;
&:hover {
filter: brightness(80%);
}
}
.left-pane-contact {
&-section,
&-content {
display: flex;
flex-direction: column;
flex-grow: 1;
.module-conversation-list-item {
&--has-friend-request {
&:first-child {
border-top: none !important;
}
border: 1px solid $session-shade-8 !important;
.module-conversation__user__profile-number,
.module-conversation__user__profile-name {
font-size: 13px !important;
}
}
&__buttons {
display: flex;
.session-button {
font-size: 10px;
padding: 4px;
height: auto;
margin: 0px;
line-height: 10px;
}
}
}
}
&-content {
@include session-dark-background-lighter;
}
&-bottom-buttons {
@include bottom-buttons();
}
}
.left-pane-setting {
&-bottom-buttons {
@include bottom-buttons();
}
&-content,
&-section {
display: flex;
flex-direction: column;
}
&-category-list-item {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 74px;
line-height: 1.4;
padding: 0px 12px;
cursor: pointer;
transition: $session-transition-duration !important;
& > div {
display: block;
}
flex-shrink: 0;
@include session-dark-background;
&.active {
background-color: $session-shade-9;
}
&:hover {
background-color: $session-shade-7;
}
&__buttons {
display: flex;
.session-button {
font-size: 11px;
padding: 6px;
height: auto;
margin: 0px;
line-height: 14px;
}
}
}
&-input-group {
display: inline-flex;
}
&-input-button .session-button.square {
display: flex;
justify-content: center;
align-items: center;
height: $session-search-input-height;
width: $session-search-input-height;
padding: 0px;
margin: 0px;
svg {
transition: $session-transition-duration;
}
&:hover {
svg {
fill: $session-color-green;
}
}
.session-button.square-outline.square.green,
.session-button.square-outline.square.white {
flex-grow: 1;
border: 1px solid $session-shade-8;
height: 50px;
line-height: 50px;
}
}
}
.friend-request-title {
font-weight: bold;
font-size: 13px;
padding: 11px;
border-right: 1px solid #2f2f2f !important;
border-top: 1px solid #2f2f2f !important;
border-left: 1px solid #2f2f2f !important;
@include session-dark-background-lighter;
}
.panel-text-divider {
width: 100%;
text-align: center;
border-bottom: 1px solid $session-color-dark-grey;
line-height: 0.1em;
margin: 50px 0 50px;
span {
padding: 5px 10px;
border-radius: 50px;
background-color: #121212;
color: $session-color-light-grey;
border: 1px solid $session-color-dark-grey;
}
}

View File

@ -28,7 +28,6 @@
@import 'session_signin';
@import 'session_theme';
@import 'session_left_pane';
@import 'session_theme_dark_left_pane';
@import 'session_group_panel';
@import 'session-slider';