Dfki branch update with all changes from mcq-dev #634
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
…onConfig file or if doesn't exist from the default config
+ brand colors + sass reintroduction
+ brand colors + nav bar heights + animated timeframe radio select (day, week, etc.) + added placeholder images for d3 charts
... + design adjustments to how the diary appears + first adjustments to the chart + some adjustments to tab bottom nav + reformatted trip detail template. Also added / changed some info like header date etc. + row-col format for dashboard with new lineChart nvd3 chart + new icons for tab navigation
updating colors, navbar
changing axis creating the donut diagram generally understanding D3
+ added var for default text color + tabs and nvd3 css changes + changed order or css import because they didn't make any sense + added storeModeToTrip function to store a mode given a trip object and the mode to be stored (As opposed to the previous function that relied on the trip being set in a global var when opening the mode selection popup) + more changes on the chart + added scope vars for querying last x days of metrics + removed title bars in our three views because they're unnecessary in combination with the bold titles inside the bottom tabs + made mode selection actually work in the diary list view and horizontally scrollable + got the timeframe selection with ion-tabs to actually work in dashboard +
...according to co2 factor table received from DFKI
Clean up branches names confusion
|
Can one of the admins verify this patch? |
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.
No description provided.