summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0743-432/+696
|\
| * Notify user if they cannot create projectsAndrew Tomaka2015-12-052-1/+7
| |
| * Ensure "Remove Source Branch" button is not shown when branch is being ↵Rubén Dávila2015-12-041-3/+6
| | | | | | | | deleted. #3583
| * Merge remote-tracking branch 'origin/ui/issuable-form'Dmitriy Zaporozhets2015-12-044-31/+41
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Fix specsui/issuable-formDouwe Maan2015-12-033-22/+11
| | |
| | * Merge branch 'master' into ui/issuable-formDouwe Maan2015-12-0319-142/+99
| | |\
| | * | Redesign multiple select2 optionsDouwe Maan2015-12-021-10/+31
| | | |
| * | | Merge branch 'ui/sidebar' into 'master' Dmitriy Zaporozhets2015-12-044-100/+121
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ Merge branch 'master' into ui/sidebarui/sidebarDouwe Maan2015-12-0319-142/+97
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/sidebar.scss
| | * | | Revert unrelated changesDouwe Maan2015-12-021-0/+3
| | | | |
| | * | | Fade in/out Back icon when sidebar is toggledDouwe Maan2015-12-021-1/+5
| | | | |
| | * | | Fix logo height in signed-out header barDouwe Maan2015-12-021-3/+5
| | | | |
| | * | | Restore sidebar tooltips and fix logo tooltip locationDouwe Maan2015-12-023-99/+113
| | | |/ | | |/|
| * | | Merge branch 'ui/form-consistency' into 'master' Dmitriy Zaporozhets2015-12-041-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Improve form consistency Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Tag form Before: ![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png) After: ![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png) See merge request !1955
| | * \ \ Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-0319-142/+99
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Remove unnecesary wrapper elementsDouwe Maan2015-12-021-4/+0
| | | |/ | | |/|
| * | | Merge branch 'ui/login-page' into 'master' Dmitriy Zaporozhets2015-12-042-4/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix background and padding of login and error pages Was gray, is white again. See merge request !1978
| | * | | Fix background and padding of login and error pagesui/login-pageDouwe Maan2015-12-032-4/+7
| | | |/ | | |/|
| * | | Merge branch 'ui/wiki' into 'master' Dmitriy Zaporozhets2015-12-031-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Use new style for wiki Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png) After: ![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png) ## Edit Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png) After: ![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png) See merge request !1967
| | * \ \ Merge branch 'master' into ui/wikiDouwe Maan2015-12-0319-142/+99
| | |\ \ \ | | | |/ /
| | * | | Use new style for wikiDouwe Maan2015-12-021-0/+5
| | | |/ | | |/|
| * | | Merge branch 'ui/new-project' into 'master' Dmitriy Zaporozhets2015-12-031-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ Merge branch 'master' into ui/new-projectui/new-projectDouwe Maan2015-12-0319-142/+99
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Unify new project namespace select and path inputDouwe Maan2015-12-021-0/+8
| | | |/ | | |/|
| * | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-033-10/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-0319-142/+99
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Make style of select2 box more consistent with controlsDouwe Maan2015-12-021-0/+11
| | | | |
| | * | | Remove "none" username for "Unassigned" and "Any User" select optionsDouwe Maan2015-12-022-9/+12
| | | | |
| | * | | Use select2 for bulk issue edit statusDouwe Maan2015-12-021-1/+1
| | | |/ | | |/|
| * | | Merge branch 'ui/issuable-list-item' into 'master' Dmitriy Zaporozhets2015-12-031-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable list item tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png) After: ![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png) Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589 See merge request !1962
| | * \ \ Merge branch 'master' into ui/issuable-list-itemui/issuable-list-itemDouwe Maan2015-12-0319-142/+99
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Link MR list item branch name to branchDouwe Maan2015-12-021-4/+0
| | | |/ | | |/|
| * | | Merge branch 'ui/project-home-panel' into 'master' Dmitriy Zaporozhets2015-12-032-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Project home panel tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png) After: ![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png) See merge request !1965
| | * \ \ Merge branch 'master' into ui/project-home-panelui/project-home-panelDouwe Maan2015-12-0319-135/+99
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Remove duplicate styles.Douwe Maan2015-12-021-7/+0
| | | | |
| | * | | Use default cursor for project visibility label.Douwe Maan2015-12-021-1/+1
| | | | |
| | * | | Move project visibility status to the leftDouwe Maan2015-12-021-0/+5
| | | |/ | | |/|
| * | | Merge branch 'master' into ui/emojiui/emojiDouwe Maan2015-12-0319-142/+99
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'ui/consistency' into 'master' Dmitriy Zaporozhets2015-12-021-4/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Improve consistency across the board Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577 See merge request !1954
| | | * | Use same text color for commit box as issue titleDouwe Maan2015-12-021-4/+2
| | | |/
| | * | Merge branch 'ui/no-minimal-height' into 'master' Dmitriy Zaporozhets2015-12-023-6/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Remove minimum container height Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png) After: ![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png) See merge request !1957
| | | * | Remove minimum containe heightui/no-minimal-heightDouwe Maan2015-12-023-6/+8
| | | |/
| | * | Fix styling of empty repo messageui/gl-paddingDouwe Maan2015-12-022-7/+4
| | | |
| | * | Remove unused styleDouwe Maan2015-12-021-4/+0
| | | |
| | * | Use consistent border colorDouwe Maan2015-12-021-2/+2
| | | |
| | * | No bottom margin for form help blocksDouwe Maan2015-12-021-0/+4
| | | |
| | * | Render all form controls at the same heightDouwe Maan2015-12-021-0/+2
| | | |
| | * | Remove style duplication between snippet and issue detail pagesDouwe Maan2015-12-021-39/+5
| | | |
| | * | Remove double border between gray blocksDouwe Maan2015-12-021-0/+4
| | | |
| | * | Remove duplicated styling for center top menusDouwe Maan2015-12-022-34/+2
| | | |