Merge lp:~huwshimi/juju-gui/sprite-and-css-removal into lp:juju-gui/experimental
- sprite-and-css-removal
- Merge into trunk
Proposed by
Huw Wilkins
| Status: | Merged |
|---|---|
| Merged at revision: | 1157 |
| Proposed branch: | lp:~huwshimi/juju-gui/sprite-and-css-removal |
| Merge into: | lp:juju-gui/experimental |
| Diff against target: |
1011 lines (+69/-545) 7 files modified
Makefile (+1/-1) app/index.html (+61/-65) lib/templates.js (+0/-7) lib/views/browser/charm-full.less (+0/-7) lib/views/browser/token.less (+0/-24) lib/views/manifest.handlebars (+0/-23) lib/views/stylesheet.less (+7/-418) |
| To merge this branch: | bzr merge lp:~huwshimi/juju-gui/sprite-and-css-removal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju GUI Hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
CSS and sprite removal
In this branch:
- Improve font rendering on OSX.
- Removed a whole bunch of unused sprites.
- Removed a bunch of unused CSS, mostly related to the removed sprites.
- Removed the chrome app manifest file.
To post a comment you must log in.
Revision history for this message
| Huw Wilkins (huwshimi) wrote : | # |
Revision history for this message
| Huw Wilkins (huwshimi) wrote : | # |
*** Submitted:
CSS and sprite removal
In this branch:
- Improve font rendering on OSX.
- Removed a whole bunch of unused sprites.
- Removed a bunch of unused CSS, mostly related to the removed sprites.
- Removed the chrome app manifest file.
R=benji
CC=
https:/
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'Makefile' |
| 2 | --- Makefile 2013-10-17 17:12:58 +0000 |
| 3 | +++ Makefile 2013-10-25 22:17:57 +0000 |
| 4 | @@ -26,7 +26,7 @@ |
| 5 | -o -name 'generateTemplates' \ |
| 6 | \) -print \ |
| 7 | | sort | sed -e 's/^\.\///' \ |
| 8 | - | grep -Ev -e '^manifest\.json$$' \ |
| 9 | + | grep -Ev \ |
| 10 | -e '^app/assets/javascripts/d3(\.min)?\.js$$' \ |
| 11 | -e '^app/assets/javascripts/spin\.min\.js$$' \ |
| 12 | -e '^app/assets/javascripts/spinner\.js$$' \ |
| 13 | |
| 14 | === removed file 'app/assets/images/alert_icon.png' |
| 15 | Binary files app/assets/images/alert_icon.png 2012-09-20 18:42:45 +0000 and app/assets/images/alert_icon.png 1970-01-01 00:00:00 +0000 differ |
| 16 | === removed file 'app/assets/images/bottom_bar.png' |
| 17 | Binary files app/assets/images/bottom_bar.png 2012-09-20 18:42:45 +0000 and app/assets/images/bottom_bar.png 1970-01-01 00:00:00 +0000 differ |
| 18 | === removed file 'app/assets/images/bottom_bar_big_div.png' |
| 19 | Binary files app/assets/images/bottom_bar_big_div.png 2012-09-20 18:42:45 +0000 and app/assets/images/bottom_bar_big_div.png 1970-01-01 00:00:00 +0000 differ |
| 20 | === removed file 'app/assets/images/bottom_bar_small_div.png' |
| 21 | Binary files app/assets/images/bottom_bar_small_div.png 2012-09-20 18:42:45 +0000 and app/assets/images/bottom_bar_small_div.png 1970-01-01 00:00:00 +0000 differ |
| 22 | === removed file 'app/assets/images/browser_home.png' |
| 23 | Binary files app/assets/images/browser_home.png 2013-07-11 06:23:35 +0000 and app/assets/images/browser_home.png 1970-01-01 00:00:00 +0000 differ |
| 24 | === removed file 'app/assets/images/charm-app-servers-120.png' |
| 25 | Binary files app/assets/images/charm-app-servers-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-app-servers-120.png 1970-01-01 00:00:00 +0000 differ |
| 26 | === removed file 'app/assets/images/charm-app-servers-160.png' |
| 27 | Binary files app/assets/images/charm-app-servers-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-app-servers-160.png 1970-01-01 00:00:00 +0000 differ |
| 28 | === removed file 'app/assets/images/charm-app-servers-48.png' |
| 29 | Binary files app/assets/images/charm-app-servers-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-app-servers-48.png 1970-01-01 00:00:00 +0000 differ |
| 30 | === removed file 'app/assets/images/charm-app-servers-50.png' |
| 31 | Binary files app/assets/images/charm-app-servers-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-app-servers-50.png 1970-01-01 00:00:00 +0000 differ |
| 32 | === removed file 'app/assets/images/charm-app-servers-64.png' |
| 33 | Binary files app/assets/images/charm-app-servers-64.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-app-servers-64.png 1970-01-01 00:00:00 +0000 differ |
| 34 | === removed file 'app/assets/images/charm-app-servers-96.png' |
| 35 | Binary files app/assets/images/charm-app-servers-96.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-app-servers-96.png 1970-01-01 00:00:00 +0000 differ |
| 36 | === removed file 'app/assets/images/charm-applications-120.png' |
| 37 | Binary files app/assets/images/charm-applications-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-applications-120.png 1970-01-01 00:00:00 +0000 differ |
| 38 | === removed file 'app/assets/images/charm-applications-160.png' |
| 39 | Binary files app/assets/images/charm-applications-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-applications-160.png 1970-01-01 00:00:00 +0000 differ |
| 40 | === removed file 'app/assets/images/charm-applications-48.png' |
| 41 | Binary files app/assets/images/charm-applications-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-applications-48.png 1970-01-01 00:00:00 +0000 differ |
| 42 | === removed file 'app/assets/images/charm-applications-50.png' |
| 43 | Binary files app/assets/images/charm-applications-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-applications-50.png 1970-01-01 00:00:00 +0000 differ |
| 44 | === removed file 'app/assets/images/charm-applications-64.png' |
| 45 | Binary files app/assets/images/charm-applications-64.png 2013-06-26 14:03:36 +0000 and app/assets/images/charm-applications-64.png 1970-01-01 00:00:00 +0000 differ |
| 46 | === removed file 'app/assets/images/charm-applications-96.png' |
| 47 | Binary files app/assets/images/charm-applications-96.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-applications-96.png 1970-01-01 00:00:00 +0000 differ |
| 48 | === removed file 'app/assets/images/charm-cache-proxy-120.png' |
| 49 | Binary files app/assets/images/charm-cache-proxy-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-cache-proxy-120.png 1970-01-01 00:00:00 +0000 differ |
| 50 | === removed file 'app/assets/images/charm-cache-proxy-160.png' |
| 51 | Binary files app/assets/images/charm-cache-proxy-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-cache-proxy-160.png 1970-01-01 00:00:00 +0000 differ |
| 52 | === removed file 'app/assets/images/charm-cache-proxy-48.png' |
| 53 | Binary files app/assets/images/charm-cache-proxy-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-cache-proxy-48.png 1970-01-01 00:00:00 +0000 differ |
| 54 | === removed file 'app/assets/images/charm-cache-proxy-50.png' |
| 55 | Binary files app/assets/images/charm-cache-proxy-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-cache-proxy-50.png 1970-01-01 00:00:00 +0000 differ |
| 56 | === removed file 'app/assets/images/charm-cache-proxy-64.png' |
| 57 | Binary files app/assets/images/charm-cache-proxy-64.png 2013-06-03 11:49:03 +0000 and app/assets/images/charm-cache-proxy-64.png 1970-01-01 00:00:00 +0000 differ |
| 58 | === removed file 'app/assets/images/charm-cache-proxy-96.png' |
| 59 | Binary files app/assets/images/charm-cache-proxy-96.png 2013-06-03 11:49:03 +0000 and app/assets/images/charm-cache-proxy-96.png 1970-01-01 00:00:00 +0000 differ |
| 60 | === removed file 'app/assets/images/charm-database-48.png' |
| 61 | Binary files app/assets/images/charm-database-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-database-48.png 1970-01-01 00:00:00 +0000 differ |
| 62 | === removed file 'app/assets/images/charm-databases-120.png' |
| 63 | Binary files app/assets/images/charm-databases-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-databases-120.png 1970-01-01 00:00:00 +0000 differ |
| 64 | === removed file 'app/assets/images/charm-databases-160.png' |
| 65 | Binary files app/assets/images/charm-databases-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-databases-160.png 1970-01-01 00:00:00 +0000 differ |
| 66 | === removed file 'app/assets/images/charm-databases-50.png' |
| 67 | Binary files app/assets/images/charm-databases-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-databases-50.png 1970-01-01 00:00:00 +0000 differ |
| 68 | === removed file 'app/assets/images/charm-databases-64.png' |
| 69 | Binary files app/assets/images/charm-databases-64.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-databases-64.png 1970-01-01 00:00:00 +0000 differ |
| 70 | === removed file 'app/assets/images/charm-databases-96.png' |
| 71 | Binary files app/assets/images/charm-databases-96.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-databases-96.png 1970-01-01 00:00:00 +0000 differ |
| 72 | === removed file 'app/assets/images/charm-file-server-48.png' |
| 73 | Binary files app/assets/images/charm-file-server-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-file-server-48.png 1970-01-01 00:00:00 +0000 differ |
| 74 | === removed file 'app/assets/images/charm-file-servers-120.png' |
| 75 | Binary files app/assets/images/charm-file-servers-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-file-servers-120.png 1970-01-01 00:00:00 +0000 differ |
| 76 | === removed file 'app/assets/images/charm-file-servers-160.png' |
| 77 | Binary files app/assets/images/charm-file-servers-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-file-servers-160.png 1970-01-01 00:00:00 +0000 differ |
| 78 | === removed file 'app/assets/images/charm-file-servers-50.png' |
| 79 | Binary files app/assets/images/charm-file-servers-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-file-servers-50.png 1970-01-01 00:00:00 +0000 differ |
| 80 | === removed file 'app/assets/images/charm-file-servers-64.png' |
| 81 | Binary files app/assets/images/charm-file-servers-64.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-file-servers-64.png 1970-01-01 00:00:00 +0000 differ |
| 82 | === removed file 'app/assets/images/charm-file-servers-96.png' |
| 83 | Binary files app/assets/images/charm-file-servers-96.png 2013-06-04 16:13:15 +0000 and app/assets/images/charm-file-servers-96.png 1970-01-01 00:00:00 +0000 differ |
| 84 | === removed file 'app/assets/images/charm-misc-120.png' |
| 85 | Binary files app/assets/images/charm-misc-120.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-misc-120.png 1970-01-01 00:00:00 +0000 differ |
| 86 | === removed file 'app/assets/images/charm-misc-160.png' |
| 87 | Binary files app/assets/images/charm-misc-160.png 2013-06-05 12:26:25 +0000 and app/assets/images/charm-misc-160.png 1970-01-01 00:00:00 +0000 differ |
| 88 | === removed file 'app/assets/images/charm-misc-48.png' |
| 89 | Binary files app/assets/images/charm-misc-48.png 2013-06-25 13:15:05 +0000 and app/assets/images/charm-misc-48.png 1970-01-01 00:00:00 +0000 differ |
| 90 | === removed file 'app/assets/images/charm-misc-50.png' |
| 91 | Binary files app/assets/images/charm-misc-50.png 2013-07-10 06:01:24 +0000 and app/assets/images/charm-misc-50.png 1970-01-01 00:00:00 +0000 differ |
| 92 | === removed file 'app/assets/images/charm-misc-64.png' |
| 93 | Binary files app/assets/images/charm-misc-64.png 2013-06-03 11:49:03 +0000 and app/assets/images/charm-misc-64.png 1970-01-01 00:00:00 +0000 differ |
| 94 | === removed file 'app/assets/images/charm-misc-96.png' |
| 95 | Binary files app/assets/images/charm-misc-96.png 2013-06-03 11:49:03 +0000 and app/assets/images/charm-misc-96.png 1970-01-01 00:00:00 +0000 differ |
| 96 | === removed file 'app/assets/images/charm_120.png' |
| 97 | Binary files app/assets/images/charm_120.png 2013-07-09 06:42:57 +0000 and app/assets/images/charm_120.png 1970-01-01 00:00:00 +0000 differ |
| 98 | === removed file 'app/assets/images/charm_160.png' |
| 99 | Binary files app/assets/images/charm_160.png 2013-04-19 06:29:32 +0000 and app/assets/images/charm_160.png 1970-01-01 00:00:00 +0000 differ |
| 100 | === removed file 'app/assets/images/charm_48.png' |
| 101 | Binary files app/assets/images/charm_48.png 2013-06-25 16:40:18 +0000 and app/assets/images/charm_48.png 1970-01-01 00:00:00 +0000 differ |
| 102 | === removed file 'app/assets/images/charm_50.png' |
| 103 | Binary files app/assets/images/charm_50.png 2013-07-09 04:38:08 +0000 and app/assets/images/charm_50.png 1970-01-01 00:00:00 +0000 differ |
| 104 | === removed file 'app/assets/images/charm_64.png' |
| 105 | Binary files app/assets/images/charm_64.png 2013-04-19 06:29:32 +0000 and app/assets/images/charm_64.png 1970-01-01 00:00:00 +0000 differ |
| 106 | === removed file 'app/assets/images/charm_96.png' |
| 107 | Binary files app/assets/images/charm_96.png 2013-04-19 06:29:32 +0000 and app/assets/images/charm_96.png 1970-01-01 00:00:00 +0000 differ |
| 108 | === removed file 'app/assets/images/charm_icon.png' |
| 109 | Binary files app/assets/images/charm_icon.png 2012-09-20 18:42:45 +0000 and app/assets/images/charm_icon.png 1970-01-01 00:00:00 +0000 differ |
| 110 | === removed file 'app/assets/images/configure-cog.png' |
| 111 | Binary files app/assets/images/configure-cog.png 2012-10-19 19:14:43 +0000 and app/assets/images/configure-cog.png 1970-01-01 00:00:00 +0000 differ |
| 112 | === removed file 'app/assets/images/configure_title_div.png' |
| 113 | Binary files app/assets/images/configure_title_div.png 2012-10-19 19:14:43 +0000 and app/assets/images/configure_title_div.png 1970-01-01 00:00:00 +0000 differ |
| 114 | === removed file 'app/assets/images/destroy_icon.png' |
| 115 | Binary files app/assets/images/destroy_icon.png 2013-02-27 20:21:27 +0000 and app/assets/images/destroy_icon.png 1970-01-01 00:00:00 +0000 differ |
| 116 | === removed file 'app/assets/images/dotted_divider.png' |
| 117 | Binary files app/assets/images/dotted_divider.png 2013-02-14 00:32:35 +0000 and app/assets/images/dotted_divider.png 1970-01-01 00:00:00 +0000 differ |
| 118 | === removed file 'app/assets/images/dropbox.png' |
| 119 | Binary files app/assets/images/dropbox.png 2012-09-25 19:11:23 +0000 and app/assets/images/dropbox.png 1970-01-01 00:00:00 +0000 differ |
| 120 | === removed file 'app/assets/images/facebook-click.png' |
| 121 | Binary files app/assets/images/facebook-click.png 2013-06-18 21:41:02 +0000 and app/assets/images/facebook-click.png 1970-01-01 00:00:00 +0000 differ |
| 122 | === removed file 'app/assets/images/facebook-hover.png' |
| 123 | Binary files app/assets/images/facebook-hover.png 2013-06-18 21:41:02 +0000 and app/assets/images/facebook-hover.png 1970-01-01 00:00:00 +0000 differ |
| 124 | === removed file 'app/assets/images/facebook-normal.png' |
| 125 | Binary files app/assets/images/facebook-normal.png 2013-06-18 21:41:02 +0000 and app/assets/images/facebook-normal.png 1970-01-01 00:00:00 +0000 differ |
| 126 | === removed file 'app/assets/images/getfile_button-pressed.png' |
| 127 | Binary files app/assets/images/getfile_button-pressed.png 2012-10-26 08:37:47 +0000 and app/assets/images/getfile_button-pressed.png 1970-01-01 00:00:00 +0000 differ |
| 128 | === removed file 'app/assets/images/getfile_button.png' |
| 129 | Binary files app/assets/images/getfile_button.png 2012-10-26 08:37:47 +0000 and app/assets/images/getfile_button.png 1970-01-01 00:00:00 +0000 differ |
| 130 | === removed file 'app/assets/images/glyphicons-halflings-white.png' |
| 131 | Binary files app/assets/images/glyphicons-halflings-white.png 2012-07-18 21:14:50 +0000 and app/assets/images/glyphicons-halflings-white.png 1970-01-01 00:00:00 +0000 differ |
| 132 | === removed file 'app/assets/images/glyphicons-halflings.png' |
| 133 | Binary files app/assets/images/glyphicons-halflings.png 2012-07-18 21:14:50 +0000 and app/assets/images/glyphicons-halflings.png 1970-01-01 00:00:00 +0000 differ |
| 134 | === removed file 'app/assets/images/header_nav_border.jpg' |
| 135 | Binary files app/assets/images/header_nav_border.jpg 2013-04-03 01:48:42 +0000 and app/assets/images/header_nav_border.jpg 1970-01-01 00:00:00 +0000 differ |
| 136 | === removed file 'app/assets/images/icons/icon_noshadow_destroy.png' |
| 137 | Binary files app/assets/images/icons/icon_noshadow_destroy.png 2013-07-19 16:03:37 +0000 and app/assets/images/icons/icon_noshadow_destroy.png 1970-01-01 00:00:00 +0000 differ |
| 138 | === removed file 'app/assets/images/icons/icon_noshadow_view.png' |
| 139 | Binary files app/assets/images/icons/icon_noshadow_view.png 2013-07-20 01:15:05 +0000 and app/assets/images/icons/icon_noshadow_view.png 1970-01-01 00:00:00 +0000 differ |
| 140 | === removed file 'app/assets/images/icons/icon_shadow_destroy.png' |
| 141 | Binary files app/assets/images/icons/icon_shadow_destroy.png 2012-09-20 15:53:46 +0000 and app/assets/images/icons/icon_shadow_destroy.png 1970-01-01 00:00:00 +0000 differ |
| 142 | === removed file 'app/assets/images/icons/icon_shadow_relation.png' |
| 143 | Binary files app/assets/images/icons/icon_shadow_relation.png 2012-09-20 15:53:46 +0000 and app/assets/images/icons/icon_shadow_relation.png 1970-01-01 00:00:00 +0000 differ |
| 144 | === removed file 'app/assets/images/icons/icon_shadow_triangle.png' |
| 145 | Binary files app/assets/images/icons/icon_shadow_triangle.png 2012-10-11 13:24:31 +0000 and app/assets/images/icons/icon_shadow_triangle.png 1970-01-01 00:00:00 +0000 differ |
| 146 | === removed file 'app/assets/images/icons/icon_shadow_triangle_right.png' |
| 147 | Binary files app/assets/images/icons/icon_shadow_triangle_right.png 2012-10-25 12:04:24 +0000 and app/assets/images/icons/icon_shadow_triangle_right.png 1970-01-01 00:00:00 +0000 differ |
| 148 | === removed file 'app/assets/images/icons/icon_shadow_view.png' |
| 149 | Binary files app/assets/images/icons/icon_shadow_view.png 2012-09-20 15:53:46 +0000 and app/assets/images/icons/icon_shadow_view.png 1970-01-01 00:00:00 +0000 differ |
| 150 | === removed file 'app/assets/images/juju-128.png' |
| 151 | Binary files app/assets/images/juju-128.png 2012-09-01 01:45:08 +0000 and app/assets/images/juju-128.png 1970-01-01 00:00:00 +0000 differ |
| 152 | === removed file 'app/assets/images/juju-white.png' |
| 153 | Binary files app/assets/images/juju-white.png 2012-08-18 03:48:20 +0000 and app/assets/images/juju-white.png 1970-01-01 00:00:00 +0000 differ |
| 154 | === removed file 'app/assets/images/juju.png' |
| 155 | Binary files app/assets/images/juju.png 2012-07-18 21:14:50 +0000 and app/assets/images/juju.png 1970-01-01 00:00:00 +0000 differ |
| 156 | === removed file 'app/assets/images/landscape_logo.png' |
| 157 | Binary files app/assets/images/landscape_logo.png 2013-03-26 21:13:04 +0000 and app/assets/images/landscape_logo.png 1970-01-01 00:00:00 +0000 differ |
| 158 | === removed file 'app/assets/images/landscape_machine.png' |
| 159 | Binary files app/assets/images/landscape_machine.png 2013-02-14 00:32:35 +0000 and app/assets/images/landscape_machine.png 1970-01-01 00:00:00 +0000 differ |
| 160 | === removed file 'app/assets/images/landscape_restart_round.png' |
| 161 | Binary files app/assets/images/landscape_restart_round.png 2013-02-14 00:32:35 +0000 and app/assets/images/landscape_restart_round.png 1970-01-01 00:00:00 +0000 differ |
| 162 | === removed file 'app/assets/images/landscape_security_round.png' |
| 163 | Binary files app/assets/images/landscape_security_round.png 2013-03-26 21:13:04 +0000 and app/assets/images/landscape_security_round.png 1970-01-01 00:00:00 +0000 differ |
| 164 | === removed file 'app/assets/images/landscape_updates.png' |
| 165 | Binary files app/assets/images/landscape_updates.png 2013-03-27 12:42:25 +0000 and app/assets/images/landscape_updates.png 1970-01-01 00:00:00 +0000 differ |
| 166 | === removed file 'app/assets/images/left_shadow.png' |
| 167 | Binary files app/assets/images/left_shadow.png 2012-09-20 18:42:45 +0000 and app/assets/images/left_shadow.png 1970-01-01 00:00:00 +0000 differ |
| 168 | === removed file 'app/assets/images/on_left.png' |
| 169 | Binary files app/assets/images/on_left.png 2012-10-22 12:09:39 +0000 and app/assets/images/on_left.png 1970-01-01 00:00:00 +0000 differ |
| 170 | === removed file 'app/assets/images/on_middle.png' |
| 171 | Binary files app/assets/images/on_middle.png 2012-10-22 12:09:39 +0000 and app/assets/images/on_middle.png 1970-01-01 00:00:00 +0000 differ |
| 172 | === removed file 'app/assets/images/on_right.png' |
| 173 | Binary files app/assets/images/on_right.png 2012-10-22 12:09:39 +0000 and app/assets/images/on_right.png 1970-01-01 00:00:00 +0000 differ |
| 174 | === removed file 'app/assets/images/picker_1px.png' |
| 175 | Binary files app/assets/images/picker_1px.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_1px.png 1970-01-01 00:00:00 +0000 differ |
| 176 | === removed file 'app/assets/images/picker_left_edge.png' |
| 177 | Binary files app/assets/images/picker_left_edge.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_left_edge.png 1970-01-01 00:00:00 +0000 differ |
| 178 | === removed file 'app/assets/images/picker_view_right_button.png' |
| 179 | Binary files app/assets/images/picker_view_right_button.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_view_right_button.png 1970-01-01 00:00:00 +0000 differ |
| 180 | === removed file 'app/assets/images/picker_view_right_button_down.png' |
| 181 | Binary files app/assets/images/picker_view_right_button_down.png 2012-11-26 12:05:56 +0000 and app/assets/images/picker_view_right_button_down.png 1970-01-01 00:00:00 +0000 differ |
| 182 | === removed file 'app/assets/images/picker_zoom_right_button.png' |
| 183 | Binary files app/assets/images/picker_zoom_right_button.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_zoom_right_button.png 1970-01-01 00:00:00 +0000 differ |
| 184 | === removed file 'app/assets/images/picker_zoom_right_button_down_press.png' |
| 185 | Binary files app/assets/images/picker_zoom_right_button_down_press.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_zoom_right_button_down_press.png 1970-01-01 00:00:00 +0000 differ |
| 186 | === removed file 'app/assets/images/picker_zoom_right_button_up_press.png' |
| 187 | Binary files app/assets/images/picker_zoom_right_button_up_press.png 2012-09-20 18:42:45 +0000 and app/assets/images/picker_zoom_right_button_up_press.png 1970-01-01 00:00:00 +0000 differ |
| 188 | === removed file 'app/assets/images/right_shadow.png' |
| 189 | Binary files app/assets/images/right_shadow.png 2012-09-20 18:42:45 +0000 and app/assets/images/right_shadow.png 1970-01-01 00:00:00 +0000 differ |
| 190 | === removed file 'app/assets/images/searchbox_icon.png' |
| 191 | Binary files app/assets/images/searchbox_icon.png 2012-10-11 20:49:22 +0000 and app/assets/images/searchbox_icon.png 1970-01-01 00:00:00 +0000 differ |
| 192 | === removed file 'app/assets/images/slider_off.png' |
| 193 | Binary files app/assets/images/slider_off.png 2013-02-27 20:21:27 +0000 and app/assets/images/slider_off.png 1970-01-01 00:00:00 +0000 differ |
| 194 | === removed file 'app/assets/images/slider_on.png' |
| 195 | Binary files app/assets/images/slider_on.png 2013-02-27 20:21:27 +0000 and app/assets/images/slider_on.png 1970-01-01 00:00:00 +0000 differ |
| 196 | === removed file 'app/assets/images/tab_div.png' |
| 197 | Binary files app/assets/images/tab_div.png 2013-03-20 05:23:18 +0000 and app/assets/images/tab_div.png 1970-01-01 00:00:00 +0000 differ |
| 198 | === removed file 'app/assets/images/tab_marker.png' |
| 199 | Binary files app/assets/images/tab_marker.png 2012-10-22 11:57:15 +0000 and app/assets/images/tab_marker.png 1970-01-01 00:00:00 +0000 differ |
| 200 | === removed file 'app/assets/images/toggles.png' |
| 201 | Binary files app/assets/images/toggles.png 2012-10-22 12:09:39 +0000 and app/assets/images/toggles.png 1970-01-01 00:00:00 +0000 differ |
| 202 | === removed file 'app/assets/images/top_bar.png' |
| 203 | Binary files app/assets/images/top_bar.png 2012-09-20 18:42:45 +0000 and app/assets/images/top_bar.png 1970-01-01 00:00:00 +0000 differ |
| 204 | === removed file 'app/assets/images/top_bar_div.png' |
| 205 | Binary files app/assets/images/top_bar_div.png 2012-09-20 18:42:45 +0000 and app/assets/images/top_bar_div.png 1970-01-01 00:00:00 +0000 differ |
| 206 | === removed file 'app/assets/images/view_1px.png' |
| 207 | Binary files app/assets/images/view_1px.png 2012-09-25 19:11:23 +0000 and app/assets/images/view_1px.png 1970-01-01 00:00:00 +0000 differ |
| 208 | === removed file 'app/assets/images/view_div.png' |
| 209 | Binary files app/assets/images/view_div.png 2012-09-25 19:11:23 +0000 and app/assets/images/view_div.png 1970-01-01 00:00:00 +0000 differ |
| 210 | === removed file 'app/assets/images/view_left_edge.png' |
| 211 | Binary files app/assets/images/view_left_edge.png 2012-09-25 19:11:23 +0000 and app/assets/images/view_left_edge.png 1970-01-01 00:00:00 +0000 differ |
| 212 | === removed file 'app/assets/images/view_right_edge.png' |
| 213 | Binary files app/assets/images/view_right_edge.png 2012-09-25 19:11:23 +0000 and app/assets/images/view_right_edge.png 1970-01-01 00:00:00 +0000 differ |
| 214 | === removed file 'app/assets/images/zoom_1px.png' |
| 215 | Binary files app/assets/images/zoom_1px.png 2012-09-25 19:11:23 +0000 and app/assets/images/zoom_1px.png 1970-01-01 00:00:00 +0000 differ |
| 216 | === removed file 'app/assets/images/zoom_left_edge.png' |
| 217 | Binary files app/assets/images/zoom_left_edge.png 2012-09-25 19:11:23 +0000 and app/assets/images/zoom_left_edge.png 1970-01-01 00:00:00 +0000 differ |
| 218 | === removed file 'app/assets/images/zoom_right_edge.png' |
| 219 | Binary files app/assets/images/zoom_right_edge.png 2012-09-25 19:11:23 +0000 and app/assets/images/zoom_right_edge.png 1970-01-01 00:00:00 +0000 differ |
| 220 | === modified file 'app/index.html' |
| 221 | --- app/index.html 2013-10-25 15:33:34 +0000 |
| 222 | +++ app/index.html 2013-10-25 22:17:57 +0000 |
| 223 | @@ -114,71 +114,67 @@ |
| 224 | </p> |
| 225 | </div> |
| 226 | </div> |
| 227 | - <div id="viewport-wrapper"> |
| 228 | - <div id="vp-left-border"></div> |
| 229 | - <div id="viewport"> |
| 230 | - <div class="navbar"> |
| 231 | - <ul id="browser-nav"> |
| 232 | - <li id="nav-brand-env"> |
| 233 | - <a class="brand" href="/"> |
| 234 | - <i class="sprite juju_logo_trans" title="Juju GUI"></i> |
| 235 | - </a> |
| 236 | - </li> |
| 237 | - <li id="environment-switcher"> |
| 238 | - <span id="environment-name" draggable="true"></span> |
| 239 | - <span id="provider-type" class="provider-type"></span> |
| 240 | - </li> |
| 241 | - <li class="tab"> |
| 242 | - <a class="fullscreen" href=""> |
| 243 | - <i class="sprite fullscreen_icon"></i> |
| 244 | - Browse |
| 245 | - </a> |
| 246 | - </li> |
| 247 | - <li class="tab"> |
| 248 | - <a class="sidebar" href=""> |
| 249 | - <i class="sprite sidebar_icon"></i> |
| 250 | - Build |
| 251 | - </a> |
| 252 | - </li> |
| 253 | - <li class="import-export"> |
| 254 | - <a href="" id="import-trigger"> |
| 255 | - <i class="sprite icon-import-normal normal"></i> |
| 256 | - <i class="sprite icon-import-hover hover"></i> |
| 257 | - </a> |
| 258 | - <a href="" id="export-trigger"> |
| 259 | - <i class="sprite icon-export-normal normal"></i> |
| 260 | - <i class="sprite icon-export-hover hover"></i> |
| 261 | - </a> |
| 262 | - </li> |
| 263 | - <li class="notifications-nav"> |
| 264 | - <div id="notifications"></div> |
| 265 | - <div id="notifier-box"></div> |
| 266 | - </li> |
| 267 | - </ul> |
| 268 | - <ul class="right-nav"> |
| 269 | - <li class="help-dropdown"> |
| 270 | - <a href=""> |
| 271 | - Help & Feedback |
| 272 | - <span class="expand"> |
| 273 | - <i class="sprite chevron_down more"></i> |
| 274 | - <i class="sprite chevron_up less hidden"></i> |
| 275 | - </span> |
| 276 | - </a> |
| 277 | - </li> |
| 278 | - <li> |
| 279 | - <a href="" id="logout-trigger" class="button inverse">Logout</a> |
| 280 | - </li> |
| 281 | - </ul> |
| 282 | - </div> |
| 283 | - <div id="content"> |
| 284 | - <div id="shortcut-help" style="display:none"></div> |
| 285 | - <div id="subapp-browser-min" style="display: none;"></div> |
| 286 | - <div id="subapp-browser" class="yui3-skin-sam"></div> |
| 287 | - <div id="main"> |
| 288 | - </div> <!-- /container --> |
| 289 | - </div> |
| 290 | - </div> |
| 291 | - <div id="vp-right-border"></div> |
| 292 | + <div id="viewport"> |
| 293 | + <div class="navbar"> |
| 294 | + <ul id="browser-nav"> |
| 295 | + <li id="nav-brand-env"> |
| 296 | + <a class="brand" href="/"> |
| 297 | + <i class="sprite juju_logo_trans" title="Juju GUI"></i> |
| 298 | + </a> |
| 299 | + </li> |
| 300 | + <li id="environment-switcher"> |
| 301 | + <span id="environment-name" draggable="true"></span> |
| 302 | + <span id="provider-type" class="provider-type"></span> |
| 303 | + </li> |
| 304 | + <li class="tab"> |
| 305 | + <a class="fullscreen" href=""> |
| 306 | + <i class="sprite fullscreen_icon"></i> |
| 307 | + Browse |
| 308 | + </a> |
| 309 | + </li> |
| 310 | + <li class="tab"> |
| 311 | + <a class="sidebar" href=""> |
| 312 | + <i class="sprite sidebar_icon"></i> |
| 313 | + Build |
| 314 | + </a> |
| 315 | + </li> |
| 316 | + <li class="import-export"> |
| 317 | + <a href="" id="import-trigger"> |
| 318 | + <i class="sprite icon-import-normal normal"></i> |
| 319 | + <i class="sprite icon-import-hover hover"></i> |
| 320 | + </a> |
| 321 | + <a href="" id="export-trigger"> |
| 322 | + <i class="sprite icon-export-normal normal"></i> |
| 323 | + <i class="sprite icon-export-hover hover"></i> |
| 324 | + </a> |
| 325 | + </li> |
| 326 | + <li class="notifications-nav"> |
| 327 | + <div id="notifications"></div> |
| 328 | + <div id="notifier-box"></div> |
| 329 | + </li> |
| 330 | + </ul> |
| 331 | + <ul class="right-nav"> |
| 332 | + <li class="help-dropdown"> |
| 333 | + <a href=""> |
| 334 | + Help & Feedback |
| 335 | + <span class="expand"> |
| 336 | + <i class="sprite chevron_down more"></i> |
| 337 | + <i class="sprite chevron_up less hidden"></i> |
| 338 | + </span> |
| 339 | + </a> |
| 340 | + </li> |
| 341 | + <li> |
| 342 | + <a href="" id="logout-trigger" class="button inverse">Logout</a> |
| 343 | + </li> |
| 344 | + </ul> |
| 345 | + </div> |
| 346 | + <div id="content"> |
| 347 | + <div id="shortcut-help" style="display:none"></div> |
| 348 | + <div id="subapp-browser-min" style="display: none;"></div> |
| 349 | + <div id="subapp-browser" class="yui3-skin-sam"></div> |
| 350 | + <div id="main"> |
| 351 | + </div> <!-- /container --> |
| 352 | + </div> |
| 353 | </div> |
| 354 | <script src="/juju-ui/assets/javascripts/spin.min.js"></script> |
| 355 | <script id="app-startup"> |
| 356 | |
| 357 | === modified file 'lib/templates.js' |
| 358 | --- lib/templates.js 2013-08-16 20:16:31 +0000 |
| 359 | +++ lib/templates.js 2013-10-25 22:17:57 +0000 |
| 360 | @@ -174,13 +174,6 @@ |
| 361 | } |
| 362 | }, |
| 363 | |
| 364 | - manifest: { |
| 365 | - output: __dirname + '/../manifest.json', |
| 366 | - callback: function(strategy, name) { |
| 367 | - renderTemplate(name, config, strategy.output); |
| 368 | - } |
| 369 | - }, |
| 370 | - |
| 371 | less: { |
| 372 | output: __dirname + '/../build-shared/juju-ui/assets/juju-gui.css', |
| 373 | callback: function(strategy, name) { |
| 374 | |
| 375 | === modified file 'lib/views/browser/charm-full.less' |
| 376 | --- lib/views/browser/charm-full.less 2013-10-17 06:12:35 +0000 |
| 377 | +++ lib/views/browser/charm-full.less 2013-10-25 22:17:57 +0000 |
| 378 | @@ -36,17 +36,10 @@ |
| 379 | display: inline-block; |
| 380 | float: left; |
| 381 | } |
| 382 | - .charm-icon, |
| 383 | img.icon { |
| 384 | width: 120px; |
| 385 | height: 120px; |
| 386 | } |
| 387 | - .charm-icon { |
| 388 | - background: transparent |
| 389 | - url(/juju-ui/assets/images/charm_160.png) |
| 390 | - left top no-repeat; |
| 391 | - background-size: 120px 120px; |
| 392 | - } |
| 393 | .add-reviewed { |
| 394 | position: absolute; |
| 395 | bottom: 30px; |
| 396 | |
| 397 | === modified file 'lib/views/browser/token.less' |
| 398 | --- lib/views/browser/token.less 2013-10-09 04:05:57 +0000 |
| 399 | +++ lib/views/browser/token.less 2013-10-25 22:17:57 +0000 |
| 400 | @@ -18,46 +18,30 @@ |
| 401 | &.tiny { |
| 402 | min-width: 200px; |
| 403 | |
| 404 | - .charm-icon, |
| 405 | .icon { |
| 406 | margin-right: 12px; |
| 407 | position: relative; |
| 408 | } |
| 409 | - .charm-icon, |
| 410 | - .charm-icon img, |
| 411 | .icon, |
| 412 | .icon img { |
| 413 | width: 48px; |
| 414 | height: 48px; |
| 415 | } |
| 416 | - .charm-icon { |
| 417 | - background: transparent |
| 418 | - url(/juju-ui/assets/images/charm_48.png) |
| 419 | - left top no-repeat; |
| 420 | - } |
| 421 | .metadata, |
| 422 | .description { |
| 423 | display: none; |
| 424 | } |
| 425 | } |
| 426 | &.small { |
| 427 | - .charm-icon, |
| 428 | .icon { |
| 429 | margin-right: 10px; |
| 430 | position: relative; |
| 431 | } |
| 432 | - .charm-icon, |
| 433 | - .charm-icon img, |
| 434 | .icon, |
| 435 | .icon img { |
| 436 | width: 50px; |
| 437 | height: 50px; |
| 438 | } |
| 439 | - .charm-icon { |
| 440 | - background: transparent |
| 441 | - url(/juju-ui/assets/images/charm_48.png) |
| 442 | - left top no-repeat; |
| 443 | - } |
| 444 | .metadata { |
| 445 | text-overflow: ellipsis; |
| 446 | max-width: 173px; |
| 447 | @@ -66,23 +50,15 @@ |
| 448 | } |
| 449 | } |
| 450 | &.large { |
| 451 | - .charm-icon, |
| 452 | .icon { |
| 453 | margin-right: 16px; |
| 454 | position: relative; |
| 455 | } |
| 456 | - .charm-icon, |
| 457 | - .charm-icon img, |
| 458 | .icon, |
| 459 | .icon img { |
| 460 | width: 96px; |
| 461 | height: 96px; |
| 462 | } |
| 463 | - .charm-icon { |
| 464 | - background: transparent |
| 465 | - url(/juju-ui/assets/images/charm_96.png) |
| 466 | - left top no-repeat; |
| 467 | - } |
| 468 | } |
| 469 | .block-icon, |
| 470 | .title, |
| 471 | |
| 472 | === removed file 'lib/views/manifest.handlebars' |
| 473 | --- lib/views/manifest.handlebars 2012-09-07 04:54:24 +0000 |
| 474 | +++ lib/views/manifest.handlebars 1970-01-01 00:00:00 +0000 |
| 475 | @@ -1,23 +0,0 @@ |
| 476 | -{ |
| 477 | - "name": "Juju GUI", |
| 478 | - "manifest_version": 2, |
| 479 | - "version": "0.2.0", |
| 480 | - |
| 481 | - "description": "Manage your Juju environment", |
| 482 | - "icons": { |
| 483 | - "128": "app/assets/images/juju-128.png" |
| 484 | - }, |
| 485 | - |
| 486 | - "app": { |
| 487 | - "urls": [ |
| 488 | - "*://{{server.public_hostname}}/" |
| 489 | - ], |
| 490 | - "launch": { |
| 491 | - "web_url": "http://{{server.public_hostname}}:{{server.port}}/" |
| 492 | - } |
| 493 | - }, |
| 494 | - "permissions": [ |
| 495 | - "unlimitedStorage", |
| 496 | - "notifications" |
| 497 | - ] |
| 498 | -} |
| 499 | |
| 500 | === modified file 'lib/views/stylesheet.less' |
| 501 | --- lib/views/stylesheet.less 2013-10-25 00:19:25 +0000 |
| 502 | +++ lib/views/stylesheet.less 2013-10-25 22:17:57 +0000 |
| 503 | @@ -166,9 +166,13 @@ |
| 504 | margin-top: @navbar-height; |
| 505 | background-color: #302b28; |
| 506 | font-family: @font-family; |
| 507 | + font-weight: 300; |
| 508 | height: 100%; |
| 509 | font-size: 13px; |
| 510 | line-height: 18px; |
| 511 | + -webkit-font-smoothing: antialiased; |
| 512 | + // This won't start working until Firefox 25 |
| 513 | + -moz-osx-font-smoothing: grayscale; |
| 514 | } |
| 515 | a, |
| 516 | a:hover { |
| 517 | @@ -271,26 +275,8 @@ |
| 518 | } |
| 519 | |
| 520 | /* Layout, widgets etc. */ |
| 521 | -#viewport-wrapper { |
| 522 | - position: relative; |
| 523 | -} |
| 524 | -#vp-left-border { |
| 525 | - position: absolute; |
| 526 | - top: 0; |
| 527 | - left: 0; |
| 528 | - background: url(/juju-ui/assets/images/left_shadow.png) repeat-y; |
| 529 | - margin-left: -12px; |
| 530 | - width: 12px; |
| 531 | -} |
| 532 | -#vp-right-border { |
| 533 | - position: absolute; |
| 534 | - top: 0; |
| 535 | - right: 0; |
| 536 | - background: url(/juju-ui/assets/images/right_shadow.png) repeat-y; |
| 537 | - margin-right: -12px; |
| 538 | - width: 12px; |
| 539 | -} |
| 540 | |
| 541 | +// The main header above the canvas |
| 542 | .navbar { |
| 543 | min-width: 800px; |
| 544 | // Need to subtract the bottom-border-height. |
| 545 | @@ -459,41 +445,6 @@ |
| 546 | } |
| 547 | } |
| 548 | } |
| 549 | -.bottom-navbar { |
| 550 | - min-width: 800px; |
| 551 | - height: @navbar-bottom-height; |
| 552 | - position: relative; |
| 553 | - background: url(/juju-ui/assets/images/bottom_bar.png) repeat-x; |
| 554 | - |
| 555 | - .landscape-controls { |
| 556 | - position: absolute; |
| 557 | - top: 0; |
| 558 | - right: 0; |
| 559 | - width: 295px; |
| 560 | - margin-right: 10px; |
| 561 | - |
| 562 | - div { |
| 563 | - float: right; |
| 564 | - width: 60px; |
| 565 | - |
| 566 | - .landscape-icon { |
| 567 | - margin: 10px 0 0 16px; |
| 568 | - } |
| 569 | - .icon-divider { |
| 570 | - margin-top: 8px; |
| 571 | - } |
| 572 | - } |
| 573 | - |
| 574 | - .logo-tab { |
| 575 | - width: 115px!important; |
| 576 | - |
| 577 | - i { |
| 578 | - margin-top: 1px; |
| 579 | - margin-left: 5px; |
| 580 | - } |
| 581 | - } |
| 582 | - } |
| 583 | -} |
| 584 | #content { |
| 585 | position: relative; |
| 586 | background-color: #fff; |
| 587 | @@ -501,6 +452,7 @@ |
| 588 | } |
| 589 | #main { |
| 590 | overflow: hidden; |
| 591 | + |
| 592 | .view-container { |
| 593 | overflow-y: auto; |
| 594 | } |
| 595 | @@ -637,18 +589,12 @@ |
| 596 | font-size: 13px; |
| 597 | color: @text-colour; |
| 598 | } |
| 599 | - &.view-service { |
| 600 | - background-image: url(/juju-ui/assets/images/icons/icon_noshadow_view.png); |
| 601 | - } |
| 602 | &.add-relation { |
| 603 | background-image: url(/juju-ui/assets/images/icons/icon_noshadow_relation.png); |
| 604 | .disabled { |
| 605 | color: red; |
| 606 | } |
| 607 | } |
| 608 | - &.destroy-service { |
| 609 | - background-image: url(/juju-ui/assets/images/icons/icon_noshadow_destroy.png); |
| 610 | - } |
| 611 | &.landscape-reboot { |
| 612 | background-image: url(/juju-ui/assets/images/landscape_restart_menu.png); |
| 613 | } |
| 614 | @@ -1083,124 +1029,6 @@ |
| 615 | #zoom-out-btn { |
| 616 | top: 10px; |
| 617 | } |
| 618 | - |
| 619 | -.create-picker(@width, @top, @listtop, @listbottom) { |
| 620 | - width: @width; |
| 621 | - |
| 622 | - .picker-body { |
| 623 | - width: @width - 15px; |
| 624 | - } |
| 625 | - .picker-expanded { |
| 626 | - display: none; |
| 627 | - top: @top; |
| 628 | - |
| 629 | - &.active { |
| 630 | - z-index: 100; |
| 631 | - display: block; |
| 632 | - } |
| 633 | - .picker-edge { |
| 634 | - display: block; |
| 635 | - top: auto; |
| 636 | - bottom: -10px; |
| 637 | - margin-left: -3px; |
| 638 | - } |
| 639 | - .picker-edge-right { |
| 640 | - left: auto; |
| 641 | - right: 0; |
| 642 | - margin-left: 0; |
| 643 | - margin-right: -3px; |
| 644 | - } |
| 645 | - .picker-list { |
| 646 | - position: absolute; |
| 647 | - bottom: @listbottom; |
| 648 | - top: @listtop; |
| 649 | - left: 0px; |
| 650 | - height: 100%; |
| 651 | - background: url(/juju-ui/assets/images/view_1px.png) repeat-x; |
| 652 | - list-style-type: none; |
| 653 | - padding: 0; |
| 654 | - margin: 0; |
| 655 | - height: 54px; |
| 656 | - width: @width - 8px; |
| 657 | - cursor: pointer; |
| 658 | - |
| 659 | - ul { |
| 660 | - list-style-type: none; |
| 661 | - padding-top: 5px; |
| 662 | - padding-bottom: 5px; |
| 663 | - margin: 0; |
| 664 | - |
| 665 | - li { |
| 666 | - padding-left: 7px; |
| 667 | - |
| 668 | - &.activetick { |
| 669 | - background: |
| 670 | - url(/juju-ui/assets/images/selected_tick.png) |
| 671 | - no-repeat 240px 3px; |
| 672 | - } |
| 673 | - } |
| 674 | - } |
| 675 | - } |
| 676 | - } |
| 677 | - .picker-edge { |
| 678 | - position: absolute; |
| 679 | - top: @top; |
| 680 | - left: 0; |
| 681 | - } |
| 682 | - .picker-body { |
| 683 | - position: absolute; |
| 684 | - top: @top; |
| 685 | - left: 4px; |
| 686 | - background: url(/juju-ui/assets/images/picker_1px.png) repeat-x; |
| 687 | - height: 20px; |
| 688 | - padding: 3px 0 0 3px; |
| 689 | - } |
| 690 | - .picker-button { |
| 691 | - position: absolute; |
| 692 | - top: @top; |
| 693 | - right: 0; |
| 694 | - } |
| 695 | - &.inactive { |
| 696 | - .picker-edge, |
| 697 | - .picker-body, |
| 698 | - .picker-button { |
| 699 | - display: none; |
| 700 | - } |
| 701 | - } |
| 702 | -} |
| 703 | -.picker { |
| 704 | - position: relative; |
| 705 | - display: inline-block; |
| 706 | - margin: 0; |
| 707 | - padding: 0; |
| 708 | - height: 24px; |
| 709 | - |
| 710 | - &.charm-filter-picker { |
| 711 | - .create-picker(270px, @top, @top, initial); |
| 712 | - left: 11px; |
| 713 | - padding-bottom: 5px; |
| 714 | - @top: 0px; |
| 715 | - top: @top; |
| 716 | - |
| 717 | - .picker-expanded .picker-list { |
| 718 | - .create-border-radius(@border-radius); |
| 719 | - .create-box-shadow(0 0 4px rgba(0,0,0,.51)); |
| 720 | - -moz-background-clip: padding; |
| 721 | - -webkit-background-clip: padding-box; |
| 722 | - background-clip: padding-box; |
| 723 | - background-color: #fff; |
| 724 | - background: white; |
| 725 | - height: auto; |
| 726 | - } |
| 727 | - } |
| 728 | - &.zoom-picker { |
| 729 | - width: 56px; |
| 730 | - |
| 731 | - .picker-body { |
| 732 | - width: 36px; |
| 733 | - } |
| 734 | - } |
| 735 | -} |
| 736 | #unit-status { |
| 737 | .running { |
| 738 | color: green; |
| 739 | @@ -1260,9 +1088,8 @@ |
| 740 | float: right; |
| 741 | } |
| 742 | } |
| 743 | - |
| 744 | -#juju-search-charm-panel, |
| 745 | .juju-inspector { |
| 746 | + // XXX huw delete this and move appropriate styles into juju-inspector.less |
| 747 | .create-box-shadow(inset 0 -1px 0 lightgray); |
| 748 | .customize-scrollbar; |
| 749 | display: block; |
| 750 | @@ -1488,7 +1315,6 @@ |
| 751 | z-index: 0; |
| 752 | } |
| 753 | span.config-file-upload { |
| 754 | - background: url(/juju-ui/assets/images/getfile_button.png) no-repeat; |
| 755 | color: #4c4c4c; |
| 756 | font-family: @font-family-medium; |
| 757 | position: absolute; |
| 758 | @@ -1500,10 +1326,6 @@ |
| 759 | width: 149px; |
| 760 | z-index: 2; |
| 761 | cursor: pointer; |
| 762 | - |
| 763 | - &:active { |
| 764 | - background: url(/juju-ui/assets/images/getfile_button-pressed.png) no-repeat; |
| 765 | - } |
| 766 | } |
| 767 | .config-file-name { |
| 768 | position: absolute; |
| 769 | @@ -1600,242 +1422,9 @@ |
| 770 | margin-left: 10px; |
| 771 | margin-right: 10px; |
| 772 | } |
| 773 | -.service-view { |
| 774 | - .juju-service-info-container-bottom-menu { |
| 775 | - height: 50px; |
| 776 | - position: relative; |
| 777 | - color: @navbar-color; |
| 778 | - text-align: center; |
| 779 | - |
| 780 | - .filter-control { |
| 781 | - position: absolute; |
| 782 | - left: 10px; |
| 783 | - top: 13px; |
| 784 | - width: 350px; |
| 785 | - display: inline-block; |
| 786 | - |
| 787 | - .filter-label { |
| 788 | - position: absolute; |
| 789 | - left: 10px; |
| 790 | - top: 3px; |
| 791 | - } |
| 792 | - |
| 793 | - .control-separator { |
| 794 | - padding-top: 0px; |
| 795 | - padding-left: 5px; |
| 796 | - |
| 797 | - img { |
| 798 | - height: 30px; |
| 799 | - padding-top: 0px; |
| 800 | - } |
| 801 | - } |
| 802 | - |
| 803 | - .state-buttons { |
| 804 | - margin-left: 50px; |
| 805 | - |
| 806 | - img { |
| 807 | - padding-top: 0px; |
| 808 | - height: 30px; |
| 809 | - } |
| 810 | - |
| 811 | - div { |
| 812 | - padding-top: 3px; |
| 813 | - width: 70px; |
| 814 | - height: 21px; |
| 815 | - background:url(/juju-ui/assets/images/toggles.png) -70px 0; |
| 816 | - |
| 817 | - &.active { |
| 818 | - .white; |
| 819 | - background:url(/juju-ui/assets/images/on_middle.png) 0 0; |
| 820 | - } |
| 821 | - |
| 822 | - &:first-child { |
| 823 | - background:url(/juju-ui/assets/images/toggles.png) 0 0px; |
| 824 | - |
| 825 | - &.active { |
| 826 | - .white; |
| 827 | - background:url(/juju-ui/assets/images/on_left.png) 0 0; |
| 828 | - } |
| 829 | - } |
| 830 | - |
| 831 | - &:last-child { |
| 832 | - background:url(/juju-ui/assets/images/toggles.png) -210px 0; |
| 833 | - |
| 834 | - &.active { |
| 835 | - .white; |
| 836 | - background:url(/juju-ui/assets/images/on_right.png) 0 0; |
| 837 | - } |
| 838 | - } |
| 839 | - } |
| 840 | - span:first-child { |
| 841 | - padding-right: 5px; |
| 842 | - } |
| 843 | - .white { |
| 844 | - a { |
| 845 | - color: white !important; |
| 846 | - } |
| 847 | - } |
| 848 | - |
| 849 | - a { |
| 850 | - color: @navbar-color; |
| 851 | - |
| 852 | - &:link, &:visited, &:active, &:hover { |
| 853 | - text-decoration: none |
| 854 | - } |
| 855 | - } |
| 856 | - } |
| 857 | - } |
| 858 | - } |
| 859 | - .service-header-partial { |
| 860 | - .name { |
| 861 | - padding-top: 38px; |
| 862 | - padding-left: 46px; |
| 863 | - height: 73px; |
| 864 | - |
| 865 | - div:nth-child(1) { |
| 866 | - font-style: normal; |
| 867 | - height: 28px; |
| 868 | - font-size: 24px; |
| 869 | - color: #292929; |
| 870 | - } |
| 871 | - |
| 872 | - div:nth-child(2) { |
| 873 | - font-style: italic; |
| 874 | - font-size: 16px; |
| 875 | - color: #6a737b; |
| 876 | - } |
| 877 | - } |
| 878 | - .menu-items { |
| 879 | - padding: 6px 0 6px 38px; |
| 880 | - background: #dedede url(/juju-ui/assets/images/tab_div.png) repeat-x left bottom; |
| 881 | - border-top: 1px solid #b6b6b6; |
| 882 | - |
| 883 | - .item { |
| 884 | - a { |
| 885 | - font-size: 12px; |
| 886 | - padding-left: 10px; |
| 887 | - padding-right: 10px; |
| 888 | - color: #292929; |
| 889 | - } |
| 890 | - a:link, a:visited, a:active, a:hover { |
| 891 | - text-decoration: none |
| 892 | - } |
| 893 | - |
| 894 | - .link-active { |
| 895 | - color: #dd4814 !important; |
| 896 | - } |
| 897 | - .active { |
| 898 | - margin-top: 3px; |
| 899 | - height: 4px; |
| 900 | - background: url(/juju-ui/assets/images/tab_marker.png) |
| 901 | - repeat; |
| 902 | - } |
| 903 | - } |
| 904 | - } |
| 905 | - .controls { |
| 906 | - .control { |
| 907 | - float: right; |
| 908 | - |
| 909 | - .divider { |
| 910 | - margin-right: 3px; |
| 911 | - height: 13px; |
| 912 | - width: 2px; |
| 913 | - } |
| 914 | - } |
| 915 | - .destroy-control { |
| 916 | - margin-top: -1px; |
| 917 | - |
| 918 | - a, a:hover, a:active, a:visited { |
| 919 | - text-decoration: none; |
| 920 | - color: @navbar-color; |
| 921 | - } |
| 922 | - img { |
| 923 | - margin: -4px 5px 0 0; |
| 924 | - } |
| 925 | - } |
| 926 | - .control-expose { |
| 927 | - position: relative; |
| 928 | - margin: -2px 5px 0 0; |
| 929 | - |
| 930 | - div { |
| 931 | - padding-right: 5px; |
| 932 | - } |
| 933 | - .on { |
| 934 | - font-size: 11px; fill: #ffffff; |
| 935 | - position: absolute; |
| 936 | - right: 18px; |
| 937 | - top: 0; |
| 938 | - } |
| 939 | - .off { |
| 940 | - font-size: 12px; fill: #292929; |
| 941 | - position: absolute; |
| 942 | - right: 32px; |
| 943 | - top: 1px; |
| 944 | - } |
| 945 | - } |
| 946 | - } |
| 947 | - } |
| 948 | - .service-common-controls { |
| 949 | - position: absolute; |
| 950 | - left: 355px; |
| 951 | - top: 10px; |
| 952 | - |
| 953 | - .control-unit-count { |
| 954 | - position: absolute; |
| 955 | - left: 0px; |
| 956 | - top: 0px; |
| 957 | - width: 305px; |
| 958 | - |
| 959 | - img { |
| 960 | - padding-top: 0px; |
| 961 | - } |
| 962 | - div { |
| 963 | - padding-left: 5px; |
| 964 | - } |
| 965 | - div:first-child { |
| 966 | - padding-top: 4px; |
| 967 | - } |
| 968 | - input { |
| 969 | - text-align: right; |
| 970 | - width: 5em; |
| 971 | - } |
| 972 | - } |
| 973 | - } |
| 974 | -} |
| 975 | .service-view+.viewlet-manager { |
| 976 | overflow-y: auto; |
| 977 | } |
| 978 | -#tooltip { |
| 979 | - .create-border-radius(@border-radius); |
| 980 | - text-align: left; |
| 981 | - background-color: white; |
| 982 | - border: solid 1px black; |
| 983 | - padding: 0.2em 0.5em 0.3em; |
| 984 | - min-width: 20px; |
| 985 | - max-width: 400px; |
| 986 | -} |
| 987 | -.charm-panel-configure { |
| 988 | - background-image: url(/juju-ui/assets/images/configure-cog.png); |
| 989 | - background-repeat: no-repeat; |
| 990 | - background-position: 230px 38px; |
| 991 | - border-left: 1px solid @charm-panel-configure-color - #333; |
| 992 | - background-color: @charm-panel-configure-color; |
| 993 | - height: 90px; |
| 994 | - width: @charm-panel-width - @charm-panel-padding-left - 1px; |
| 995 | - padding-left: @charm-panel-padding-left; |
| 996 | - |
| 997 | - .title { |
| 998 | - font-weight: lighter; |
| 999 | - font-size: 22px; |
| 1000 | - color: @charm-panel-configure-title-color; |
| 1001 | - margin-top: 35px; |
| 1002 | - } |
| 1003 | - .name { |
| 1004 | - font-size: 12px; |
| 1005 | - color: @charm-panel-configure-name-color; |
| 1006 | - margin-top: 5px; |
| 1007 | - } |
| 1008 | -} |
| 1009 | #full-screen-mask { |
| 1010 | display: block; |
| 1011 | position: absolute; |
Reviewers: mp+192755_
Message:
Please take a look.
Description:
CSS and sprite removal
In this branch:
- Improve font rendering on OSX.
- Removed a whole bunch of unused sprites.
- Removed a bunch of unused CSS, mostly related to the removed sprites.
- Removed the chrome app manifest file.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+-32, -442 lines):
M Makefile
A [revision details]
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/
D app/assets/