Commit deb9ed29 authored by mgabdev's avatar mgabdev

commit

parent 293c6502
......@@ -15,7 +15,6 @@ import { getLocale } from '../locales';
import initialState from '../initial_state';
import { me } from '../initial_state';
import ErrorBoundary from '../components/error_boundary';
// import { whyDidYouUpdate } from 'why-did-you-update';
import '../../styles/gabsocial/components.scss';
import '../../styles/gabsocial/components/buttons.scss';
......@@ -84,10 +83,6 @@ class GabSocialMount extends PureComponent {
}
// whyDidYouUpdate(React);
// whyDidYouUpdate(React, { groupByComponent: true, collapseComponentGroups: false });
// whyDidYouUpdate(React, { exclude: [/^Connect|Link|NavLink|Route/] });
export default class GabSocial extends PureComponent {
static propTypes = {
......
......@@ -58,16 +58,6 @@
}
}
.getting-started__footer a {
text-decoration: underline;
&:hover,
&:focus,
&:active {
text-decoration: none;
}
}
.nothing-here {
color: $darker-text-color;
}
......
......@@ -5,7 +5,7 @@
.button {
color: $white;
&.button-alternative-2 {
&.button--alternative-2 {
color: $white;
}
}
......@@ -79,7 +79,7 @@
}
.detailed-status,
.detailed-status__action-bar {
.detailed-status-action-bar {
background: darken($ui-base-color, 6%);
}
......@@ -214,7 +214,6 @@
}
// Change the default color used for the text in an empty column or on the error column
.empty-column-indicator,
.error-column {
color: $primary-text-color;
background: $white;
......@@ -317,7 +316,7 @@
}
}
.account__section-headline a.active::after {
.account-section-headline a.active::after {
border-color: transparent transparent $white;
}
......
// NEW GAB SPECIFIC MIXINS
// THEME MIXINS
// standard container drop shadow
@mixin light-theme-shadow() {box-shadow: 0 0 6px 0 rgba(0,0,0,0.1);}
// common properties for all standard containers
@mixin gab-container-standards() {
border-radius: 10px;
background: $gab-background-container;
body.theme-gabsocial-light & {
@include light-theme-shadow();
background: $gab-background-container-light;
}
}
// SHORTCUTS
@mixin input-placeholder($color) {
&::-webkit-input-placeholder {color: $color;}
&::-moz-placeholder {color: $color;}
&:-ms-input-placeholder {color: $color;}
&:-moz-placeholder {color: $color;}
}
// OLDER MIXINS
@mixin avatar-radius() {
border-radius: 50%;
background: transparent no-repeat;
background-position: 50%;
background-clip: padding-box;
}
@mixin avatar-size($size:48px) {
width: $size;
height: $size;
background-size: $size $size;
}
@mixin search-input() {
outline: 0;
box-sizing: border-box;
width: 100%;
border: 1px $gab-placeholder-accent solid;
box-shadow: none;
font-family: inherit;
background: $gab-background-container;
color: $gab-text-highlight;
@include font-size(16);
@include line-height(19);
margin: 0;
border-radius: 4px;
// Chrome does not like these concatinated together
&::placeholder {color: $gab-placeholder-accent;}
&:-ms-input-placeholder {color: $gab-placeholder-accent;}
&::-ms-input-placeholder{color: $gab-placeholder-accent;}
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
}
@mixin search-popout() {
background: $gab-background-container;
border-radius: 4px;
border: 1px solid $gab-placeholder-accent;
padding: 8px 10px 17px 10px;
margin: 4px 0 0 0;
@include font-size(12);
@include line-height(14);
@include font-weight(normal);
color: $gab-secondary-text;
box-shadow: 0 0 6px 0 rgba(0,0,0,0.5);
h4 {
color: #fff;
@include font-size(14);
@include line-height(16);
@include font-weight(bold);
}
ul {
margin: 6px 0 6px;
li {
margin: 0 0 2px 0;
em {color: $gab-text-highlight;}
}
}
}
This diff is collapsed.
.card {
& > a {
&>a {
display: block;
text-decoration: none;
color: inherit;
......@@ -26,14 +26,14 @@
img {
display: block;
width: 100%;
height: 100%;
margin: 0;
object-fit: cover;
border-radius: 4px 4px 0 0;
@include size(100%);
}
@media screen and (max-width: 600px) {
@include breakpoint(sm) {
height: 200px;
}
......@@ -45,30 +45,29 @@
&__bar {
position: relative;
padding: 15px;
display: flex;
justify-content: flex-start;
align-items: center;
background: lighten($ui-base-color, 4%);
border-radius: 0 0 4px 4px;
@include flex(flex-start, center);
@media screen and (max-width: $no-gap-breakpoint) {
border-radius: 0;
}
.avatar {
flex: 0 0 auto;
width: 48px;
height: 48px;
padding-top: 2px;
@include size(48px);
img {
width: 100%;
height: 100%;
display: block;
margin: 0;
border-radius: 4px;
background: darken($ui-base-color, 8%);
object-fit: cover;
@include size(100%);
}
}
......@@ -77,20 +76,18 @@
text-align: left;
strong {
font-size: 15px;
color: $primary-text-color;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
@include text-overflow;
@include text-sizing(15px, 500);
}
span {
display: block;
font-size: 14px;
color: $gab-secondary-text;
font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
@include text-overflow;
@include text-sizing(14px, 400);
}
}
}
......@@ -107,12 +104,12 @@
.older,
.page,
.gap {
font-size: 14px;
color: $primary-text-color;
font-weight: 500;
display: inline-block;
padding: 6px 10px;
text-decoration: none;
@include text-sizing(14px, 500);
}
.current {
......@@ -176,17 +173,14 @@
background: $ui-base-color;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
color: $gab-secondary-text;
font-size: 14px;
font-weight: 500;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
cursor: default;
border-radius: 4px;
padding: 20px;
min-height: 30vh;
@include flex(center, center);
@include text-sizing(14px, 500, 1, center);
&--under-tabs {
border-radius: 0 0 4px 4px;
}
......@@ -201,13 +195,11 @@
display: inline-block;
padding: 4px 6px;
cursor: default;
border-radius: 3px;
font-size: 12px;
line-height: 12px;
font-weight: 500;
color: $ui-secondary-color;
background-color: rgba($ui-secondary-color, 0.1);
border: 1px solid rgba($ui-secondary-color, 0.5);
@include text-sizing(12px, 500, 12px);
@include border-design(rgba($ui-secondary-color, 0.5), 1px, 3px);
&.moderator {
color: $success-green;
......@@ -228,8 +220,8 @@
border: 0 none;
border-top: 1px solid lighten($ui-base-color, 12%);
border-bottom: 1px solid lighten($ui-base-color, 12%);
font-size: 14px;
line-height: 20px;
@include text-sizing(14px, 400, 20px);
dl {
display: flex;
......@@ -239,12 +231,10 @@
dt,
dd {
box-sizing: border-box;
padding: 14px;
text-align: center;
max-height: 48px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@include text-overflow(nowrap);
@include text-sizing(14px, 400, 1, center);
}
dt {
......@@ -290,7 +280,7 @@
}
}
.directory__tag .trends__item__current {
.directory__tag .trending-item__uses {
width: auto;
}
......@@ -318,4 +308,4 @@
&__body {
margin-top: 10px;
}
}
}
\ No newline at end of file
......@@ -3,16 +3,16 @@ $sidebar-width: 240px;
$content-width: 840px;
.admin-wrapper {
display: flex;
justify-content: center;
height: 100%;
@include flex(center);
.sidebar-wrapper {
flex: 1 1 $sidebar-width;
height: 100%;
background: $ui-base-color;
display: flex;
justify-content: flex-end;
@include flex(flex-end);
}
.sidebar {
......@@ -24,12 +24,12 @@ $content-width: 840px;
.logo {
display: block;
margin: 40px auto;
width: 100px;
height: 100px;
@include size(100px);
}
@media screen and (max-width: $no-columns-breakpoint) {
& > a:first-child {
&>a:first-child {
display: none;
}
}
......@@ -93,7 +93,7 @@ $content-width: 840px;
}
}
& > ul > .simple-navigation-active-leaf a {
&>ul>.simple-navigation-active-leaf a {
border-radius: 4px 0 0 4px;
}
}
......@@ -105,49 +105,41 @@ $content-width: 840px;
.content {
max-width: $content-width;
padding: 20px 15px;
padding-top: 60px;
padding-left: 25px;
padding: 60px 15px 20px 25px;
@media screen and (max-width: $no-columns-breakpoint) {
max-width: none;
padding: 15px;
padding-top: 30px;
padding: 30px 15px 15px 15px;
}
h2 {
color: $secondary-text-color;
font-size: 24px;
line-height: 28px;
font-weight: 400;
padding-bottom: 40px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
margin-bottom: 40px;
@include text-sizing(24px, 400, 28px);
@include bottom-spacing(40px);
}
h3 {
color: $secondary-text-color;
font-size: 20px;
line-height: 28px;
font-weight: 400;
margin-bottom: 30px;
@include text-sizing(20px, 400, 28px);
}
h4 {
text-transform: uppercase;
font-size: 13px;
font-weight: 700;
color: $gab-secondary-text;
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
@include text-sizing(13px, 700);
@include bottom-spacing(8px);
}
h6 {
font-size: 16px;
color: $secondary-text-color;
line-height: 28px;
font-weight: 400;
@include text-sizing(16px, 400, 28px);
}
.fields-group h6 {
......@@ -155,8 +147,8 @@ $content-width: 840px;
font-weight: 500;
}
.directory__tag > a,
.directory__tag > div {
.directory__tag>a,
.directory__tag>div {
box-shadow: none;
}
......@@ -165,21 +157,20 @@ $content-width: 840px;
}
.directory__tag h4 {
font-size: 18px;
font-weight: 700;
color: $gab-secondary-text;
text-transform: none;
padding-bottom: 0;
margin-bottom: 0;
border-bottom: none;
@include text-sizing(18px, 700);
@include bottom-spacing(0);
}
& > p {
font-size: 14px;
line-height: 18px;
&>p {
color: $gab-secondary-text;
margin-bottom: 20px;
@include text-sizing(14px, 400, 18px);
strong {
color: $gab-secondary-text;
font-weight: 500;
......@@ -193,12 +184,12 @@ $content-width: 840px;
}
hr {
width: 100%;
height: 0;
border: 0;
border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
margin: 20px 0;
@include size(100%, 0);
&.spacer {
height: 1px;
border: 0;
......@@ -272,9 +263,9 @@ $content-width: 840px;
}
strong {
font-weight: 500;
text-transform: uppercase;
font-size: 12px;
@include text-sizing(12px, 500);
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
......@@ -288,10 +279,10 @@ $content-width: 840px;
color: $gab-secondary-text;
text-decoration: none;
text-transform: uppercase;
font-size: 12px;
font-weight: 500;
border-bottom: 2px solid $gab-secondary-text;
@include text-sizing(12px, 500);
&:hover {
color: $primary-text-color;
border-bottom: 2px solid lighten($gab-secondary-text, 5%);
......@@ -317,14 +308,13 @@ $content-width: 840px;
flex-direction: column;
margin: 0 5px;
& > strong {
&>strong {
display: block;
margin: 0 0 10px -5px;
font-weight: 500;
font-size: 14px;
line-height: 18px;
color: $secondary-text-color;
@include text-sizing(14px, 500, 18px);
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
......@@ -420,15 +410,14 @@ $content-width: 840px;
line-height: 20px;
&__header {
display: flex;
justify-content: flex-start;
align-items: center;
padding: 10px;
background: $ui-base-color;
color: $darker-text-color;
border-radius: 4px 4px 0 0;
font-size: 14px;
position: relative;
@include flex(flex-start, center);
}
&__avatar {
......@@ -437,9 +426,8 @@ $content-width: 840px;
.avatar {
display: block;
margin: 0;
border-radius: 50%;
width: 40px;
height: 40px;
@include circle(40px);
}
}
......@@ -473,12 +461,8 @@ $content-width: 840px;
}
&__icon__overlay {
position: absolute;
top: 10px;
right: 10px;
width: 10px;
height: 10px;
border-radius: 50%;
@include circle(10px);
@include abs-position(10px, 10px);
&.positive {
background: $success-green;
......@@ -575,13 +559,11 @@ a.name-tag,
}
&__bubble {
padding: 16px;
padding-left: 14px;
font-size: 15px;
line-height: 20px;
padding: 16px 16px 16px 14px;
border-radius: 4px 4px 4px 0;
position: relative;
font-weight: 500;
@include text-sizing(15px, 500, 20px);
a {
color: $darker-text-color;
......@@ -589,8 +571,7 @@ a.name-tag,
}
&__owner {
padding: 8px;
padding-left: 12px;
padding: 8px 8px 8px 12px;
}
time {
......@@ -604,11 +585,10 @@ a.name-tag,
margin-bottom: 20px;
&__profile {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px;
@include flex(space-between, center);
.account {
padding: 0;
border: 0;
......@@ -644,10 +624,10 @@ a.name-tag,
&__summary {
&__item {
display: flex;
justify-content: flex-start;
border-top: 1px solid darken($ui-base-color, 4%);
@include flex(flex-start);
&:hover {
background: lighten($ui-base-color, 2%);
}
......@@ -662,9 +642,7 @@ a.name-tag,
&,
.username {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@include text-overflow(nowrap);
}
}
......@@ -692,15 +670,13 @@ a.name-tag,
}
.one-line {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@include text-overflow(nowrap);
}
.ellipsized-ip {
display: inline-block;
max-width: 120px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;
}
@include text-overflow;
}
\ No newline at end of file
@function hex-color($color) {
@if type-of($color) == 'color' {
@if type-of($color)=='color' {
$color: str-slice(ie-hex-str($color), 4);
}
@return '%23' + unquote($color)
@return '%23'+unquote($color)
}
html {
......@@ -15,16 +16,17 @@ html {
}
body {
@include font-size(16);
@include line-height(19);
font-size: 16px;
line-height: 19px;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-rendering: optimizelegibility;
font-feature-settings: "kern";
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
color: white;
background: $gab-background-base;
&.theme-gabsocial-light {
color: $gab-default-text-light;
background: $gab-background-base-light;
......@@ -82,18 +84,18 @@ body {
.container {
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;