1
0
mirror of https://github.com/bitwarden/web synced 2025-12-10 13:23:15 +00:00

update all the things

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

View File

@@ -108,8 +108,8 @@ gulp.task('lib', ['clean:lib'], function () {
dest: paths.libDir + 'angular' dest: paths.libDir + 'angular'
}, },
{ {
src: paths.npmDir + 'angular-bootstrap-npm/dist/*tpls*.js', src: paths.npmDir + 'angular-ui-bootstrap/dist/*tpls*.js',
dest: paths.libDir + 'angular-bootstrap' dest: paths.libDir + 'angular-ui-bootstrap'
}, },
{ {
src: paths.npmDir + 'angular-bootstrap-show-errors/src/*.js', src: paths.npmDir + 'angular-bootstrap-show-errors/src/*.js',

View File

@@ -3,45 +3,44 @@
"version": "1.9.1", "version": "1.9.1",
"production": true, "production": true,
"devDependencies": { "devDependencies": {
"connect": "3.4.1", "connect": "3.6.0",
"lodash": "4.13.1", "lodash": "4.17.4",
"gulp": "3.9.1", "gulp": "3.9.1",
"gulp-concat": "2.6.0", "gulp-concat": "2.6.1",
"gulp-cssmin": "0.1.7", "gulp-cssmin": "0.1.7",
"gulp-less": "3.1.0", "gulp-less": "3.3.0",
"gulp-rename": "1.2.2", "gulp-rename": "1.2.2",
"gulp-uglify": "1.5.3", "gulp-uglify": "2.1.2",
"gulp-gh-pages": "0.5.4", "gulp-gh-pages": "0.5.4",
"gulp-preprocess": "2.0.0", "gulp-preprocess": "2.0.0",
"gulp-ng-annotate": "2.0.0", "gulp-ng-annotate": "2.0.0",
"gulp-ng-config": "1.3.1", "gulp-ng-config": "1.4.0",
"gulp-connect": "5.0.0", "gulp-connect": "5.0.0",
"jshint": "2.9.2", "jshint": "2.9.4",
"gulp-jshint": "2.0.1", "gulp-jshint": "2.0.4",
"rimraf": "2.5.2", "rimraf": "2.6.1",
"run-sequence": "1.2.1", "run-sequence": "1.2.2",
"merge-stream": "1.0.0", "merge-stream": "1.0.1",
"jquery": "2.2.4", "jquery": "2.2.4",
"font-awesome": "4.6.3", "font-awesome": "4.7.0",
"bootstrap": "3.3.6", "bootstrap": "3.3.7",
"angular": "1.5.6", "angular": "1.6.3",
"angular-resource": "1.5.6", "angular-resource": "1.6.3",
"angular-bootstrap-npm": "0.14.3", "angular-ui-bootstrap": "2.5.0",
"angular-ui-router": "0.3.1", "angular-ui-router": "0.4.2",
"angular-jwt": "0.0.9", "angular-jwt": "0.1.9",
"angular-cookies": "1.5.6", "angular-cookies": "1.6.3",
"admin-lte": "2.3.5", "admin-lte": "2.3.11",
"angular-md5": "0.1.10", "angular-md5": "0.1.10",
"angular-toastr": "1.7.0", "angular-toastr": "2.1.1",
"angular-bootstrap-show-errors": "2.3.0", "angular-bootstrap-show-errors": "2.3.0",
"angular-messages": "1.5.6", "angular-messages": "1.6.3",
"ngstorage": "0.3.10", "ngstorage": "0.3.11",
"papaparse": "4.1.2", "papaparse": "4.2.0",
"toastr": "2.1.2", "clipboard": "1.6.1",
"clipboard": "1.5.12",
"ngclipboard": "1.1.1", "ngclipboard": "1.1.1",
"angulartics": "1.1.2", "angulartics": "1.4.0",
"angulartics-google-analytics": "0.2.1", "angulartics-google-analytics": "0.4.0",
"node-forge": "0.7.0", "node-forge": "0.7.0",
"webpack-stream": "3.2.0" "webpack-stream": "3.2.0"
} }

View File

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

View File

@@ -8,11 +8,11 @@
<title page-title>bitwarden.com Password Manager</title> <title page-title>bitwarden.com Password Manager</title>
<!-- @if true !> <!-- @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" /> <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> <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" /> <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> <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 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>(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>((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>(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> <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-jwt/angular-jwt.js"></script>
<script src="lib/angular-resource/angular-resource.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-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-md5/angular-md5.js"></script>
<script src="lib/angular-toastr/angular-toastr.tpls.js"></script> <script src="lib/angular-toastr/angular-toastr.tpls.js"></script>
<script src="lib/angular-bootstrap-show-errors/showErrors.js"></script> <script src="lib/angular-bootstrap-show-errors/showErrors.js"></script>

View File

@@ -1,5 +1,5 @@
@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,300italic,400italic,600italic); @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 */ /* Start AdminLTE */

View File

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