about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-25 15:48:20 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-25 15:48:20 +0200
commit693383234c68397c22bb94d1d93cb33c6a8ae939 (patch)
tree063fe3b2e7a2a8c0353a1542e26559a7c05d6fa1 /app/assets
parente9bc4a4a0822235afebbefa0c4d660b1be9ae52f (diff)
Improved style of settings page
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/components/features/account/components/action_bar.jsx4
-rw-r--r--app/assets/stylesheets/application.scss19
2 files changed, 20 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/account/components/action_bar.jsx b/app/assets/javascripts/components/features/account/components/action_bar.jsx
index 75b26775c..aa37d9238 100644
--- a/app/assets/javascripts/components/features/account/components/action_bar.jsx
+++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx
@@ -34,8 +34,8 @@ const ActionBar = React.createClass({
     }
 
     return (
-      <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px' }}>
-        {actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase' }}>{infoText}</span>
+      <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px', overflow: 'hidden', flex: '0 0 auto' }}>
+        {actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span>
       </div>
     );
   },
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index a444a2ff2..fd0e257a7 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -127,7 +127,23 @@ body {
     margin-bottom: 15px;
   }
 
-  input[type=text], input[type=email], input[type=password] {
+  .file-field {
+    padding: 15px 0;
+
+    label {
+      font-family: 'Roboto';
+      font-size: 16px;
+      color: #fff;
+      width: 100px;
+      display: inline-block;
+    }
+
+    input[type=file] {
+      width: 280px;
+    }
+  }
+
+  input[type=text], input[type=email], input[type=password], textarea {
     background: transparent;
     border: 0;
     border-bottom: 2px solid #9baec8;
@@ -137,6 +153,7 @@ body {
     display: block;
     width: 100%;
     outline: 0;
+    font-family: 'Roboto';
 
     &:invalid {
       box-shadow: none;