home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,414 Commits 48 Branches 340 Tags
ca823065a905f8c19b2003a67e79831ba1ceff2e
Commit Graph
450 Commits
Author SHA1 Message Date
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'" 
This reverts merge request !3494
 2016-04-07 21:20:16 +00:00
Jacob Schatz dc3de6e132 Revert "Merge branch 'fix-sidebar-exapnd' into 'master'" 
This reverts merge request !3520
 2016-04-07 20:33:01 +00:00
Jacob Schatz d2f7813078 Merge branch '14866-url-overflow' into 'master' 
Wrap code blocks to next line

Closes #14866 

![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png)

See merge request !3573
 2016-04-06 22:25:30 +00:00
Annabel Dunstone 86d346b6f4 Change word-break to word-wrap 2016-04-06 14:40:29 -07:00
Jacob Schatz b6d5fcd477 Merge branch 'issue_14800' into 'master' 
Search Design fixes

Closes #14800 

- Use colors according to design
- Fix width of search input


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

See merge request !3475
 2016-04-06 21:26:56 +00:00
Annabel Dunstone dcdf0b2af2 Horizontally scroll code blocks instead of wrapping 2016-04-06 13:20:58 -07:00
Annabel Dunstone ebb91c7f04 Wrap code blocks to next line 2016-04-06 13:20:58 -07:00
Jacob Schatz 205af25a33 Merge branch '14342-merge-button' into 'master' 
Update shades of red

Closes #14342 

Before:
![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png)

Fixed:
![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png)

See merge request !3549
 2016-04-06 19:08:49 +00:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master' 
Notes form design update

Part of #3401

See merge request !3442
 2016-04-05 19:34:16 +00:00
Annabel Dunstone 0ab6b82a23 Update shades of red 2016-04-05 12:09:19 -07:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. 
Resolves #14411.

See merge request !3464
 2016-04-04 19:44:07 -06:00
Alfredo Sumaran 51b8b8711b Merge branch 'master' into issue_14800 
# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
 2016-04-04 20:06:29 -05:00
Dmitriy Zaporozhets 8f9586421d Merge branch 'admin-pages-layout' into 'master' 
Improve UI for admin/groups page

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

cc @jschatz1 @skyruler 

See merge request !3523
 2016-04-04 22:25:06 +00:00
Jacob Schatz 1926e55e1f Merge branch 'hide_profile_activity_on_mobile' into 'master' 
Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412
 2016-04-04 19:52:31 +00:00
Dmitriy Zaporozhets d5fadfe0f5 Improve UI for admin/groups page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 19:23:50 +02:00
Dmitriy Zaporozhets 1be3c634c8 Fix transparent bg for expand sidebar button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 16:58:35 +02:00
Jacob Schatz df77df46f5 Merge branch 'space-before-brace-scss-lint' into 'master' 
Enable SpaceBeforeBrace rule for SCSS Lint

Also resolve all instances of spaces not being included before opening braces.

See merge request !3463
 2016-04-04 13:56:10 +00:00
Phil Hughes 51df93607f SCSS colors into variables 2016-04-04 11:00:29 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master' 
Two level hierarchy  in navigation sidebar

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

See merge request !3494
 2016-04-02 10:20:17 +00:00
Jacob Schatz 13659fe7b6 Merge branch 'dz-fix-nav-block' into 'master' 
Remove 1px whitespace between nav tabs and underline when form present

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

See merge request !3489
 2016-04-01 20:33:29 +00:00
Dmitriy Zaporozhets 4a8bd9faaf Some tweaks to new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 20:34:42 +02:00
Jacob Schatz 09b7b766cb Merge branch 'notes-actions-colours' into 'master' 
Notes/discussions header

Part way towards getting the design for issues/merge requests to look more like the design in #3401 - I have standardised the headers for both issues & merge requests comments and discussions.

See merge request !3441
 2016-04-01 18:22:14 +00:00
Dmitriy Zaporozhets de6360f904 Improve styling for new complex sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:51:18 +02:00
Dmitriy Zaporozhets 03f2dd90ec Hide sidebar completely when collapsed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:32:39 +02:00
Dmitriy Zaporozhets dbc96f05d0 Refactor left navigation sidebar to use 2 levels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 18:24:03 +02:00
Dmitriy Zaporozhets 18dd525d0f Concept of 2 level navigation sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 16:58:28 +02:00
Dmitriy Zaporozhets ba0c9b863a Remove 1px whitespace between nav tabs and underline when form present 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 14:51:27 +02:00
Arinde Eniola 932c2f59cb hide user profile activity graph on mobile and enable horizontal scroll for medium screens 2016-04-01 00:07:59 +01:00
Alfredo Sumaran ccc929d75d CSS tweaks 
- Use colors according to design
- Fix search input' width
 2016-03-31 11:50:00 -05:00
Dmitriy Zaporozhets a4a8bfd799 Use border color variables for input 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-31 18:20:23 +02:00
Dmitriy Zaporozhets 6ed46aad15 Fix icons color in the header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-31 18:07:29 +02:00
Dmitriy Zaporozhets 80e1ce1dd7 Fix placeholder color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-31 17:47:23 +02:00
Phil Hughes 4a503cb8b3 Fixed alignment of icons 2016-03-31 16:18:45 +01:00
Phil Hughes ec9e0c1119 SCSS variables 2016-03-31 12:58:50 +01:00
Phil Hughes e0960e2877 Changed some CSS to make it more concise & less overriding 2016-03-31 12:57:32 +01:00
Jacob Schatz 403b7fe11a Merge branch 'issue_3400_port' into 'master' 
Location aware search

Closes #3400 #14217

Introduces suggestion grouping on the search box and adds the ability to the user to remove the location to search on.


**Notes**
- Suggestions are now grouped by category.
- Suggestions are displayed when no location is set.
  - Would be great to provide suggestions for the specified location which could be a project or group.
- A location is set from the server for projects/groups related urls.

**Default Apparence**

![](/uploads/9fad1a354fb0e4b13cfd36698c061ab4/default.gif)

**When location badge is present**

![](/uploads/ddc6379f407061e188f9f4a7a9a8c9b8/location-badge.gif)

**Suggestions**

![suggestions](/uploads/2df288e00ad496b31a1a2efc2a4a9f6d/suggestions.gif)

**Suggestions when location badge is present**

![](/uploads/f6ef09d3aed124179ab4e228b848486e/location-present-suggestions.gif)

Closes #3400 

See merge request !3212
 2016-03-31 11:33:17 +00:00
connorshea d80b8ed6d4 Enable SpaceBeforeBrace rule for SCSS Lint 
Also resolve all instances of spaces not being included before opening
braces.
 2016-03-30 14:30:06 -06:00
Jacob Schatz e7650492f2 Collapsed sidebar opens over instead of pushing content. 2016-03-30 07:26:34 -04:00
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Alfredo Sumaran a41f5f59cb Merge branch 'master' into issue_3400_port 
# Conflicts:
#	app/assets/javascripts/gl_dropdown.js.coffee
 2016-03-29 10:48:39 -05:00
Alfredo Sumaran 7b8a4dd351 Set properly line heights 2016-03-28 17:57:59 -05:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master' 
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
 2016-03-28 20:59:13 +00:00
Jacob Schatz 5449296fd6 Fix small style issue 2016-03-28 15:49:21 -04:00
Alfredo Sumaran 2e5cd0f166 Remove unused CSS 2016-03-28 12:06:47 -05:00
Dmitriy Zaporozhets 6e86ef8452 Add border bottom and margin for readme holder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:26:45 +02:00
Alfredo Sumaran 4c268027d2 Fix SCSS Lint errors 2016-03-26 17:51:25 -05:00