Permalink
Comparing changes
Open a pull request
- 1 commit
- 12 files changed
- 0 commit comments
- 1 contributor
Unified
Split
Showing
with
355 additions
and 169 deletions.
- +12 −6 h/static/scripts/app-controller.coffee
- +1 −0 h/static/scripts/app.coffee
- +1 −1 h/static/scripts/test/app-controller-test.coffee
- +21 −0 h/static/styles/common.scss
- +3 −3 h/static/styles/help-page.scss
- +2 −3 h/static/styles/simple-search.scss
- +1 −1 h/static/styles/topbar.scss
- BIN h/static/styles/vendor/fonts/h.eot
- +263 −143 h/static/styles/vendor/fonts/selection.json
- +18 −2 h/static/styles/vendor/icomoon.css
- +20 −5 h/templates/app.html
- +13 −5 h/templates/help.html
| @@ -43,8 +43,16 @@ module.exports = class AppController | ||
| applyUpdates(action, payload) | ||
| $scope.$digest() | ||
| # App dialogs | ||
| $scope.accountDialog = visible: false | ||
| $scope.shareDialog = visible: false | ||
| oncancel = -> | ||
| $scope.dialog.visible = false | ||
| $scope.accountDialog.visible = false | ||
| # Check to see if we are on the stream page. | ||
| if $window.top is $window | ||
| $scope.isStream = true | ||
| cleanupAnnotations = -> | ||
| # Clean up any annotations that need to be unloaded. | ||
| @@ -68,7 +76,7 @@ module.exports = class AppController | ||
| if isFirstRun and not (newVal or oldVal) | ||
| $scope.login() | ||
| else | ||
| $scope.dialog.visible = false | ||
| $scope.accountDialog.visible = false | ||
| # Update any edits in progress. | ||
| for draft in drafts.all() | ||
| @@ -85,12 +93,12 @@ module.exports = class AppController | ||
| $route.reload() | ||
| $scope.login = -> | ||
| $scope.dialog.visible = true | ||
| $scope.accountDialog.visible = true | ||
| identity.request {oncancel} | ||
| $scope.logout = -> | ||
| return unless drafts.discard() | ||
| $scope.dialog.visible = false | ||
| $scope.accountDialog.visible = false | ||
| identity.logout() | ||
| $scope.loadMore = (number) -> | ||
| @@ -100,8 +108,6 @@ module.exports = class AppController | ||
| $scope.search.query = '' | ||
| annotationUI.clearSelectedAnnotations() | ||
| $scope.dialog = visible: false | ||
| $scope.search = | ||
| query: $location.search()['q'] | ||
| @@ -111,6 +111,7 @@ module.exports = angular.module('h', [ | ||
| .directive('spinner', require('./directive/spinner')) | ||
| .directive('tabbable', require('./directive/tabbable')) | ||
| .directive('tabReveal', require('./directive/tab-reveal')) | ||
| .directive('shareDialog', require('./directive/share-dialog')) | ||
| .filter('converter', require('./filter/converter')) | ||
| .filter('moment', require('./filter/moment')) | ||
| @@ -117,7 +117,7 @@ describe 'AppController', -> | ||
| it 'does not show login form for logged in users', -> | ||
| createController() | ||
| assert.isFalse($scope.dialog.visible) | ||
| assert.isFalse($scope.accountDialog.visible) | ||
| describe 'applyUpdate', -> | ||
| @@ -112,6 +112,27 @@ html { | ||
| } | ||
| // Share this view ///////////////////// | ||
| .share-dialog-toggle { | ||
| top: 1px; | ||
| left: 8px; | ||
| position: relative; | ||
| cursor: pointer; | ||
| color: $gray-light; | ||
| float: left; | ||
| margin-right: 15px; | ||
| &:hover { | ||
| color: $gray-dark; | ||
| } | ||
| } | ||
| .share-links { | ||
| a { | ||
| font-size: 1.5em; | ||
| padding: .3em; | ||
| } | ||
| } | ||
| //FORM RELATED//////////////////////////////// | ||
| .form-horizontal { | ||
| @@ -12,7 +12,7 @@ | ||
| .masthead { | ||
| margin-bottom: 2.5em; | ||
| margin-left: -1em; | ||
| margin-left: -2em; | ||
| } | ||
| } | ||
| @@ -86,7 +86,7 @@ | ||
| @include icons { | ||
| @include help-icon; | ||
| font-size: 14px; | ||
| font-size: 10px; | ||
| } | ||
| } | ||
| @@ -96,7 +96,7 @@ | ||
| height: 45px; | ||
| position: absolute; | ||
| top: -10px; | ||
| right: -10px; | ||
| right: 0px; | ||
| } | ||
| .numbered-list { | ||
| @@ -9,7 +9,7 @@ | ||
| @include clearfix; | ||
| position: relative; | ||
| padding: 0 1.5385em; | ||
| color: $gray; | ||
| color: $gray-darker; | ||
| } | ||
| .simple-search-form * { | ||
| @@ -23,14 +23,13 @@ | ||
| } | ||
| :not(:focus) ~ .simple-search-icon { | ||
| color: $gray-lighter; | ||
| color: $gray-light; | ||
| } | ||
| input.simple-search-input { | ||
| float: left; | ||
| outline: none; | ||
| color: $text-color; | ||
| width: 100%; | ||
| border: none; | ||
| padding: 0; | ||
| @@ -57,7 +57,7 @@ body { | ||
| & > *:first-child, & > *:last-child { | ||
| line-height: 28px; | ||
| margin: 0 .72em; | ||
| margin-right: .72em; | ||
| } | ||
| } | ||
| } | ||
Binary file not shown.
Oops, something went wrong.