diff options
author | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-04-24 16:11:41 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 16:11:41 -0300 |
commit | 74a9327b03daf53959a08ac5ad134743edf364dc (patch) | |
tree | 9489e8ac4572cf04cb427ebc328de5afcb519afb | |
parent | 7375316b2d3bc61eeb84e7d59c61ac937bf232a8 (diff) | |
parent | cd50337decfada956b9271d0d2fe34d6e79e431b (diff) |
Merge pull request #1063 from pixelated/logout_refresh
Logout refresh
-rw-r--r-- | service/test/functional/features/steps/login.py | 1 | ||||
-rw-r--r-- | web-ui/src/login/opensans.css | 20 | ||||
-rw-r--r-- | web-ui/webpack.production.config.js | 8 |
3 files changed, 18 insertions, 11 deletions
diff --git a/service/test/functional/features/steps/login.py b/service/test/functional/features/steps/login.py index 338550b3..0ac27c46 100644 --- a/service/test/functional/features/steps/login.py +++ b/service/test/functional/features/steps/login.py @@ -64,6 +64,7 @@ def see_inbox(context): @then(u'I logout') @when(u'I logout') def click_logout(context): + context.browser.refresh() find_element_by_css_selector(context, '#logout-form div').click() diff --git a/web-ui/src/login/opensans.css b/web-ui/src/login/opensans.css index 8795bdf7..74f98822 100644 --- a/web-ui/src/login/opensans.css +++ b/web-ui/src/login/opensans.css @@ -2,68 +2,68 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 300; - src: local("Open Sans Light"), local("OpenSans-Light"), url("/assets/fonts/OpenSans-Light.woff") format("woff"); + src: local("Open Sans Light"), local("OpenSans-Light"), url("fonts/OpenSans-Light.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: local("Open Sans"), local("OpenSans"), url("/assets/fonts/OpenSans.woff") format("woff"); + src: local("Open Sans"), local("OpenSans"), url("fonts/OpenSans.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 600; - src: local("Open Sans Semibold"), local("OpenSans-Semibold"), url("/assets/fonts/OpenSans-Semibold.woff") format("woff"); + src: local("Open Sans Semibold"), local("OpenSans-Semibold"), url("fonts/OpenSans-Semibold.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 700; - src: local("Open Sans Bold"), local("OpenSans-Bold"), url("/assets/fonts/OpenSans-Bold.woff") format("woff"); + src: local("Open Sans Bold"), local("OpenSans-Bold"), url("fonts/OpenSans-Bold.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 800; - src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url("/assets/fonts/OpenSans-Extrabold.woff") format("woff"); + src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url("fonts/OpenSans-Extrabold.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 300; - src: local("Open Sans Light Italic"), local("OpenSansLight-Italic"), url("/assets/fonts/OpenSansLight-Italic.woff") format("woff"); + src: local("Open Sans Light Italic"), local("OpenSansLight-Italic"), url("fonts/OpenSansLight-Italic.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 400; - src: local("Open Sans Italic"), local("OpenSans-Italic"), url("/assets/fonts/OpenSans-Italic.woff") format("woff"); + src: local("Open Sans Italic"), local("OpenSans-Italic"), url("fonts/OpenSans-Italic.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 600; - src: local("Open Sans Semibold Italic"), local("OpenSans-SemiboldItalic"), url("/assets/fonts/OpenSans-SemiboldItalic.woff ") format("woff"); + src: local("Open Sans Semibold Italic"), local("OpenSans-SemiboldItalic"), url("fonts/OpenSans-SemiboldItalic.woff ") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 700; - src: local("Open Sans Bold Italic"), local("OpenSans-BoldItalic"), url("/assets/fonts/OpenSans-BoldItalic.woff") format("woff"); + src: local("Open Sans Bold Italic"), local("OpenSans-BoldItalic"), url("fonts/OpenSans-BoldItalic.woff") format("woff"); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 800; - src: local("Open Sans Extrabold Italic"), local("OpenSans-ExtraboldItalic"), url("/assets/fonts/OpenSans-ExtraboldItalic.woff") format("woff"); + src: local("Open Sans Extrabold Italic"), local("OpenSans-ExtraboldItalic"), url("fonts/OpenSans-ExtraboldItalic.woff") format("woff"); } diff --git a/web-ui/webpack.production.config.js b/web-ui/webpack.production.config.js index c731526a..eee944dd 100644 --- a/web-ui/webpack.production.config.js +++ b/web-ui/webpack.production.config.js @@ -19,7 +19,13 @@ var commonConfiguration = { }; var commonPlugins = [ - new webpack.optimize.UglifyJsPlugin(), + new webpack.optimize.UglifyJsPlugin({ + comments: false, + compress: { + warnings: false, + drop_console: true + } + }), new webpack.optimize.DedupePlugin(), new webpack.DefinePlugin({ 'process.env': { |