random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'styling/styling-updates' into 'develop' 

Fixed column margins (again) debugged the bouncing effect on mobile / finished desktop edit and create groups forms.

See merge request gab/social/gab-social!21
This commit is contained in:
Rob Colbert 2019-07-25 04:35:31 +00:00
parent 8346ff08ac ce3cefa1cb
commit fc4f3f2831
6 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/gabsocial/features/groups/create/index.js
View File

@ -95,7 +95,7 @@ class Create extends React.PureComponent {
</div>
<div>
<label htmlFor='group_cover_image' className={classNames('group-form__file-label', { 'group-form__file-label--selected': coverImage !== null })}>
<Icon id='camera' /> {intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
{intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
</label>
<input
type='file'

2
app/javascript/gabsocial/features/groups/edit/index.js
View File

@ -128,7 +128,7 @@ class Edit extends React.PureComponent {
<div>
<label htmlFor='group_cover_image' className={classNames('group-form__file-label', { 'group-form__file-label--selected': coverImage !== null })}>
<Icon id='camera' /> {intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
{intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
</label>
<input

BIN
app/javascript/images/sprite-post-functions.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

14
app/javascript/styles/gabsocial/components.scss
View File

@ -1310,22 +1310,26 @@ a.account__display-name {
}
&__inner {
width: 285px;
width: 265px;
pointer-events: auto;
height: 100%;
}
}
&__main {
display: flex;
flex-direction: column;
box-sizing: border-box;
width: 100%;
max-width: 600px;
display: flex;
flex-direction: column;
@media screen and (min-width: 360px) {
padding: 0 20px;
@media screen and (max-width: 375px) {
padding: 0 10px;
}
@media screen and (min-width: 895px) {
margin: 0 20px;
padding: 0;
}
}
}
}

37
app/javascript/styles/gabsocial/components/group-form.scss
View File

@ -1,6 +1,12 @@
.group-form {
padding: 20px;
@include gab-container-standards();
&,
div {
box-sizing: border-box;
float: left;
width: 100%;
}
input[type=text],
textarea {
&.standard {
@ -8,18 +14,31 @@
margin: 0 0 10px;
}
}
textarea {height: 88px;}
textarea {
float: left;
height: 88px;
}
.group-form__file-label {
font-size: 13px;
color: $secondary-text-color;
cursor: pointer;
&:hover {color: $primary-text-color;}
.fa {
font-size: 18px;
margin-right: 5px;
transform: translatey(2px);
display: block;
box-sizing: border-box;
float: left;
height: 20px;
padding: 3px 0 0 33px;
@include font-size(12);
@include font-weight(light);
color: $gab-secondary-text;
background-repeat: no-repeat;
background-image: url('../images/sprite-post-functions.png');
background-size: 100px 1200px;
&:hover {
color: $gab-brand-default;
background-position: 0 -100px;
}
&.group-form__file-label--selected {
background-position: 0 -100px;
color: $gab-brand-default;;
}
&.group-form__file-label--selected {color: $primary-text-color;}
}
.group-form__file {
width: 1px;

2
app/javascript/styles/gabsocial/components/user-panel.scss
View File

@ -1,6 +1,6 @@
.user-panel {
display: flex;
width: 285px;
width: 265px;
flex-direction: column;
overflow-y: hidden;
@include gab-container-standards();