home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,091 Commits 48 Branches 340 Tags
ab08321be8405eab07929bb3df8bd2dcc14dc063
Commit Graph
141 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9f69a0b229 Merge branch 'new-project-button-seperate-from-filter-name' into 'master' 
New project button with filter in header.

Fixes #3943 
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png)


See merge request !2165
 2015-12-23 16:51:03 +00:00
Jacob Schatz 8831f5dcb5 moves border bottom to left-menu-top class. 2015-12-23 10:41:29 -05:00
Andriy Dyadyura cee776c143 new button sizes 2015-12-23 16:25:42 +01:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Jacob Schatz 3686b45560 fixing conflict. 2015-12-23 09:10:16 -05:00
Jacob Schatz 265750c80d adds css for left-top-menu. Also hides buttons in certain for factors. 2015-12-23 09:00:59 -05:00
Jacob Schatz 48ecb614e7 project header 2015-12-23 08:25:03 -05:00
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-23 12:29:50 +01:00
Andriy Dyadyura f30f518f97 buttons colors update 2015-12-22 22:33:46 +01:00
Andriy Dyadyura a793590d43 new buttons 2015-12-22 21:22:37 +01:00
Dmitriy Zaporozhets 52bca6da22 New color for cover block background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 11:22:14 +01:00
Jacob Schatz 62aac539b9 project header 2015-12-21 15:47:29 -05:00
Andriy Dyadyura 6dc487620b new colors 2015-12-21 16:10:03 +01:00
Andriy Dyadyura 2e7bee26f0 new-colors 2015-12-18 15:25:12 +01:00
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master' 
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
 2015-12-16 17:59:28 +00:00
Dmitriy Zaporozhets 747f0a328c Merge branch 'control-list-right-margin' into 'master' 
Fix right margin of control list

Before:

![Screen_Shot_2015-12-16_at_16.29.39](/uploads/7a6aa79b6af0900d9257ce86ab822a22/Screen_Shot_2015-12-16_at_16.29.39.png)

After:

![Screen_Shot_2015-12-16_at_16.29.45](/uploads/d52fdc70ecd63fc61ae6ae87b3b7d1a5/Screen_Shot_2015-12-16_at_16.29.45.png)


See merge request !2114
 2015-12-16 16:07:06 +00:00
Douwe Maan d8978acd39 Fix right margin of control list 2015-12-16 16:30:01 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Dmitriy Zaporozhets 9472d1372f Fix double border in MR discussion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 15:41:50 +01:00
Andrey 37a4e4945d Merge branch 'fix-profile-nav' into 'master' 
Make profile navigation full wide

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

## Before


![Administrator___GitLab](/uploads/a43e8992264ed78afa732e7a911ef154/Administrator___GitLab.png)

## After

![Administrator___GitLab1](/uploads/9e67e8af071d4879045311abe15a7bba/Administrator___GitLab1.png)

See merge request !2076
 2015-12-16 10:57:02 +00:00
Andrey 96a1558897 Merge branch 'wider-layout' into 'master' 
Increase fixed layout width to 1280px

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @creamzy 

See merge request !2075
 2015-12-15 18:19:55 +00:00
Douwe Maan f31dfae28a Fix inline panel heading height 2015-12-15 17:31:07 +01:00
Dmitriy Zaporozhets 51c8d037d3 Make profile navigation full wide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:39:26 +01:00
Dmitriy Zaporozhets d86e2f33a8 Increase fixed layout width to 1280px 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:33:24 +01:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message 
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
 2015-12-11 13:50:14 +01:00
Dmitriy Zaporozhets ab8ab9b10c Fix list with controls display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-10 01:24:10 +01:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Robert Speicher 53fbb0ecda Improve styling for mixed list styles 
Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921
 2015-12-08 16:53:48 -05:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01:00
Douwe Maan f66454beaa Add indication to merge request list item that MR cannot be merged automatically 2015-12-08 21:43:11 +01:00
Dmitriy Zaporozhets e99ca657e5 Merge branch 'ui-framework-fixes' 2015-12-08 18:57:43 +01:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master' 
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
 2015-12-08 17:06:11 +00:00
Douwe Maan 3eb209123d Render monospace text at 90% of the parent font-size 2015-12-08 13:06:53 +01:00
Douwe Maan badeb82f63 Use consistent padding for .gitlab-ci.yml info callouts 2015-12-08 13:06:53 +01:00
Douwe Maan 507fdb4b2b Use consistent padding in panel heading 2015-12-08 13:06:52 +01:00
Douwe Maan c64a881a40 Allow center top menu to span multiple lines 2015-12-08 13:06:52 +01:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00
Douwe Maan 1a94211165 Remove pointless explanation for user tabs 2015-12-07 13:55:30 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
 2015-12-07 12:26:56 +00:00
Douglas Barbosa Alexandre 29e5506799 Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-04 18:11:49 -02:00
Dmitriy Zaporozhets 238ca3e472 Merge remote-tracking branch 'origin/ui/issuable-form' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 15:12:03 +01:00
Dmitriy Zaporozhets abf54f230e Merge branch 'ui/sidebar' into 'master' 
UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958
 2015-12-04 09:31:28 +00:00
Dmitriy Zaporozhets de3a175486 Merge branch 'ui/login-page' into 'master' 
Fix background and padding of login and error pages

Was gray, is white again.

See merge request !1978
 2015-12-04 09:24:42 +00:00
Douglas Barbosa Alexandre 0decc7f941 Fix specs 2015-12-03 19:46:30 -02:00
Dmitriy Zaporozhets e7452c6b8f Merge branch 'ui/new-project' into 'master' 
UI: New Project form tweaks

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)

After:

![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)


See merge request !1964
 2015-12-03 19:46:47 +00:00
Dmitriy Zaporozhets 805b4cf522 Merge branch 'ui/issuable-filter' into 'master' 
UI: Issuable filter tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Filter bar

Before:

![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)

After:

![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)

## Bulk edit bar

Before:

![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)

After:

![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)


See merge request !1963
 2015-12-03 19:43:41 +00:00
Douglas Barbosa Alexandre 510f3bf70b Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-03 16:00:05 -02:00