From 32ab97ec66ecf79cbd050a4c07ab080c3d636b03 Mon Sep 17 00:00:00 2001 From: Brian Mathews Date: Mon, 16 Mar 2015 17:16:36 -0700 Subject: [PATCH] (#116/#117) - Improves styling of user/repo lists and permission buttons --- app/client/src/modules/app/index.js | 4 +++- app/client/src/styles/app.scss | 13 +++++++++---- app/client/src/styles/navbar.scss | 2 +- app/client/src/styles/repo.scss | 16 +++++++++++----- app/client/src/styles/repos.scss | 2 +- app/client/src/styles/user.scss | 22 ++++++++++++++-------- app/client/src/styles/users.scss | 2 +- 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/app/client/src/modules/app/index.js b/app/client/src/modules/app/index.js index d6c33dc..471e470 100755 --- a/app/client/src/modules/app/index.js +++ b/app/client/src/modules/app/index.js @@ -20,6 +20,8 @@ module.exports = //load other app modules here, e.g.: //require('./account').name ]) - .config(function ($urlRouterProvider) { + .config(function ($urlRouterProvider, $mdThemingProvider) { $urlRouterProvider.otherwise('/'); + $mdThemingProvider.theme('default') + .primaryPalette('light-blue'); }); diff --git a/app/client/src/styles/app.scss b/app/client/src/styles/app.scss index 4615239..a8343c9 100755 --- 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; -} \ No newline at end of file + color: #000; + opacity: .25; + display: block; +} diff --git a/app/client/src/styles/navbar.scss b/app/client/src/styles/navbar.scss index 60e11c5..7984d5b 100644 --- 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 index 60c9837..64fc051 100644 --- 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; -} \ No newline at end of file + 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 index 9086b2f..8516e41 100644 --- 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 index 725f4b7..89b6660 100644 --- a/app/client/src/styles/user.scss +++ b/app/client/src/styles/user.scss @@ -2,23 +2,24 @@ 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; @@ -26,6 +27,10 @@ } .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; -} \ No newline at end of file + + .repo:hover { + box-shadow: none; + cursor: default; + } +} diff --git a/app/client/src/styles/users.scss b/app/client/src/styles/users.scss index bc1ef7a..06a2414 100644 --- 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;