summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
Commit message (Collapse)AuthorAgeFilesLines
* Break in middle of word if a span within parallel viewparallel-diff-alignmentAnnabel Dunstone2016-04-251-0/+5
|
* Reduce width of parallel diffsAnnabel Dunstone2016-04-221-1/+5
|
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-0/+22
| | | | Closes #4228
* Remove float from iconAnnabel Dunstone2016-04-211-0/+5
|
* Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-212-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| * Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-209-35/+160
| |\
| * \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2013-76/+148
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| * | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-152-1/+5
| | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee
* | | | Merge branch '15445-file-renames' into 'master' Jacob Schatz2016-04-211-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File name change appears on one line Closes #15445 <img src="/uploads/51714555be63af16b810cf528de49192/Screen_Shot_2016-04-21_at_9.22.43_AM.png" width="500px"> See merge request !3854
| * | | | File name change appears on one lineAnnabel Dunstone2016-04-211-0/+2
| | |_|/ | |/| |
* | | | Merge branch 'note-username-text-color' into 'master' Jacob Schatz2016-04-211-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with author link color on dark diffs Correctly added a color to the author link ![Screen_Shot_2016-04-21_at_08.55.05](/uploads/ffa9e12e868c7b71fa4dd9244114274a/Screen_Shot_2016-04-21_at_08.55.05.png) Fixes #15444 See merge request !3847
| * | | Fixed issue with author link color on dark diffsnote-username-text-colorPhil Hughes2016-04-211-0/+3
| | | |
* | | | Merge branch 'revert-diff-scroll' into 'master' Jacob Schatz2016-04-205-30/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap all code in diffs Closes #15382 Closes #15422 All diff code wraps to next line instead of scrolling <img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px"> See merge request !3838
| * | | | Wrap all code in diffsrevert-diff-scrollAnnabel Dunstone2016-04-205-30/+20
| | |_|/ | |/| |
* | | | Added variablesPhil Hughes2016-04-202-7/+12
| | | |
* | | | Updated based on designsPhil Hughes2016-04-201-9/+44
| | | |
* | | | Fixed issue with bootstrap dropdown closing the calendarPhil Hughes2016-04-201-0/+4
| | | |
* | | | Posts the due date through AJAXPhil Hughes2016-04-202-2/+89
| | | |
* | | | Merge branch 'right-sidebar-z-index' into 'master' Jacob Schatz2016-04-201-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Increased z-index of right sidebar Fixes issue with active button overlapping it Closes #15243 See merge request !3722
| * | | Increased z-index of right sidebarright-sidebar-z-indexPhil Hughes2016-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with active button overlapping it Closes #15243
* | | | Merge branch '15213-dialog-input' into 'master' Jacob Schatz2016-04-201-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add margin to top of form actions Closes #15213 Also fixes other modal inputs (like add new directory, etc) ![Screen_Shot_2016-04-20_at_1.47.14_PM](/uploads/14b474da2f86dcc3c1afd9e8ea09e812/Screen_Shot_2016-04-20_at_1.47.14_PM.png) See merge request !3841
| * | | | Add margin to top of form actionsAnnabel Dunstone2016-04-201-0/+2
| | |/ / | |/| |
* | | | Merge branch '15104-mobile-comment-bug' into 'master' Jacob Schatz2016-04-202-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion note icon shows up when you click on diff on touch screen Fixes #15104 * Fix bug that stopped discussion note button from showing up on iOS * Shifted button a few `px` to fix slight cutoff <div> <img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px"> <img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px"> </div> See merge request !3755
| * | | Discussion note icon shows up when you click on diff on touch screen15104-mobile-comment-bugAnnabel Dunstone2016-04-152-1/+2
| | |/ | |/|
* | | Fixes issue with note form inheriting text colornote-form-text-colorPhil Hughes2016-04-201-0/+1
| | |
* | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-201-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | | Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-181-0/+9
| | | | | | | | | | | | | | | | endpoint
* | | | Merge branch 'mobile-header-overlap' into 'master' Jacob Schatz2016-04-181-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overlap in header on mobile ![Screen_Shot_2016-04-18_at_08.48.29](/uploads/8f371d0c717a57ca7afb29415e13d96c/Screen_Shot_2016-04-18_at_08.48.29.png) See merge request !3777
| * | | | Fixed overlap in header on mobilemobile-header-overlapPhil Hughes2016-04-181-1/+5
| |/ / /
* | | | Merge branch 'note-form-focus-color' into 'master' Jacob Schatz2016-04-181-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated note form focus to better match form-control focus ![Screen_Shot_2016-04-15_at_09.47.52](/uploads/39e02f79a72798ecc6dc946c7b3c8e2e/Screen_Shot_2016-04-15_at_09.47.52.png) See merge request !3739
| * | | | Updated note form focus to better match form-control focusnote-form-focus-colorPhil Hughes2016-04-151-3/+3
| | |/ / | |/| |
* | | | Merge branch 'parallel-diff' into 'master' Jacob Schatz2016-04-181-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap code in parallel view Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode <img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px"> See merge request !3731
| * | | | Wrap code in parallel viewparallel-diffAnnabel Dunstone2016-04-141-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'import-feedback' into 'master' Jacob Schatz2016-04-181-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added loading icon to import buttons See #14488 for more details See merge request !3662
| * | | | Added loading icon to import buttonsPhil Hughes2016-04-111-0/+21
| | | | | | | | | | | | | | | | | | | | See #14488 for more details
* | | | | Merge branch 'print-style' into 'master' Jacob Schatz2016-04-181-12/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print style [test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf) Closes #14201 See merge request !3784
| * | | | | Updated print stylePhil Hughes2016-04-181-12/+32
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #14201
* | | | | Merge branch 'discussion-notes' into 'master' Jacob Schatz2016-04-182-2/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion notes update - At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues - Moved the dates to be in the header like other notes - Fixed overlapping issue on mobile See merge request !3720
| * | | | Dicussion action mobile fixPhil Hughes2016-04-141-0/+11
| | | | |
| * | | | Discussion notes updatePhil Hughes2016-04-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues Moved the dates to be in the header like other notes Fixed overlapping issue on mobile
* | | | | Alignment with sidebarPhil Hughes2016-04-161-1/+1
| | | | |
* | | | | Refactored issue header to work better for mobilePhil Hughes2016-04-165-57/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also work better for when the title makes the buttons drop down a new line Closes #14228
* | | | | Merge branch 'new-mr-improvements' into 'master' Rémy Coutable2016-04-151-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Updated MR compare Based on in feedback in !3228 See merge request !3704
| * | | | Updated MR comparenew-mr-improvementsPhil Hughes2016-04-131-0/+5
| | | | | | | | | | | | | | | | | | | | Based on in feedback in !3228
* | | | | Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-142-8/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
| * | | | | Syntax & style updates14176-diff-paste-dataAnnabel Dunstone2016-04-141-9/+13
| | | | | |
| * | | | | Add line type conditional to diff line helperAnnabel Dunstone2016-04-141-7/+11
| | | | | |
| * | | | | Add content attributes to discussion diffs; change styling of add-note icon ↵Annabel Dunstone2016-04-142-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | to prevent white spaces in paste
| * | | | | Copying and pasting doesn't grab line numbers or +/-Annabel Dunstone2016-04-141-0/+20
| | |_|_|/ | |/| | |
* | | | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-142-7/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
View Lorry Controller Status