home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,591 Commits 48 Branches 340 Tags
cdec9e472db581acbee72cdcaa703e4155cb4cfb
Commit Graph
553 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Annabel Dunstone 75532a6570 Change rgba to hex; use sass variables to calculate header height 2016-05-23 12:54:04 -05:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master' 
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
 2016-05-21 03:34:43 +00:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 
# Conflicts:
#	app/services/system_note_service.rb
 2016-05-20 16:23:04 -05:00
Annabel Dunstone 5bb7fa1bd9 Redesign project page header 2016-05-19 13:16:57 -05:00
Jacob Schatz 86b22b4f15 Merge branch 'project-variables-ui' into 'master' 
Project variables UI

![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png)

![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png)

Closes #14091

See merge request !3942
 2016-05-19 18:09:04 +00:00
Jacob Schatz 5566c9e706 Merge branch 'simplify-animation-css' into 'master' 
Replace animate.css with a smaller subset of animations.

As discussed in #15667. This saves ~50KB uncompressed.

cc: @jschatz1 

See merge request !3937
 2016-05-19 17:38:49 +00:00
Rémy Coutable 5341b16fc9 Reuse existing SCSS variables 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-18 13:20:46 -05:00
Dmitriy Zaporozhets 5da1c23b7f Merge branch 'fix-typo-zen-control' into 'master' 
Fixed typo in zen.scss and corresponding views



See merge request !4045
 2016-05-18 17:26:56 +00:00
Adam ButlerandRémy Coutable 8a8b5497c5 Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff 2016-05-18 11:15:10 -05:00
Dmitriy Zaporozhets e9fdfb9a71 Fix left sidebar overlap when scroll on long menu 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-16 12:44:07 -05:00
Dmitriy Zaporozhets 29211b48d7 Implement new horizontal navigation to project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-16 12:21:12 -05:00
Phil Hughes 5f66bfe7ed Added due date calendar to new issue form 
Closes #15516
 2016-05-16 10:35:14 +01:00
Phil Hughes c9b3c08c21 Changed table border color 
Fixed issue with form errors not displaying
 2016-05-16 10:26:11 +01:00
Dmitriy Zaporozhets cf6d4e9db5 Change colors for charcoal and graphite sidebar themes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-14 00:48:49 -05:00
Connor Shea 4b4f2cf53b Replace animate.css with a smaller subset of animations. 
As discussed in #15667.
 2016-05-13 16:48:20 -06:00
Dmitriy Zaporozhets 7a83f2c35c Merge branch '17338-sidebar-width' into 'master' 
Reduce width of side nav

Closes #17338    
Part of #14838    
Left: old; Right: new    
<img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px">

See merge request !4109
 2016-05-13 18:16:16 +00:00
Dmitriy Zaporozhets 8ece393a16 Merge branch '17501-dropdown-bug' into 'master' 
Fix mobile dropdown bug

Closes #17501     
![dropdown](/uploads/d0cc6d9472bd8aa1aaf392d5c4eb3791/dropdown.gif)



See merge request !4142
 2016-05-13 17:16:04 +00:00
Dmitriy Zaporozhets 9a7a041553 Fix login btn vertical align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-13 11:24:00 -05:00
Dmitriy Zaporozhets 2148566b3d Fix issue sidebar top position after header height change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-13 11:21:31 -05:00
Annabel Dunstone 16b1d3a34f Fix mobile dropdown bug 2016-05-13 11:12:49 -05:00
Dmitriy Zaporozhets ae89161db5 Remove background color differentiation from gitlab logo/text in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-13 09:25:38 -05:00
Annabel Dunstone 7bc594735b Undo changes; reduce sidebar internal width 2016-05-12 17:06:47 -05:00
Annabel Dunstone a51064906b No extra link padding at xs screen size 2016-05-10 16:51:57 -05:00
Annabel Dunstone e689d9fb70 Reduce width of side nav 2016-05-10 16:32:59 -05:00
Dmitriy Zaporozhets 98d8e3fe9f Change dashboard button color to white on hover 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-10 13:24:53 +02:00
Dmitriy Zaporozhets 0f1cf1d87b Minor consistency fixes to sidebar & header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-10 13:16:09 +02:00
Annabel Dunstone 36f60982ce Fix media queries for absolutely positioned nav element 2016-05-09 19:34:41 -05:00
Annabel Dunstone 8eb31c40fc Hide navbar on mobile 2016-05-09 18:53:25 -05:00
Jacob Schatz 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Dmitriy Zaporozhets b1230bbda6 Merge branch 'group-navigation-redesign' into 'master' 
Redesign navigation for group pages

Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request 

See merge request !3980
 2016-05-06 14:06:02 +00:00
Annabel Dunstone c24958365f Remove mobile styles; horizontally scroll layout nav links 2016-05-05 09:00:29 -05:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Annabel Dunstone 3a3f0bf436 Change build icons into buttons; update tests 2016-05-04 16:45:37 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Yatish Mehta 8b813277b0 Fixed typo in zen.scss and corresponding views 2016-05-04 14:04:13 -07:00
Annabel Dunstone ccd9c4be00 Reduce height of nav to 50px 2016-05-04 15:50:30 -05:00
Annabel Dunstone 4ed9e5f5be Update font colors, font sizes, caret icon, avatar size 2016-05-04 13:11:38 -05:00
Annabel Dunstone 003b36b45f Fixed layout nav, revert back to badge styles, general enhancements 2016-05-04 11:43:47 -05:00
Annabel Dunstone 21ccf89685 Redesign profile page and group page mobile navigation 2016-05-03 15:29:11 -05:00
Annabel Dunstone f53557a4fa Group navigation design update 2016-05-03 12:36:04 -05:00
Dmitriy Zaporozhets 606e09c141 Fix table borders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-02 19:52:46 +02:00
Dmitriy Zaporozhets b0cfd2a9c5 Use correct border color between table rows 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-02 19:37:22 +02:00
Dmitriy Zaporozhets f3f820d0bd Move modal css to separate file and fix danger text for confirmation modal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-29 19:02:30 +02:00
Dmitriy Zaporozhets 9ef18c6c8b Replace outdated bluish colors with default bg color 2016-04-28 23:06:00 +02:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master' 
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
 2016-04-28 21:00:22 +00:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master' 
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
 2016-04-28 20:16:36 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously 
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
 2016-04-28 16:13:48 -04:00
Jacob Schatz 48076c9808 Merge branch 'updated-triggers-ui' into 'master' 
Updated triggers UI

![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png)

![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png)

Closes #14090

See merge request !3946
 2016-04-28 19:14:41 +00:00