Develop --> Master #930
Merged
Develop --> Master #930
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Style rules for the new design made the text for the tooltip white on white. We explicitly set it to the font color used in other parts of the app so that it is legible. Also, a certain plugin adds the "claro" Dojo/Dijit theme to the body element. This adds an undesirable background image to the measure tooltip, which we override and dispose of here.
This is not used in the new design and is no longer needed. Refs #691
These elements are not supposed to be links.
Some plugins use EXT, which, when activated, applies classes to the body and other elements. These classes have rules that override some of the framework style rules. To protect against these cases, we override some of the EXT rules with the base body element rules.
After further consideration, we thought it made more sense to bring back the plugin close button instead of having a button that would hide active plugin layers. I left the layer hiding code in case we need it later. Refs #718
Make the off button translatable and add an entry for it in the english and spanish language files. Refs #718
…solidate-css Consolidate stylesheets, remove unused JS and CSS libraries
In the event that no region links have been added to the site's region.json file, still show the region name, but don't render the region link list. Refs #717
…p-region-subtitle Always show framework region name
…ng-back-the-x Replace the hide layers button with the close button
…tom-colors Implement custom colors in new design
- fixes a bug whereby `underscore` wasn't imported for use in the map utils
…re-import-for-map-utils Add `underscore` import for use in map-utils
Update the Fontello files to include the icons required by the regional planning plugin so that the plugin doesn't have to include a whole set of font files for a few icons. Fix the names of a few icons which have typos or confusing names. Refs CoastalResilienceNetwork/regional-planning#59
…ate-fonts Update fonts for regional planning plugin
Adds and wires-up a basic implementation of the new map printing workflow. This workflow mimics the plugin print workflow. Code related to the AGS print service is removed because we will be relying on print stylesheets instead. A new region configuration was added that allows site admins to specify the logo to be used on the printed map page. Refs #724
…-map-print-area Add map print area
The search input was getting pushed into other content in the header on small width screen sizes. This commit sets a minimum width for the content of the application.
Make .sidebar-nav match the width of its container.
This allows each app to set its own padding.
This adds formatting for Export Page and Save & Share features.
Fix minor UI issues
Give our stylesheets precedent over vendor stylesheets. This fixes the issue with the modal close button style being off. Refs #690
…ssues Fix minor style issues
This adds a "copy" of the map in the main window to the print preview window, and to the printed output. It moves the map node around and applies dynamically linked style sheets selectively, before returning the node to the primary UI. The way that style sheets were used had to be modified to have no base print styles and instead load them all dynamically, since adding conflicting rules dynamically, even if the class were later removed, put the app into a weird state w.r.t. applied styles such that dynamically added rules persisted and were misapplied.
Add map to print preview window & print sandbox
Add tool to expand and shrink the map
- replace cdn loaded jqueryui and chosen with use! modules & local files - import jqueryui and chosen in BasePlugin.js to make them available to plugins - render slider, accordion, and multiselect in example plugin - move chosen and jqueryui imports to PluginBase.js
- adjust jquery-ui-slider-pips to export a callable function instead of calling itself immediately. This is done so that we can call it on a specific jQuery object in the BasePlugin class's constructor to make pips available as an option to plugins
- import jquery-ui-slider-pips into PluginBase - add pips option to jquery - update example plugin slider to use "pips" and "floats" - add margin-left value on slider & select - adjust leading whitespace on select
…nd-jqueryui-examples Make chosen and jquery-ui available globally Connects #903
Style search input
When the nav-apps list is narrow, reduce the padding on the element containing the tour link so that it is not obscured.
- replace patched version of jquery-ui-slider-pips with non-patched, minified version from cdn - update import path in use declaration - add dependency on jquery for chosen - add dependency on jqueryui for pips - add pips to arg list in PluginBase - remove function call to pips in PluginBase
- rename jquery.ui.slider.pips option from `floats` -> `float`
Reduce padding for tour container when narrow
…y-library-imports Adjust jQuery library imports for Plugins Connects #910
- to circumvent a timing issue, drop the explicit jquery import in AgsMeasure.js and use global $ instead
…g-bug Drop explicit jQuery import in AgsMeasure.js Connects #917
- drop the flex & -ms-flex css attributes on .nav-main-title to fix an issue whereby the title header text would be bunched up on IE11
The initial implementation of this tool duplicated the CSS rules that were contained in a media query to make the sidebar narrow. Doing this meant that the sidebar became narrow at any screensize once a plugin was activated. To fix this, a different class name is now used for the tool. Also, the logic to check whether or not the sidebar is narrow was improved here to take the size of the viewport into account. To better keep the tool button icon in sync with the state of the sidebar, changes to the viewport size are listened to and the icon is updated if need be. One side-effect of having a tool to manually toggle the state of the sidebar is that users may have to expand the sidebar using the button on small screens if the sidebar was initially toggled manually and any active plugins are turned off. Refs #912
Improves the readability and makes it easier to keep in sync with the media query values in css.
The tour area would adjust its padding size to keep centered when on narrow viewports. Recent changes made it more complex to determine if the viewport was narrow, so now the padding is set to look good in any width of the plugin bar.
The nav bar plugin clear button was hidden only when the viewport size narrowed it. This takes the same action when it is manually narrowed.
…-toggle Fix sidebar toggle
…r-text Drop flex & -ms-flex attributes on .nav-main-title Connects #920
- display the sidebar plugin-close button only if
1. the sidebar hasn't been manually narrowed
2. the sidebar hasn't been narrowed automatically
due to the viewport width being < 991px
…ttons Display plugin close buttons if sidebar isn't narrow Connects #924
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This constitutes releasing the new framework. Existing
masterhas been archived to branchv1_archivefor regions which have not upgraded.Connects #908