Merge lp://qastaging/~ricgard/maas/mobile-browser-testing into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Richard McCartney
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~ricgard/maas/mobile-browser-testing |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Prerequisite: | lp://qastaging/~ricgard/maas/mobile-table-fixes |
| Diff against target: |
3189 lines (+697/-1104) 59 files modified
src/maasserver/migrations/builtin/maasserver/0105_add_script_sets_to_node_model.py (+0/-34) src/maasserver/migrations/builtin/maasserver/0106_testing_status.py (+0/-27) src/maasserver/migrations/builtin/maasserver/0107_chassis_to_pods.py (+0/-107) src/maasserver/static/css/build.css (+1/-1) src/maasserver/static/js/angular/directives/call_to_action.js (+2/-4) src/maasserver/static/js/angular/directives/error_overlay.js (+1/-1) src/maasserver/static/js/angular/directives/os_select.js (+25/-18) src/maasserver/static/js/prefs.js (+2/-2) src/maasserver/static/partials/boot-images.html (+3/-3) src/maasserver/static/partials/dashboard.html (+1/-1) src/maasserver/static/partials/domain-details.html (+7/-7) src/maasserver/static/partials/domains-list.html (+2/-2) src/maasserver/static/partials/fabric-details.html (+4/-4) src/maasserver/static/partials/intro-user.html (+1/-1) src/maasserver/static/partials/intro.html (+1/-1) src/maasserver/static/partials/ipranges.html (+3/-3) src/maasserver/static/partials/networks-list.html (+4/-5) src/maasserver/static/partials/node-details.html (+83/-32) src/maasserver/static/partials/nodes-list.html (+103/-39) src/maasserver/static/partials/settings.html (+6/-6) src/maasserver/static/partials/space-details.html (+3/-3) src/maasserver/static/partials/ssh-keys.html (+1/-1) src/maasserver/static/partials/subnet-details.html (+6/-6) src/maasserver/static/partials/vlan-details.html (+2/-2) src/maasserver/static/scss/_base.forms.scss (+84/-21) src/maasserver/static/scss/_components.buttons.scss (+20/-1) src/maasserver/static/scss/_components.forms.scss (+12/-1) src/maasserver/static/scss/_components.grid.scss (+224/-0) src/maasserver/static/scss/_components.tables.scss (+20/-10) src/maasserver/static/scss/_helpers.display.scss (+2/-2) src/maasserver/static/scss/_settings.defaults.scss (+2/-0) src/maasserver/static/scss/build.scss (+2/-0) src/maasserver/templates/maasserver/base.html (+1/-1) src/maasserver/templates/maasserver/logout_confirm.html (+2/-2) src/maasserver/templates/maasserver/prefs.html (+3/-3) src/maasserver/templates/maasserver/prefs_add_sslkey.html (+4/-2) src/maasserver/templates/maasserver/settings.html (+10/-10) src/maasserver/templates/maasserver/settings_add_commissioning_script.html (+4/-2) src/maasserver/templates/maasserver/settings_add_license_key.html (+4/-2) src/maasserver/templates/maasserver/settings_commissioning_scripts.html (+1/-1) src/maasserver/templates/maasserver/settings_confirm_delete_commissioning_script.html (+4/-2) src/maasserver/templates/maasserver/settings_confirm_delete_license_key.html (+4/-2) src/maasserver/templates/maasserver/settings_edit_license_key.html (+1/-1) src/maasserver/templates/maasserver/settings_license_keys.html (+1/-1) src/maasserver/templates/maasserver/user_add.html (+4/-2) src/maasserver/templates/maasserver/user_confirm_delete.html (+4/-2) src/maasserver/templates/maasserver/user_edit.html (+8/-4) src/maasserver/templates/maasserver/user_view.html (+2/-2) src/maasserver/templates/maasserver/zone_add.html (+1/-1) src/maasserver/templates/maasserver/zone_confirm_delete.html (+4/-2) src/maasserver/templates/maasserver/zone_detail.html (+2/-2) src/maasserver/templates/maasserver/zone_edit.html (+4/-2) src/maasserver/templates/maasserver/zone_list.html (+1/-1) src/maasserver/templates/registration/login.html (+1/-1) src/maastesting/parallel.py (+0/-218) src/maastesting/tests/test_parallel.py (+0/-19) src/metadataserver/migrations/builtin/0003_remove_noderesult.py (+0/-83) src/provisioningserver/templates/commissioning-user-data/snippets/maas_run_remote_scripts.py (+0/-219) src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_run_remote_scripts.py (+0/-172) |
| To merge this branch: | bzr merge lp://qastaging/~ricgard/maas/mobile-browser-testing |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Disapprove | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2017-01-27.
Commit message
Resolves mobile design issyes, updates component colours and button colour styles
Description of the change
- Resolves various design mobile issues
- Updates all checkboxes and radio buttons to use the new component blue colour
- Updates all buttons to use .button--positive / destructive / base / neutral where required
To post a comment you must log in.
Revision history for this message
| Richard McCartney (ricgard) wrote | # |
Unmerged revisions
- 5565. By Richard McCartney
-
Resolving conflicts@
- 5564. By Richard McCartney
-
Removed all reference of primary button styles
- 5563. By Richard McCartney
-
Updating FUJ colours@
- 5562. By Richard McCartney
-
Fixing tests
- 5561. By Richard McCartney
-
Updated all buttons
- 5560. By Richard McCartney
-
Updating button styles and checkbox / radio styles
- 5559. By Richard McCartney
-
button update
- 5558. By Richard McCartney
-
Adding updated grids and amending filessystem dropdown
- 5557. By Richard McCartney
-
Resolving min-width mobile styles
- 5556. By Richard McCartney
-
Adding missing table labels to DNS details
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You have merge conflicts for this branch, so it needs fixing.
More importantly, it looks like (somehow) there is a lot of new code that landed in trunk that has been mistakenly removed in this branch. So I'm disapproving so this, so it doesn't accidentally land. Please resubmit when it's fixed.