Commit Graph

6117 Commits

Author SHA1 Message Date
Torkel Ödegaard
3f05b4bb1e fix(annotations): updated annotations query editor 2016-02-22 14:54:19 +01:00
Torkel Ödegaard
9eabd956b7 ux(): tweak to help popover annimation and fixed pull-right state 2016-02-22 14:20:43 +01:00
Torkel Ödegaard
eb58414600 ux(): fixed sidemenu submenu hover issue that caused it to be hidden as the mouse tried to move on to the submenu 2016-02-22 12:39:56 +01:00
Torkel Ödegaard
cb83c237f4 Merge branch 'master' of github.com:grafana/grafana
Conflicts:
	public/sass/_grafana.scss
2016-02-22 12:00:57 +01:00
Torkel Ödegaard
773a13dc26 fix(): fixed systemjs config for test 2016-02-22 11:45:10 +01:00
Torkel Ödegaard
8c2f7ac083 Merge branch 'master' of github.com:grafana/grafana 2016-02-22 11:42:11 +01:00
Torkel Ödegaard
f375c3000d ux(): help popover 2016-02-22 11:41:50 +01:00
bergquist
ea4ce0ce1f ux(playlist): finalize the ux for playlists 2016-02-22 11:29:09 +01:00
bergquist
6c617ba28c fix(annotations): rearrange missplaced save button 2016-02-22 10:21:22 +01:00
Torkel Ödegaard
b98c826e95 ux(): worked on new popover 2016-02-22 10:17:35 +01:00
bergquist
f225bb0032 ux(annotations): migrate annotations editors to new form 2016-02-22 10:07:02 +01:00
Torkel Ödegaard
145c14ed57 Merge branch 'master' of github.com:grafana/grafana
Conflicts:
	public/sass/.sass-lint.yml
	tasks/options/sasslint.js
2016-02-22 05:52:02 +01:00
Torkel Ödegaard
a93fe5b2b2 poc(): tether drop 2016-02-21 18:08:44 +01:00
Torkel Ödegaard
8f9c3c8381 lib(): added teather lib and tested it with the panel menu 2016-02-21 16:44:11 +01:00
Torkel Ödegaard
363f36dfae ux(): tweaks 2016-02-21 15:21:01 +01:00
Torkel Ödegaard
7328f4d3fd ux(): minor tweak 2016-02-21 13:07:17 +01:00
Torkel Ödegaard
8f3b6a23f6 fix(): gradient hover only on main submenu item 2016-02-21 12:49:30 +01:00
Torkel Ödegaard
cc4fdd6d0c ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better 2016-02-21 12:47:57 +01:00
Torkel Ödegaard
3781a099dd fix(): removed css background that should not have been there in last commit 2016-02-21 09:06:59 +01:00
Torkel Ödegaard
e4d52b2851 fix(snapshot): fixed snapshot header, fixes #4094 2016-02-21 09:02:32 +01:00
Torkel Ödegaard
ac45ccbad7 fix(panel): fixed text panel issue due to recent style changes, fixes #4095 2016-02-21 08:51:01 +01:00
Torkel Ödegaard
1a412378db fix(forms): reverted back to old checkboxes as the new ones are broken and missing clear state, fixes #4096 2016-02-21 08:18:49 +01:00
Torkel Ödegaard
9c47fdeb2f ux(): tweaks to light theme 2016-02-21 00:31:35 +01:00
Torkel Ödegaard
808ac2cefc clean(): removed trailing whitespce 2016-02-21 00:08:35 +01:00
Torkel Ödegaard
aaf6dd2cd6 Merge branch 'avatar' 2016-02-21 00:06:45 +01:00
Torkel Ödegaard
08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
Matt Toback
13720759a5 Merge pull request #4089 from grafana/matt-weekend-ui
Matt weekend ui
2016-02-20 15:00:44 -05:00
Matt
a2731da987 Errant space and no new line on animations mixin! grr 2016-02-20 14:44:21 -05:00
Matt
a8e1572955 Merge branch 'master' of https://github.com/grafana/grafana into matt-weekend-ui 2016-02-20 14:40:25 -05:00
Matt
3ca8e8a6d2 Added a mixin to handle vendor prefixes for animations. Trying out slight opacity on menu 2016-02-20 14:40:16 -05:00
Torkel Ödegaard
bf4a00b663 ux(): added lines backgrounds, did not add them to the page background, could not make them look good / fit in without being distracting 2016-02-20 18:50:41 +01:00
Torkel Ödegaard
4ab041f79e ux(): added sass linter, almost no rules enabled yet 2016-02-20 18:31:09 +01:00
Torkel Ödegaard
f3fe1a5320 fix(build): trying to fix build 2016-02-20 17:54:51 +01:00
Torkel Ödegaard
f808baafa7 ux(): fixes to side menu and gravatar url 2016-02-20 17:43:26 +01:00
Torkel Ödegaard
1f28ff6890 ux(): added gf-form-select-wrapper 2016-02-20 17:21:35 +01:00
Torkel Ödegaard
640c9a49d8 ux(): merge fixes 2016-02-20 16:51:54 +01:00
Torkel Ödegaard
5d51b439d2 ux(): trying to cleanup new form styles, probably broken it 2016-02-20 16:34:40 +01:00
Matt
9ae050f0e5 Trying to fix gf-form styles 2016-02-20 10:18:16 -05:00
Torkel Ödegaard
c77f91213c ux(): minor tweak 2016-02-20 16:16:29 +01:00
Matt
0f7d6a780a Backed out the bra toml file 2016-02-20 10:15:41 -05:00
Matt
ab4957684f Merged with master, I think 2016-02-20 10:13:18 -05:00
Torkel Ödegaard
1dbaabffbc ux(): dark shade / contrast mini tweak 2016-02-20 16:09:31 +01:00
Torkel Ödegaard
d42bfc2570 ux(): fixed compile issue with last commit 2016-02-20 15:48:42 +01:00
Torkel Ödegaard
9ed45ba761 ux(): clean / simplify markup and css for navbar button 2016-02-20 15:36:52 +01:00
Matt
9d893eec01 Adding delay and animation to submenu 2016-02-20 09:02:12 -05:00
Torkel Ödegaard
52241b8e0b ux(): completed gf-size class rename 2016-02-20 14:48:10 +01:00
Torkel Ödegaard
701a2fdcf3 ux(): tweaks and polish, and also simpifying width classes, gf-size-xxx and gf-size-max-xx are now width-(1-30), and max-width-(1-30) 2016-02-20 14:21:39 +01:00
Torkel Ödegaard
995f17493e ux(): updated influxdb datasource edit forms 2016-02-20 12:55:47 +01:00
Torkel Ödegaard
eb787adccd ux(): added style guide to admin page 2016-02-20 11:35:10 +01:00
Torkel Ödegaard
57e6e0092d ux(): more work on style guide 2016-02-20 11:32:50 +01:00