bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

update all the things

Browse Source
This commit is contained in:
Kyle Spearrin
2017-03-21 23:05:14 -04:00
parent 7d26361680
commit 715b91ab96
6 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/config.js
View File

@@ -1,12 +1,17 @@
angular
.module('bit')
.config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, $uibTooltipProvider,
toastrConfig) {
jwtInterceptorProvider.urlParam = 'access_token2';
.config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider,
$uibTooltipProvider, toastrConfig, $locationProvider, $qProvider) {
$qProvider.errorOnUnhandledRejections(false);
$locationProvider.hashPrefix('');
jwtOptionsProvider.config({
urlParam: 'access_token2',
whiteListedDomains: ['api.bitwarden.com', 'localhost']
});
var refreshPromise;
jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (config, appSettings, tokenService, apiService, jwtHelper, $q) {
if (config.url.indexOf(appSettings.apiUri) !== 0) {
jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, appSettings, tokenService, apiService, jwtHelper, $q) {
if (options.url.indexOf(appSettings.apiUri) !== 0) {
return;
}
@@ -68,7 +73,7 @@ angular
$urlRouterProvider.otherwise('/');
$stateProvider
// Backend
// Backend
.state('backend', {
templateUrl: 'app/views/backendLayout.html',
abstract: true,
@@ -133,7 +138,7 @@ angular
data: { pageTitle: 'Subvaults' }
})
// Frontend
// Frontend
.state('frontend', {
templateUrl: 'app/views/frontendLayout.html',
abstract: true,

10
src/index.html
View File

@@ -8,11 +8,11 @@
<title page-title>bitwarden.com Password Manager</title>
<!-- @if true !>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
<meta name="x-stylesheet-test-bs" content="" class="invisible" />
<script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName('SCRIPT'),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}('visibility','hidden',['lib\/bootstrap\/css\/bootstrap.min.css?v=<!-- @echo cacheTag !>']);</script>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" />
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
<meta name="x-stylesheet-test-fa" content="" class="fa" />
<script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName('SCRIPT'),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}('font-family','FontAwesome',['lib\/font-awesome\/css\/font-awesome.min.css?v=<!-- @echo cacheTag !>']);</script>
@@ -32,10 +32,10 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script>(window.jQuery||document.write('<script src="lib\/jquery\/jquery.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script>((window.jQuery&&window.jQuery.fn&&window.jQuery.fn.modal)||document.write('<script src="lib\/bootstrap\/js\/bootstrap.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"></script>
<script>(window.angular||document.write('<script src="lib\/angular\/angular.min.js?v=<!-- @echo cacheTag !>"><\/script>'));</script>
<script src="js/lib.min.js?v=<!-- @echo cacheTag !>"></script>
@@ -65,7 +65,7 @@
<script src="lib/angular-jwt/angular-jwt.js"></script>
<script src="lib/angular-resource/angular-resource.js"></script>
<script src="lib/angular-ui-router/angular-ui-router.js"></script>
<script src="lib/angular-bootstrap/angular-bootstrap-tpls.js"></script>
<script src="lib/angular-ui-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="lib/angular-md5/angular-md5.js"></script>
<script src="lib/angular-toastr/angular-toastr.tpls.js"></script>
<script src="lib/angular-bootstrap-show-errors/showErrors.js"></script>

2
src/less/theme.less
View File

@@ -1,5 +1,5 @@
@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,300italic,400italic,600italic);
@import "../../node_modules/toastr/toastr.less";
@import "../../node_modules/angular-toastr/src/toastr.less";
/* Start AdminLTE */

7
src/less/vault.less
View File

@@ -187,8 +187,7 @@ form .btn .loading-icon {
}
}
> .toast {
background-image: none !important;
.toast {
.border-radius(0);
.boxShadow(0 0 8px rgba(0, 0, 0, 0.5));
@@ -197,6 +196,7 @@ form .btn .loading-icon {
}
&.toast-danger, &.toast-error {
background-image: none !important;
&:extend(.bg-red);
&:before {
@@ -205,6 +205,7 @@ form .btn .loading-icon {
}
&.toast-warning {
background-image: none !important;
&:extend(.bg-yellow);
&:before {
@@ -213,6 +214,7 @@ form .btn .loading-icon {
}
&.toast-info {
background-image: none !important;
&:extend(.bg-aqua);
&:before {
@@ -221,6 +223,7 @@ form .btn .loading-icon {
}
&.toast-success {
background-image: none !important;
&:extend(.bg-green);
&:before {