Merge pull request #2296 from ethcore/jg-container-spacing

update container spacing
openethereum · Sep 23, 2016 · 81e2ad7 · 81e2ad7
2 parents 7cfbd3a + c9362b6
commit 81e2ad7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/js/src/ui/Actionbar/actionbar.css b/js/src/ui/Actionbar/actionbar.css
@@ -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;
 }

diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css
@@ -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 {

diff --git a/js/src/ui/Page/page.css b/js/src/ui/Page/page.css
@@ -15,5 +15,5 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 .layout {
-  padding: 0 3em;
+  padding: 0;
 }
diff --git a/js/src/views/Accounts/List/list.css b/js/src/views/Accounts/List/list.css
@@ -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 {

diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
@@ -56,7 +56,7 @@ export default class List extends Component {
 
       return (
         <div
-          className={ styles.account }
+          className={ styles.item }
           key={ address }>
           <Summary
             link={ link }

diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css
@@ -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 {

diff --git a/js/src/views/Dapps/dapps.css b/js/src/views/Dapps/dapps.css
@@ -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;
 }
diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css
@@ -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 {
@@ -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 {