summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'make-diff-css-better-for-mobile' into 'master' Dmitriy Zaporozhets2015-10-102-44/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make diff file view easier to use on mobile screens Viewing diffs on a mobile screen is a bit of an awkward experience at the moment. Here are a few issues (by no means complete): ## Before ### Tabs are scrunched ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/45924e36cfb107dc56795a7dcdfbc5b5/image.png) ### Filenames take too much room, buttons cluttered ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a5e5611271fe26dfd3922aa0b8780458/image.png) ## After This MR makes a few tweaks to make this a bit better. It just addresses a few issues, but there is plenty of room for improvement (e.g. shrink fonts, etc.): ### Eliminate padding to make tabs fit ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbcf128d1f221b9b9e53df274238dc62/image.png) ### Make filenames, buttons more readable This screenshot allows the filename to use the whole row, omits the file mode changes, and puts the buttons centered in the view: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d2e5b9424f058827ba2552056c516e18/image.png) Towards a better mobile experience: #2787 See merge request !1449
| * Make diff file view easier to use on mobile screensStan Hu2015-10-092-44/+88
| |
* | Merge branch 'rs-mr-tab-loader' into 'master' Douwe Maan2015-10-091-5/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the loading spinner toggle more explicit Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom: See merge request !1553
| * | Make the loading spinner toggle more explicitrs-mr-tab-loaderRobert Speicher2015-10-081-5/+8
| |/ | | | | | | | | | | | | | | Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom:
* | fixed positioning of hamburger menu on headerHan Loong Liauw2015-10-092-2/+6
|/ | | | | - Changed to margin for vertical allign as used in bootstrap 3 original - Also added an `active` state to show when the extra items are enabled
* Add new GitLab colorsDmitriy Zaporozhets2015-10-083-123/+96
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-build-highlight' into 'master' Dmitriy Zaporozhets2015-10-082-2/+1
|\ | | | | | | | | | | | | | | | | Fix build highlight Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1539
| * Fix build highlightDmitriy Zaporozhets2015-10-082-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Check originalEvent.repeat *and* event.repeatrs-quick-submitRobert Speicher2015-10-071-1/+1
| | | | | | | | | | phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests were failing on CI
* | Check originalEvent.repeatRobert Speicher2015-10-071-1/+1
| |
* | Remove "quick submit" behavior specific to the Notes JSRobert Speicher2015-10-071-7/+0
| |
* | Add "Quick Submit" JS behaviorRobert Speicher2015-10-071-0/+29
| |
* | Require jquery.turbolinks in all JS specsRobert Speicher2015-10-071-2/+1
|/ | | | Side-effect: This simplifies the requiresInput handler
* Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-072-42/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| * Remove unused JSDmitriy Zaporozhets2015-10-072-42/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'new-project' into 'master' Dmitriy Zaporozhets2015-10-0713-190/+260
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create project and new merge request page Create project ![Screen_Shot_2015-10-05_at_21.22.28](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2a3b0118b070f69460f693922bb37300/Screen_Shot_2015-10-05_at_21.22.28.png) new merge request ![Screen_Shot_2015-10-06_at_21.37.35](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b7b7ff7a979731a8bf20ceb3e32876b/Screen_Shot_2015-10-06_at_21.37.35.png) See merge request !1514
| * | Refactor buttonsDmitriy Zaporozhets2015-10-072-28/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor button css and do some cleanupDmitriy Zaporozhets2015-10-076-98/+75
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fixes to dropdown, font colors for new project and merge requestAndrey2015-10-0711-138/+250
| |/
* | Add directory feature buttonStan Hu2015-10-071-0/+1
|/ | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
* Move CI build page to CE projectDmitriy Zaporozhets2015-10-062-1/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ci-commit-page' into 'master' Dmitriy Zaporozhets2015-10-061-0/+13
|\ | | | | | | | | | | | | | | | | Render CI statuses on commit page This MR merges CI commit page into CE commit page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1519
| * Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix search in FilesValery Sizov2015-10-061-1/+4
|/
* Merge branch 'revert-layout-changes' into 'master' Dmitriy Zaporozhets2015-10-054-35/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'projects' into 'master'" This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e. This reverts !1487 MR because it cause bugs on mobile devices cc @skyruler See merge request !1509
| * Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-054-35/+3
| | | | | | | | | | This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e.
* | Fix anchors to comments in diffsValery Sizov2015-10-051-0/+7
|/
* Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-10-034-3/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | Improve project page height old thing. Grey block not aligned to the bottom. It was a scroll even with short project description. ![Screen_Shot_2015-10-01_at_16.03.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b412eeaa40c79861191d1a432d95951d/Screen_Shot_2015-10-01_at_16.03.24.png) New awesome stuff, no scroll, grey block aligned to the bottom. ![Screen_Shot_2015-10-01_at_16.04.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/823cdb6bfb8caec892ed001448f731e5/Screen_Shot_2015-10-01_at_16.04.08.png) See merge request !1487
| * removed max-heght from project.scssprojectsAndrey2015-10-021-6/+0
| |
| * max height to layout.scssAndrey2015-10-021-0/+6
| |
| * section and .content now in layout.csscAndrey2015-10-022-11/+10
| |
| * CSS markup fixedAndrey2015-10-024-37/+29
| | | | | | | | | | Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons ><
| * css aligningAndrey2015-10-011-1/+0
| |
| * content block height fixAndrey2015-10-011-2/+44
| |
* | Merge branch 'rs-update-note' into 'master'Robert Speicher2015-10-011-7/+9
|\ \ | | | | | | | | | | | | | | | Ensure updated notes are syntax highlighted See merge request !1444
| * | Ensure notes are highlighted properly when they're updatedRobert Speicher2015-09-301-7/+9
| | |
* | | Merge branch 'style-changed-files' into 'master' Dmitriy Zaporozhets2015-10-013-15/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI for list of changed files * fix paddings * re-use system colors ## Before ![Screenshot_2015-10-01_12.46.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a02fe2beb47637c664eb914dbec352c/Screenshot_2015-10-01_12.46.24.png) ## After ![Screenshot_2015-10-01_12.54.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39b1bf78983b862b559fcc89c52d5690/Screenshot_2015-10-01_12.54.39.png) cc @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1484
| * | | Better colors for textstyle-changed-filesDmitriy Zaporozhets2015-10-013-6/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve UI for list of changed filesDmitriy Zaporozhets2015-10-011-12/+15
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix UI bug introduced in new project pagefix-ui-bugDmitriy Zaporozhets2015-10-011-41/+41
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-5/+6
|/ /
* | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-09-291-0/+7
|\ \ | |/ | | | | | | | | | | page-title-fix Fixed .page-title margin See merge request !1458
| * page-title-fixAndrey2015-09-281-0/+7
| |
* | Merge branch 'cyrillic-font' into 'master' Dmitriy Zaporozhets2015-09-284-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Source Sans Pro font: adds support for cyrillic characters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2764 See merge request !1454
| * | Update Source Sans Pro font: adds support for cyrillic characterscyrillic-fontDmitriy Zaporozhets2015-09-284-0/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'projects'Dmitriy Zaporozhets2015-09-2811-55/+384
|\ \ \ | |/ / |/| / | |/ Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * !important removed from preAndrey2015-09-283-10/+5
| |
| * edit action allignAndrey2015-09-281-5/+5
| |
| * Project page UpdateAndrey2015-09-257-155/+221
| | | | | | | | | | refactoring buttons, fixes for projects filter on the dashboard and group page
| * UI changes to the project view, empty project and project list new project ↵Andrey2015-09-245-48/+357
| | | | | | | | button