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

update container spacing #2296

Merged
merged 8 commits into from
Sep 23, 2016
+16 −18
Merged

update container spacing #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a5e1b7
spacing for accounts, contact & contracts consistent
jacogr Sep 23, 2016
d0795a5
update status padding/marging for consistency with the rest
jacogr Sep 23, 2016
e35af6d
actualbar with thin border
jacogr Sep 23, 2016
54b931a
containers & list with thin borders
jacogr Sep 23, 2016
4845e1b
dapps layou conforms to other lists
jacogr Sep 23, 2016
e3002b5
adjust status padding (slightly non-standard for look-good purposes)
jacogr Sep 23, 2016
5400a03
update paritybar with thin borders
jacogr Sep 23, 2016
c9362b6
slight updates to overall statusbar
jacogr Sep 23, 2016
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
2 changes: 1 addition & 1 deletion js/src/ui/Actionbar/actionbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
.actionbar {
padding: 0 24px !important;
margin-bottom: 1.5em;
margin-bottom: 0.25em;
height: auto !important;
background: rgba(0, 0, 0, 0.25) !important;
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/ui/Container/container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.container {
padding: 0em 1em 1em 1em;
padding: 0em 0.25em 0.25em 0.25em;
}

.padded {
Expand Down
2 changes: 1 addition & 1 deletion js/src/ui/Page/page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.layout {
padding: 0 3em;
padding: 0;
}
11 changes: 6 additions & 5 deletions js/src/views/Accounts/List/list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@
flex-wrap: wrap;
}

.account {
.item {
flex: 0 1 50%;
width: 50%;
position: relative;
margin: 0;
}

.account:nth-child(odd)>div {
padding-right: 0.5em !important;
.item:nth-child(odd)>div {
padding-right: 0.125em;
}

.account:nth-child(even)>div {
padding-left: 0.5em !important;
.item:nth-child(even)>div {
padding-left: 0.125em;
}

.empty {
Expand Down
2 changes: 1 addition & 1 deletion js/src/views/Accounts/List/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class List extends Component {

return (
<div
className={ styles.account }
className={ styles.item }
key={ address }>
<Summary
link={ link }
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Application/Status/status.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
*/
.status {
clear: both;
padding: 1em;
margin: 1em 0;
padding: 0.25em 0.5em 1.5em 0.5em;
text-align: right;
opacity: 0.75;
color: #ddd;
}

.title {
Expand Down
4 changes: 2 additions & 2 deletions js/src/views/Dapps/dapps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
}

.contract:nth-child(odd)>div {
padding-right: 0.5em !important;
padding-right: 0.125em !important;
}

.contract:nth-child(even)>div {
padding-left: 0.5em !important;
padding-left: 0.125em !important;
}
6 changes: 2 additions & 4 deletions js/src/views/ParityBar/parityBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@
.expanded {
right: 16px;
width: 964px;
height: 292px;
height: 296px;
border-radius: 4px 4px 0 0;
overflow-y: scroll;
}

.expanded .content {
padding: 0;
margin: 0 -1em;
}

.corner {
Expand Down Expand Up @@ -98,7 +96,7 @@
height: 36px;
padding: 0.5em 1em;
background: rgba(0, 0, 0, 0.25);
margin-bottom: 0;
margin-bottom: 0.25em;
}

.header:after {
Expand Down