Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,034 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

249 Commits

Author SHA1 Message Date
Heiko Kernbach 085d3de302 snippet css to scss 2014-03-21 15:50:47 +01:00
scottashton 149d90e78b merged 2014-03-21 15:33:08 +01:00
scottashton 0e3da446d1 kill modal.css 2014-03-21 15:32:24 +01:00
Heiko Kernbach a409acd013 dataTables scss lint 2014-03-21 15:17:25 +01:00
Heiko Kernbach 31a69dba67 dataTables css -> scss 2014-03-21 15:09:18 +01:00
Michael Hackstein 0b266d1dd5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-21 11:13:36 +01:00
Michael Hackstein 1c4d9f14e5 Fixed SCSS-Lint warnings for graphViewer.scss 2014-03-21 11:13:33 +01:00
Michael Hackstein 55f0c0357c Finished moving graphViewer.css to scss, will now cleanup scss-lint 2014-03-21 11:07:51 +01:00
Heiko Kernbach 7ee66c908c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 11:06:07 +01:00
Heiko Kernbach 576a173b9f scss lint 2014-03-21 10:54:04 +01:00
Heiko Kernbach 8f486d1abb removed old unused font 2014-03-21 10:52:48 +01:00
Michael Hackstein 9b7034e3c0 Continued moving the graphViewer from css to scss 2014-03-21 10:41:08 +01:00
Michael Hackstein 4607522e8d Solved merge conflict 2014-03-21 10:39:26 +01:00
Heiko Kernbach 44bfa51f5d scss lint 2014-03-20 19:03:08 +01:00
Heiko Kernbach 66deff7d73 merge conflict 2014-03-20 17:33:23 +01:00
Heiko Kernbach f77a28f632 transfer documentView.css to scss 2014-03-20 17:31:59 +01:00
gschwab 43797c5af1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 16:45:22 +01:00
gschwab bb02f28607 css-refactoring: logsView.css finished 2014-03-20 16:41:10 +01:00
Heiko Kernbach 78127b823d notification css fix 2014-03-20 16:25:19 +01:00
gschwab 463f5bde2b css refactoring: finished layout.css 2014-03-20 13:22:06 +01:00
gschwab dabe3a2d3a css refactoring: started layout.css - cont. 2014-03-20 11:27:11 +01:00
scottashton c4a8e69453 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 17:27:23 +01:00
scottashton 9603efa7cb got rid of api.css 2014-03-19 17:27:13 +01:00
Michael Hackstein 299e848567 Moved font-awesome from css to scss 2014-03-19 17:03:45 +01:00
Michael Hackstein 61dac9b2ce Fixed scss-lint warnings 2014-03-19 16:38:21 +01:00
scottashton cf5c1538b6 scss-css, removes shellView.css 2014-03-19 16:32:47 +01:00
Michael Hackstein b544c69f93 Fixed scss-lint warnings 2014-03-19 16:10:42 +01:00
Michael Hackstein bd6677c42b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-19 15:31:20 +01:00
Michael Hackstein bcceb5cb5a Fixed pagination, buttons, a table in documents view and scss-lint warning 2014-03-19 15:30:35 +01:00
gschwab 878365778e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 13:49:25 +01:00
gschwab fe16832e01 css refactoring: started layout.css 2014-03-19 13:49:16 +01:00
scottashton d5f3352411 css refactoring 2014-03-19 13:39:22 +01:00
gschwab 23905b1d7a css refactoring: fixed scsslint 2014-03-19 10:00:21 +01:00
gschwab 21633d77cc css refactoring: footerView.css 2014-03-19 09:58:45 +01:00
Michael Hackstein 3ca5dd163c Added generated css 2014-03-19 09:19:02 +01:00
Michael Hackstein fb02eb07f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-18 18:32:27 +01:00
Michael Hackstein 1eb45e7e9a Almost finished with documentsView.css however still some stuff to cleanup left. System is at least in a stable state. Layout of buttons in headerbar has slightly changed (they were off by 1px) 2014-03-18 18:26:14 +01:00
gschwab e1b531215a fixed some scsslint-problems 2014-03-18 15:28:05 +01:00
gschwab 4ae7297eaa merged 2014-03-18 15:25:45 +01:00
gschwab 8af66ca112 css refactoring: queryView.css => _queryView.scscc, pt 2 2014-03-18 15:18:26 +01:00
Michael Hackstein e4f14f0130 Contiuned porting documentView.css. Almost done, there is one too general rule left 2014-03-18 13:45:29 +01:00
Michael Hackstein 8bef15ce62 Started translating docmentView.css created tabViews and jsonEditor.scss on the way 2014-03-18 12:57:53 +01:00
Michael Hackstein 888c299257 Moved collectionView.css to scss 2014-03-18 08:29:19 +01:00
Michael Hackstein 64f3e3b332 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-17 16:08:24 +01:00
Michael Hackstein 578097a345 Moved collections.css to scss, reduction: 50% 2014-03-17 16:08:17 +01:00
gschwab 300b3a8748 css refactoring 2014-03-17 15:47:29 +01:00
scottashton 24b9e9492f DASHBOARD CLEANUP 2014-03-17 15:04:09 +01:00
scottashton 12e70386f2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-17 12:00:15 +01:00
scottashton ac1b6e1024 bugfixes in dahsboard 2014-03-17 12:00:10 +01:00
Michael Hackstein 98d01f3bcb Fixed bug in width of cluster overview modal dialogs 2014-03-17 11:58:25 +01:00
Heiko Kernbach b6c4a87055 new shortcuts class added to aqleditor 2014-03-11 17:45:42 +01:00
Heiko Kernbach 4b3829e3a8 added shortcuts for docs editor, added scss shortcut class 2014-03-11 17:29:43 +01:00
gschwab 68109fa2b9 some small scss refactorings 2014-03-10 14:41:56 +01:00
Michael Hackstein ad8e6cf172 SCSS-Lint fix 2014-03-09 09:06:23 +01:00
gschwab ecf1a0b492 fixed tile layout 2014-03-07 17:18:06 +01:00
gschwab 1bf03dc11f fixed search bar layout 2014-03-07 17:07:34 +01:00
gschwab cac2d5109e fixed most of scss 2014-03-07 16:58:27 +01:00
Michael Hackstein cdf2552d93 Fixed merge conflicts and fixed scss conflicts 
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-07 15:26:10 +01:00
Michael Hackstein db31aec469 Generated css 2014-03-07 15:16:03 +01:00
gschwab 847074329f database management and graph management changed to tile view 2014-03-07 14:58:37 +01:00
Michael Hackstein 169b3f3138 Last second style fixes 2014-03-04 15:37:47 +01:00
Michael Hackstein 861afb4e5e Fixed merge conflicts 2014-03-04 13:31:41 +01:00
Michael Hackstein 4d9c8ff9d9 Implemented creation of sharded collections 2014-03-04 13:22:47 +01:00
gschwab 4358ed553f deleted inline css 2014-03-04 12:28:43 +01:00
gschwab 17e34003d5 fixed tooltips 2014-03-04 11:35:25 +01:00
Michael Hackstein 3fe7b5d75d Fixed style of GUI button and made Coordinator Icon clickable 2014-03-04 09:20:37 +01:00
Michael Hackstein 182fd37a43 Styled gui button for cluster overview 2014-03-04 09:15:36 +01:00
Michael Hackstein dc6882ffec Style fixes 2014-03-04 09:02:00 +01:00
gschwab 3f1f4d7344 added class for activated buttons, added to collections view 2014-03-03 18:21:23 +01:00
gschwab 47917c403e modal background will be darker with waitModal 2014-03-03 12:46:18 +01:00
gschwab 04a7a047e0 background set to transparent and color to white for waitModal dialog 2014-03-03 12:01:46 +01:00
Michael Hackstein 2f9124afb5 Fixed dbserver as modal dialog, shutdown cluster button now seems to be working better 2014-03-03 11:35:38 +01:00
Michael Hackstein 6d3441ec87 Resizing of Application image now works again 2014-03-03 11:04:02 +01:00
Michael Hackstein 472c755f43 Added Style for close button 2014-03-03 09:49:58 +01:00
Michael Hackstein 0dffe98b6b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 22:07:51 +01:00
Michael Hackstein 7940a3cf01 Fixed shutdownbutton size and moved icons for coordinators and db servers 2014-03-01 22:07:49 +01:00
Claudius Weinberger 6a02c5a75a some UI changes 2014-03-01 22:06:24 +01:00
Claudius Weinberger b712f906bc some UI changes 2014-03-01 22:04:48 +01:00
Michael Hackstein 00b504301d Updated Coordinator icon 2014-03-01 20:55:19 +01:00
Michael Hackstein 28d4e2c1f8 Added cancel buttons to plan selectors and reverted to simple view for dashboard with added back button and back-button in browser working 2014-03-01 20:34:45 +01:00
Michael Hackstein bfa6e46b4a Updated dashboard and removed headerbar 2014-03-01 17:32:46 +01:00
Claudius Weinberger 17ee3ef0ac some UI changes 2014-03-01 14:20:12 +01:00
scottashton feae7c9e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:02:25 +01:00
scottashton edef8592b7 sharedClusterView refactoring 2014-02-28 19:02:09 +01:00
Claudius Weinberger 3a7beaf832 a few changes at the navigationbar 2014-02-28 16:34:30 +01:00
gschwab 0ec595162f pimped clusterDown view 2014-02-28 15:37:35 +01:00
gschwab 07bc9128b9 global wait dialog for long-time operations 2014-02-28 13:34:18 +01:00
gschwab 87c44e49c0 changed icon, its size and position 2014-02-28 11:09:18 +01:00
scottashton 56eea1463c refactoring dashboard 2014-02-27 16:11:34 +01:00
scottashton 61abe8a789 refactoring dashboard 2014-02-27 13:51:49 +01:00
Michael Hackstein 0636233f02 Upgraded the scenario selector and inserted upload of plan buttons, however they are not working yet. Also the test planner now offers usefull defaults in the input fields 2014-02-25 17:49:20 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
scottashton 42302d3c48 dashboard refactoring 2014-02-25 14:35:47 +01:00
gschwab 5857f616ed userManagement switched from table to tiles 2014-02-25 11:37:07 +01:00
gschwab a49e05cf0a modified scss 2014-02-24 14:27:06 +01:00
Heiko Kernbach 8981d51257 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 17:22:01 +01:00
Heiko Kernbach c99ab8bd74 css 2014-02-22 17:21:53 +01:00
Michael Hackstein d938bed8ea Merged devel and regenerated scss 2014-02-22 16:44:50 +01:00
Michael Hackstein 93f5b89a0c The central div is now central and no more 5 px off 2014-02-22 16:36:54 +01:00
Heiko Kernbach 56991d0a77 css 2014-02-22 15:38:27 +01:00
Heiko Kernbach f18bff2d72 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 14:14:02 +01:00
Heiko Kernbach 2e18ea0390 added bar graphs for distribution data 2014-02-22 14:13:50 +01:00
Michael Hackstein dede4aa400 Merged styles and stuff from devel 2014-02-22 12:29:02 +01:00
Michael Hackstein ed5399cd3f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 12:28:01 +01:00
Michael Hackstein f00b398e89 Now complete line of dropdown is clickable 2014-02-22 12:27:25 +01:00
Heiko Kernbach 9b2ba05ed3 css merge 2014-02-22 12:14:46 +01:00
Heiko Kernbach d8e1520b26 d3 graph 2014-02-22 12:09:44 +01:00
Michael Hackstein 8cb5a1e07c Merge remote-tracking branch 'origin/devel' into sharding 
And regenerated scss

Conflicts:
	js/apps/system/aardvark/frontend/js/templates/foxxInstalledView.ejs
	js/apps/system/aardvark/frontend/scss/_buttons.scss
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-02-22 11:42:18 +01:00
Michael Hackstein 283c86a116 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 11:38:53 +01:00
Michael Hackstein 5fc5922349 Fixed graphviewer dropdown menu and several other css mismatches 2014-02-22 11:11:58 +01:00
Michael Hackstein e9d8392e48 Fixed dropdown layout which was broken for imports 2014-02-22 08:15:55 +01:00
Michael Hackstein 629c533b6a Added new button definitions to scss, no bootstrap required there anymore 2014-02-22 00:16:41 +01:00
Michael Hackstein c965238579 Imported buttons scss 2014-02-21 23:35:19 +01:00
Heiko Kernbach 026ce33eec http db group 2014-02-21 23:18:29 +01:00
Guido Schwab 760baf44bd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 21:41:58 +01:00
Guido Schwab 1416860832 some pixelpushing 2014-02-21 21:41:50 +01:00
Michael Hackstein 008496b3fc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-02-21 21:25:34 +01:00
Michael Hackstein 9dda1559bb Some css fixes 2014-02-21 21:24:05 +01:00
Michael Hackstein 14ba49ac10 Fixed some button styles and fixed applications view, it is now much more intuitive to install an app 2014-02-21 21:21:49 +01:00
Michael Hackstein 6020b914b8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-21 20:59:31 +01:00
Michael Hackstein e3ee4d8f86 Added buttons to scss 2014-02-21 20:59:23 +01:00
Guido Schwab f57514a933 nav bar spacer modified 2014-02-21 19:17:43 +01:00
Jan Steemann 1bdcc145b4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:44:53 +01:00
Michael Hackstein f71ede2d17 Added a view for the shard distribution 2014-02-21 17:04:19 +01:00
Guido Schwab 1dd358e5ec restricted max length of db name in navbar - shortened 2014-02-21 16:43:15 +01:00
Guido Schwab 85d1f6af3d restricted max length of db name in navbar - fixed caret 2014-02-21 16:38:39 +01:00
Guido Schwab 43e59bf946 restricted max length of db name in navbar 2014-02-21 16:18:46 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Guido Schwab cfb5ca5953 fixed links in DB-menu 2014-02-21 15:28:00 +01:00
Guido Schwab afc41567da some pixelpushing 2014-02-21 15:19:00 +01:00
Heiko Kernbach df2cda71b4 max width for tooltips added 2014-02-21 13:28:28 +01:00
Heiko Kernbach d3457e61eb optimized notificatins 2014-02-21 12:49:42 +01:00
Guido Schwab ea0520636c fixed userBar refresh and doing some pixelpushing 2014-02-21 08:43:29 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31:53 +01:00
Guido Schwab b7d1eebfd3 fixed dropdown item selection and dropdown hide event of user dropdown 2014-02-20 20:03:26 +01:00
Guido Schwab 291011a12b img size fixed 2014-02-20 19:49:33 +01:00
Guido Schwab 63c722ab0c some layout changes 2014-02-20 19:09:28 +01:00
Michael Hackstein e7b796173f Unified badges and buttons on tiles 2014-02-20 11:17:12 +01:00
Michael Hackstein a7d0b59aee The general layout is now moved to a single class and the dropdowns have bin unified to one class 2014-02-19 14:36:51 +01:00
gschwab e17c4c870a merged 2014-02-18 16:40:33 +01:00
gschwab 26e95aa140 updated 2014-02-18 16:37:09 +01:00
Heiko Kernbach 1e964b18d0 removed old/unnecessary notifications 2014-02-18 16:31:46 +01:00
Heiko Kernbach fe8d22cdd7 finished new notification system 2014-02-18 14:54:38 +01:00
Heiko Kernbach e8aaac38e2 css fix 2014-02-18 08:26:17 +01:00
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
Michael Hackstein f87b594a1c Added new classes for the tiles in collection overview. They should now be easily reusable for Databases and Applications 2014-02-11 09:58:09 +01:00
Michael Hackstein 4fd06a6f32 Finished with general positioning of elements in scss. Much much (much)* simpler now 2014-02-10 11:59:26 +01:00