Skip to content
This repository was archived by the owner on Nov 10, 2020. It is now read-only.

Several UI fixes #136

Merged
merged 25 commits into from
Aug 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
887ad14
Fixed overflow issues
DRSDavidSoft Aug 1, 2017
37b24b2
Added a fade effect instead of immediate cut
DRSDavidSoft Aug 1, 2017
d02f88a
Modified excessive use of box-shadow in item cards
DRSDavidSoft Aug 1, 2017
0f93b74
Modified user_compact
DRSDavidSoft Aug 1, 2017
8f51bb2
Tuned log out button's position
DRSDavidSoft Aug 1, 2017
ba6abc7
Removed unnecessary margin
DRSDavidSoft Aug 1, 2017
21f01fa
Tuned spacing to meet the description requirements
DRSDavidSoft Aug 1, 2017
2ced05c
Added box-shadow to user-card
DRSDavidSoft Aug 1, 2017
c7e72dd
Fixes the close icon `x`
DRSDavidSoft Aug 1, 2017
cd0f64d
Merge pull request #1 from DRSDavidSoft/patch-1
DRSDavidSoft Aug 1, 2017
f178ffc
Updated login.js
DRSDavidSoft Aug 1, 2017
491319a
Tuned user-card spacing
DRSDavidSoft Aug 1, 2017
cb678de
Added a relative position to item_container
DRSDavidSoft Aug 1, 2017
69e51c1
Added padding
DRSDavidSoft Aug 1, 2017
d6cda23
Fixed `react/jsx-first-prop-new-line` issue
DRSDavidSoft Aug 2, 2017
c4b06a8
Fixed `no-trailing-spaces`
DRSDavidSoft Aug 2, 2017
028e14b
Changed pixel unit to rem
DRSDavidSoft Aug 3, 2017
e1004f5
Changed `left` property according to review request
DRSDavidSoft Aug 3, 2017
5bac778
Added `user-select: none` to bottom container
DRSDavidSoft Aug 3, 2017
c23a557
Merge branch 'master' into master
tahnik Aug 6, 2017
02fe1e8
Restoring column styles. Moving from rem to px is not a good idea
tahnik Aug 6, 2017
91420c9
Made the items_container bigger as @DRSDavidSoft suggested
tahnik Aug 6, 2017
cf8a773
Not sure why you're doing this. This is causing the scroll bar to be …
tahnik Aug 6, 2017
08e477f
Box shadow has been verified by other tester. Let's not change it
tahnik Aug 6, 2017
b73ca8c
Updated package version
tahnik Aug 6, 2017
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
1 change: 1 addition & 0 deletions app/src/main/res/css/modules/bottom_bar.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.bottom_bar_container
user-select: none
font-size: 1.5rem
display: flex
align-items: center
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/css/modules/column.sass
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
.column
height: 100vh
overflow: hidden
margin: 0 1rem
margin: 0 0.5rem
width: 100%
display: flex
flex-direction: column
Expand All @@ -52,7 +52,7 @@
transform: translateZ(0)
-webkit-transform: translateZ(0)
padding: 0rem 0rem 1rem 0rem
height: calc(100vh - 2.8rem - 1.5rem)
height: calc(100vh - 2.8rem)
.column_topbar
height: 30px
overflow: hidden
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/css/modules/common.sass
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,13 @@ body
display: flex
justify-content: center
height: 100%
&:after
content: ''
position: absolute
left: 0
bottom: 0
width: 100%
background: linear-gradient(to top,#54556e 0%,rgba(0,0,0,0) 100%)

.fade-enter
opacity: 0.01
Expand Down
15 changes: 8 additions & 7 deletions app/src/main/res/css/modules/compact_user_card.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

.user_compact
//background: url(./../images/empty_avatar.png)
background-size: 100% 100% !important
background-size: cover !important
background-repeat: no-repeat !important
position: relative
display: flex
align-items: center
justify-content: center
flex-direction: column
padding: 1rem
padding-bottom: 2rem
.user_bg_tint
position: absolute
top: 0px
Expand Down Expand Up @@ -51,8 +52,8 @@
cursor: pointer
.logout
position: absolute
bottom: 5px
left: 10px
bottom: 0.25rem
left: 0.5rem
font-size: 1.5rem
z-index: 300
display: flex
Expand All @@ -63,12 +64,12 @@
i
text-shadow: 0px 0px 4px rgba(0,0,0,0.4)
&:hover::after
margin-left: 0.2rem
margin-left: 0.4rem
opacity: 1
text-shadow: 0px 0px 4px rgba(0,0,0,0.4)
&::after
content: attr(data-text)
font-size: 1rem
margin-left: -1.4rem
font-size: 1.1rem
margin-left: -0.6rem
opacity: 0
transition: opacity 0.2s, margin-left 0.2s
transition: opacity 0.2s, margin-left 0.2s
2 changes: 1 addition & 1 deletion app/src/main/res/css/modules/item_card.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
margin-bottom: 1rem
border-radius: 3px
transition: all 0.2s ease
margin-right: 0.5rem
position: relative
margin-right: 0.5rem
.body_container
.top_container
font-family: 'Roboto', sans-serif
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/res/css/modules/user_card.sass
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
.user_card
position: absolute
width: 25rem
width: calc(100% - 2rem)
background-size: cover !important
background-repeat: no-repeat !important
padding: 1rem 1rem 0rem 1rem
box-shadow: 0 2px 0px rgba(0, 0, 0, 0.19), 0 3px 4px rgba(0, 0, 0, 0.23)
padding: 1rem 1rem 2rem 1rem
transform: translate(-1rem, -1rem)
z-index: 199
button
box-shadow: none
&:hover
box-shadow: none
&::before
&:before
content: " "
background: rgba(64, 65, 90, 0.9)
position: absolute
Expand All @@ -21,7 +22,8 @@
.close
position: absolute
width: 1.2rem
height: 1.3rem
height: 1.2rem
line-height: 1.3rem
right: 5px
top: 5px
border-radius: 100%
Expand All @@ -39,7 +41,8 @@
i
color: black
.user_openprofile
width: 27rem
position: absolute;
width: calc(100%)
transform: translateX(-1rem)
margin: 0px
text-shadow: 0px 0px 2px rgba(0,0,0,0.3)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "devrantron",
"version": "1.2.1",
"version": "1.2.2",
"main": "./app/build/app.js",
"description": "An open source cross platform desktop application for devRant",
"scripts": {
Expand Down