From 6af0e6297605d111598001dec9a6a5dac853186f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 19 Sep 2017 17:34:20 -0400 Subject: [PATCH] light skin for self hosted instances --- src/app/global/mainController.js | 1 + src/app/views/userLayout.html | 2 -- src/index.html | 2 +- src/less/theme.less | 1 + src/less/vault.less | 53 ++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js index 10998cae3d..dda5f1a85e 100644 --- a/src/app/global/mainController.js +++ b/src/app/global/mainController.js @@ -4,6 +4,7 @@ angular .controller('mainController', function ($scope, $state, authService, appSettings, toastr, $window, $document, cryptoService, $uibModal, apiService) { var vm = this; + vm.skinClass = appSettings.selfHosted ? 'skin-blue-light' : 'skin-blue'; vm.bodyClass = ''; vm.usingControlSidebar = vm.openControlSidebar = false; vm.searchVaultText = null; diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html index bf4258e865..ae61b05692 100644 --- a/src/app/views/userLayout.html +++ b/src/app/views/userLayout.html @@ -59,8 +59,6 @@
  • - - NEW Shared
    • diff --git a/src/index.html b/src/index.html index f9f2e2c469..09336e40a1 100644 --- a/src/index.html +++ b/src/index.html @@ -103,7 +103,7 @@ -
    diff --git a/src/less/theme.less b/src/less/theme.less index 20a8764623..78cb23159f 100644 --- a/src/less/theme.less +++ b/src/less/theme.less @@ -46,3 +46,4 @@ /* End AdminLTE */ @import "../../node_modules/admin-lte/build/less/skins/skin-blue.less"; +@import "../../node_modules/admin-lte/build/less/skins/skin-blue-light.less"; diff --git a/src/less/vault.less b/src/less/vault.less index d298d24230..4ba2be7e85 100644 --- a/src/less/vault.less +++ b/src/less/vault.less @@ -20,6 +20,39 @@ h1, h2, h3, h4, h5, h6, font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; } +body.skin-blue-light { + .main-header { + .logo { + .logo-variant(darken(@light-blue, 5%)); + } + } + + .sidebar-menu > li { + > a { + font-weight: normal; + } + + &:hover > a, &.active > a { + border-left-color: @light-blue; + font-weight: normal; + } + + &.header { + background: darken(@sidebar-light-hover-bg, 3%); + } + + > .treeview-menu { + background: #ffffff; + } + } +} + +body.skin-blue { + .content-wrapper, .main-footer { + border-left: 1px solid transparent; + } +} + .login-box, .register-box { width: 400px; margin: 4% auto; @@ -215,9 +248,7 @@ form div.validation-errors ul { } } } - /* Buttons */ - .btn-table { padding: 1px 5px; line-height: 1; @@ -259,9 +290,7 @@ form .btn .loading-icon { display: none; } } - /* Forms */ - .form-control { border-radius: 0 !important; } @@ -351,15 +380,11 @@ form .btn .loading-icon { font-size: @font-size-large; } } - /* Modals */ - .modal-footer { text-align: left; } - /* Tables */ - .table-selectable { td:not(.actions) { cursor: pointer; @@ -386,9 +411,7 @@ form .btn .loading-icon { display: none; } } - /* Callouts */ - .callout.callout-default { background-color: #fff; border-color: darken(@gray, 10%); @@ -420,9 +443,7 @@ form .btn .loading-icon { color: @btn-default-color; } } - /* Alerts */ - .alert-notification { border-radius: 0; border-left: none; @@ -430,9 +451,7 @@ form .btn .loading-icon { margin-bottom: 0; cursor: pointer; } - /* Boxes */ - .box > .list-group { margin-bottom: 0; } @@ -489,9 +508,7 @@ form .btn .loading-icon { } } } - /* Toastr */ - #toast-container { position: absolute; @@ -563,15 +580,11 @@ form .btn .loading-icon { } } } - /* Typography */ - h1, h2, h3, h4, h5, h6 { margin-top: 0; } - /* Misc */ - .strike { text-decoration: line-through; color: @text-muted;