summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'rs-issuable-filter-count-style' into 'master' Dmitriy Zaporozhets2015-10-221-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of the filter counter for Issuables ## Before: ![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png) ## After: ![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png) See merge request !1667
| * | | Fix alignment of the filter counter for Issuablesrs-issuable-filter-count-styleRobert Speicher2015-10-221-0/+8
| | | |
* | | | Remove bad css styleDmitriy Zaporozhets2015-10-221-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'compact-file-list' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make file list more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1669
| * | | | Make file list more compactcompact-file-listDmitriy Zaporozhets2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'project-readme-edit' into 'master' Dmitriy Zaporozhets2015-10-221-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Restore edit button in project readme Also make sure edit button can actually be clicked, like !1668. See merge request !1670
| * | | | Restore edit button in project readmeproject-readme-editDouwe Maan2015-10-221-0/+8
| | | | |
* | | | | Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' Dmitriy Zaporozhets2015-10-223-6/+66
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update style of snippets pages ![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png) ![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png) Replaces !1567. Fixes #1767 and #2538. See merge request !1637
| * | | | Restyle dashboard snippets visibility level tabs.Douwe Maan2015-10-212-1/+11
| | | | |
| * | | | Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-218-11/+65
| |\ \ \ \
| * | | | | Update style of snippets pagesDouwe Maan2015-10-181-5/+0
| | | | | |
| * | | | | Update style of snippet detail pageDouwe Maan2015-10-181-31/+31
| | | | | |
| * | | | | Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-1713-85/+118
| |\ \ \ \ \
| * | | | | | New snippet design for projectsHan Loong Liauw2015-10-141-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out header into shared partial Used action partials to have unique actions for shared and personal snippets changed back to created date in list view Switched to using existing color classes
| * | | | | | Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-1445-374/+380
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Also removed fixes to btn-sm as they have appears to be already merged into master
| * | | | | | Updated the style of the snippets header in #showHan Loong Liauw2015-10-141-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should now more closly match the styles used in issues and merge requests with some small tweaks to be more relevant to snippets
| * | | | | | Adds modified date to snippets#show #1767Han Loong Liauw2015-10-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed a bug with .btn-sm padding. - Changed created_at to modified_at for snippets#index as it seems to be more relevant.
* | | | | | | Fix CSS class for runner statusKamil Trzcinski2015-10-221-27/+25
| |_|_|_|/ / |/| | | | |
* | | | | | Fix build trace updatingfix-build-trace-updatingKamil Trzcinski2015-10-211-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'markdown-tabs-margin' into 'master' Robert Speicher2015-10-211-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix margin around Markdown Write/Preview tabs. Reverts !1354 and uses another fix for #2585. See merge request !1654
| * | | | | Fix margin around Markdown Write/Preview tabs.Douwe Maan2015-10-211-4/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'animated-logo' into 'master' Dmitriy Zaporozhets2015-10-212-8/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate the logo on hover The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition. Identical to how it looks on about.gitlab.com cc @skyruler See merge request !1557
| * | | | | the logo svg should not mess with replacement imgsJob van der Voort2015-10-211-1/+6
| | | | | |
| * | | | | Animate the logo on hoverJob van der Voort2015-10-212-11/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition.
* | | | | Merge branch 'master' into full-width-tablesDouwe Maan2015-10-213-1/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'fix-code-leading-indent' into 'master' Dmitriy Zaporozhets2015-10-191-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some padding from code blocks This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else. ![Screen_Shot_2015-10-14_at_2.40.38_PM](https://gitlab.com/pioto/gitlab-ce/uploads/5434eb077c17e56528a94079afe3c732/Screen_Shot_2015-10-14_at_2.40.38_PM.png) See merge request !1596
| | * | | | Remove some padding from code blocks Mike Kelly2015-10-141-2/+1
| | | |/ / | | |/| | | | | | | This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.
| * | | | Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-192-0/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
| | * | | | Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-162-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' into full-width-tablesfull-width-tablesDouwe Maan2015-10-193-8/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-193-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to select the Files view as default project view ![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png) Also shows the readme at the very bottom, like on the regular Files page. Replaces !1489. Closes #2655. See merge request !1632
| | * | | | | Remove border at bottom of readme.Douwe Maan2015-10-171-0/+4
| | | | | | |
| | * | | | | Tweak styling of project home files list.Douwe Maan2015-10-171-5/+1
| | | | | | |
| | * | | | | Use same style for project readme, tree readme and regular blob.Douwe Maan2015-10-171-8/+0
| | | | | | |
| | * | | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-1770-846/+1010
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-40/+44
| | | | | | |
* | | | | | | Make tables full width.Douwe Maan2015-10-198-18/+13
|/ / / / / /
* | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-181-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| * | | | | | Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-0/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'outdated-discussion-padding' into 'master' Dmitriy Zaporozhets2015-10-171-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix padding of outdated discussion item. Old: ![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png) New: ![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png) It still looks the same when the discussion is expanded. See merge request !1614
| * | | | | Fix padding of outdated discussion item.outdated-discussion-paddingDouwe Maan2015-10-161-1/+4
| |/ / / /
* | | | | Merge branch 'improve-typography' into 'master' Dmitriy Zaporozhets2015-10-161-41/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve typography See merge request !1622
| * | | | | Improve markdown typography scssDmitriy Zaporozhets2015-10-161-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'fix-wiki-padding' into 'master' Dmitriy Zaporozhets2015-10-163-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont put padding on typography but on holder elements instead Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes wrong padding of wiki content. cc @JobV @skyruler See merge request !1620
| * | | | | Add extra padding to some markdown pagesDmitriy Zaporozhets2015-10-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Dont put padding on typography but on holder elements insteadDmitriy Zaporozhets2015-10-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'compact-select' into 'master' Dmitriy Zaporozhets2015-10-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make selectbox options more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1619
| * | | | | | Increase dropdown padding a bitDmitriy Zaporozhets2015-10-161-2/+2
| | | | | | |
| * | | | | | Make selectbox options more compactDmitriy Zaporozhets2015-10-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Highlight comment based on anchor in URLDmitriy Zaporozhets2015-10-161-0/+4
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>