Merge pull request #121 from atsid/116-117-style-improvements

#116/#117 style improvements
atsid · Mar 18, 2015 · 11a465b · 11a465b
2 parents 5170fac + 34eaff5
commit 11a465b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 21 deletions.
diff --git a/app/client/src/modules/app/index.js b/app/client/src/modules/app/index.js
@@ -20,9 +20,12 @@ module.exports =
         //load other app modules here, e.g.:
         //require('./account').name
     ])
-    .config(function ($urlRouterProvider, $httpProvider) {
+    .config(function ($urlRouterProvider, $httpProvider, $mdThemingProvider) {
         $urlRouterProvider.otherwise('/');
         $httpProvider.interceptors.push('authInterceptor');
+
+        $mdThemingProvider.theme('default')
+            .primaryPalette('light-blue');
     }).factory('authInterceptor', function ($q, $location) {
         return {
             responseError(response) {

diff --git a/app/client/src/styles/app.scss b/app/client/src/styles/app.scss
@@ -6,7 +6,7 @@
 @import "repos";
 @import "navbar";
 
-body {
+body, html {
     font-family: "Roboto", Helvetica Neue, Helvetica, Arial;
     font-size: 14px;
     margin: 0;
@@ -16,9 +16,14 @@ body {
 .github-permission {
     text-transform: uppercase;
     font-size: 11px;
-    margin-left: 8px;
-    padding-left: 14px;
+    margin-right: 6px;
+    text-align: right;
+    padding-right: 18px;
     background-image: url("assets/images/GitHub-Mark-32px.png");
     background-size: 12px 12px;
+    background-position: right;
     background-repeat: no-repeat;
-}
+    color: #000;
+    opacity: .25;
+    display: block;
+}
diff --git a/app/client/src/styles/navbar.scss b/app/client/src/styles/navbar.scss
@@ -1,6 +1,6 @@
 .navbar {
     text-align: center;
-    background: #2196F3;
+    background: rgb(3,169,244);
     color: #fff;
     margin-bottom: 10px;
     box-shadow: 0px 1px 2px rgba(0,0,0,.2);

diff --git a/app/client/src/styles/repo.scss b/app/client/src/styles/repo.scss
@@ -2,22 +2,23 @@
     margin-top: -1px;
     border-top: 1px solid #ddd;
     padding: 12px;
-    height: 75px;
     position: relative;
 
     &.repo_active {
-        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 #2196F3;
+        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 rgb(3,169,244);
         height: 400px;
         transition: height .25s;
     }
 
     &:hover {
+        cursor: pointer;
         z-index: 3;
-        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 #2196F3;
+        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 rgb(3,169,244);
     }
 
     .repo-container {
         display: flex;
+        min-height: 50px;
         align-items: center;
 
         .repo-details {
@@ -59,5 +60,10 @@
 }
 
 .repo-users {
-  background: #f9f9f9;
-}
+    background: #f9f9f9;
+
+    .user:hover {
+        box-shadow: none;
+        cursor: default;
+    }
+}
diff --git a/app/client/src/styles/repos.scss b/app/client/src/styles/repos.scss
@@ -1,6 +1,6 @@
 .repos {
     background: #fff;
-    width: 600px;
+    max-width: 600px;
     margin: auto;
     border: 1px solid #ddd;
     border-radius: 4px;

diff --git a/app/client/src/styles/user.scss b/app/client/src/styles/user.scss
@@ -2,30 +2,35 @@
     margin-top: -1px;
     border-top: 1px solid #ddd;
     padding: 12px;
-    height: 75px;
     position: relative;
 
     &.user_active {
-        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 #2196F3;
+        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 rgb(3,169,244);
         height: 400px;
         transition: height .25s;
     }
 
     &:hover {
+        cursor: pointer;
         z-index: 3;
-        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 #2196F3;
+        box-shadow: 0px 0px 15px rgba(0,0,0,.3), -4px 0 0 rgb(3,169,244);
     }
 
     .user-container {
         display: flex;
         align-items: center;
+        min-height: 50px;
 
         .user-details {
             flex: 1;
             padding-left: 12px;
         }
 
         .user-details-username {
+            color: #808080;
+        }
+
+        .user-details-name {
             font-weight: 600;
             margin-bottom: 6px;
 
@@ -34,10 +39,6 @@
             }
         }
 
-        .user-details-name {
-            color: #808080;
-        }
-
         .user-details-edit-permissions {
             color: #808080;
             margin-right: 8px;
@@ -60,4 +61,9 @@
 
 .user-repos {
     background: #f9f9f9;
-}
+
+    .repo:hover {
+        box-shadow: none;
+        cursor: default;
+    }
+}
diff --git a/app/client/src/styles/users.scss b/app/client/src/styles/users.scss
@@ -1,6 +1,6 @@
 .users {
     background: #fff;
-    width: 600px;
+    max-width: 600px;
     margin: auto;
     border: 1px solid #ddd;
     border-radius: 4px;