home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,617 Commits 48 Branches 340 Tags
cbdbbcbc4ff18da9d55265d97fc03445895f63f8
Commit Graph
369 Commits
Author SHA1 Message Date
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' 
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
 2016-03-21 20:40:14 +00:00
Jacob Schatz be039601be Merge branch 'css-indentation' into 'master' 
Fix Indentation lints in CSS.

As discussed in #14299.

cc: @jschatz1 

See merge request !3312
 2016-03-21 20:11:00 +00:00
Jacob Schatz e210438eac Merge branch 'css-shorthand' into 'master' 
Follow the CSS Style Guide rules for using shorthand where possible.

Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.

Discussed in #14299.

cc: @jschatz1 

See merge request !3313
 2016-03-21 19:32:23 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
connorshea 5a1572a426 Follow the CSS Style Guide rules for using shorthand where possible. 
Fixes violations of Shorthand.

Discussed in #14299.

[ci skip]
 2016-03-18 15:24:13 -06:00
connorshea 86a4449df2 Fix Indentation lints in CSS. 
As discussed in #14299.

[ci skip]
 2016-03-18 14:59:29 -06:00
connorshea 5640249daa Fix a few remaining uses of 0px. 
See #14299 for more information.

[ci skip]
 2016-03-18 14:45:03 -06:00
Dmitriy Zaporozhets daeed3fdf3 Refactor colors and lists 
* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-18 19:02:08 +01:00
Dmitriy Zaporozhets 5e2728891e Cleanup somce css colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-18 17:48:52 +01:00
Dmitriy Zaporozhets 3837f4413a Re-group scss variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-18 17:37:10 +01:00
Jacob Schatz 4cd87d31bd Merge branch 'optimistic-todos' into 'master' 
Adds small AJAX optimistic functionality to todos.

Fixes #13656 <br/>
A good first step and boring solution. <br/>
Will make ajax call to remove each issue.  <br/>
If issue is last in group of issues will refresh page.  <br/>
If issues remain in group will remove row with JS.  <br/>
Adds loading spinner to button and disables. <br/>

![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>

cc @dzaporozhets @JobV @dbalexandre 

See merge request !2946
 2016-03-18 11:23:16 +00:00
Dmitriy Zaporozhets fde975facc Merge branch 'fix-group-members-ui' into 'master' 
Add side padding to content-list if inside panel

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

Fixes #14367, #14349

See merge request !3273
 2016-03-18 08:46:57 +00:00
Felipe Artur 0a7f716119 Code fixes 2016-03-17 19:42:46 -03:00
Jacob Schatz 73ba88b539 Merge branch 'download-dropdown-alignment' into 'master' 
Fixed alignment of download dropdown

With the new dropdown CSS - some dropdowns might look a bit odd

## Previously

![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png)

## Now

![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png)

See merge request !3245
 2016-03-17 21:47:03 +00:00
Jacob Schatz 1ffb32ed61 Merge branch 'filter-spacing' into 'master' 
Fixed filter spacing

Closes #14350

![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png)

See merge request !3267
 2016-03-17 21:45:08 +00:00
Alfredo Sumaran 028c751040 Revert link color from blue 2016-03-17 12:20:24 -05:00
Dmitriy Zaporozhets 21952cc7f1 Add side padding to content-list if inside panel 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-17 17:29:09 +01:00
Phil Hughes 421215e338 Removed the flash success message 
Removes the group if empty
 2016-03-17 12:54:02 +00:00
Jacob SchatzandPhil Hughes fa570525db Adds small AJAX optimistic functionality to todos. 
Fixes #13656
A good first step and boring solution.
 2016-03-17 12:20:14 +00:00
Phil Hughes feb538dddd Fixed filter spacing 
Closes #14350
 2016-03-17 10:21:48 +00:00
connorshea 5d3cd7fd37 Follow the CSS Style Guide rules for including a space after the property colon. 
Fixes violations of SpaceAfterPropertyColon.

Discussed in #14299.

[ci skip]
 2016-03-16 20:52:48 -06:00
connorshea e106597e31 Follow the CSS Style Guide rules for unitless zero values. 
Updated Emoji Rake task to conform to style guide.

Discussed in #14299.

[ci skip]
 2016-03-16 19:23:23 -06:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Felipe Artur ec20fdf366 Code improvements and add Create group service 2016-03-16 19:44:33 -03:00
Phil Hughes 6f9bda6b2d Fixes issue with dropdown caret being incorrect color 2016-03-16 19:29:53 +00:00
Jacob Schatz 3b95d59b35 Merge branch 'css-hex-format' into 'master' 
Follow the CSS Style Guide rules for HEX colors.

Use lowercase letters and shorthand values for HEX colors where possible, in accordance with the CSS Style Guide.

Discussed in #14299.

\cc @jschatz1 @rspeicher

See merge request !3238
 2016-03-16 15:13:23 +00:00
Phil Hughes d94dc565ba Fixed alignment of download dropdown 
With the new dropdown CSS - some dropdowns might look a bit odd
 2016-03-16 11:44:53 +00:00
Jacob Schatz 495ae51353 Merge branch 'dropdown-vertical-spacing' into 'master' 
Fixed overflow on users name in dropdowns

Closes #14289

![Screen_Shot_2016-03-15_at_17.38.09](/uploads/803341031c468069709afd99a6c540be/Screen_Shot_2016-03-15_at_17.38.09.png)

See merge request !3235
 2016-03-15 20:18:56 +00:00
connorshea e03d0b2892 Follow the CSS Style Guide rules for HEX colors. 
Use lowercase letters and shorthand values for HEX colors where
possible.

Discussed in #14299.
 2016-03-15 13:56:28 -06:00
Phil Hughes b24f9d66bc Fixed overflow on users name in dropdowns 
Closes #14289
 2016-03-15 17:38:45 +00:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master' 
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
 2016-03-15 15:53:42 +00:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master' 
Applications tab on profile settings

Closes #13855

See merge request !3031
 2016-03-15 14:33:14 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' " 
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
 2016-03-15 14:55:40 +01:00
Dmitriy Zaporozhets 19ecfb5c85 Merge branch 'group-projects-page' into 'master' 
Redesign project tabs on group page

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


Final step to fix #13480 

See merge request !3209
 2016-03-15 08:59:41 +00:00
Dmitriy Zaporozhets 6c791f7da7 Redesign project tabs on group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-14 18:31:14 +01:00
Phil Hughes 1a5992b5eb Changed breakpoint size 
Changed breakpoint class into singleton
 2016-03-14 11:51:07 +00:00
Phil Hughes f0f6723fe0 Created bootstrap breakpoint class 
This class checks the current bootstrap breakpoint
 2016-03-14 11:39:56 +00:00
Phil Hughes b155d54941 Removed deprecated bootstrap variables 2016-03-14 11:39:56 +00:00
Phil Hughes 9d6e0c5071 Left sidebar overlaps the content on mobile devices 2016-03-14 11:39:56 +00:00
Jacob Schatz 491d0ae1c3 Merge branch 'fix_responsive_layout_bug' into 'master' 
Fix responsive bug top navigation

Hi,

I have found and fixed a minor layout bug (responsive)

This is the situation before the fix:
![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png)

And this is the situation after the fix:
![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png)

See merge request !3190
 2016-03-11 22:58:14 +00:00
Dennis van de Hoef e932a4164f Fix responsive bug top navigation 2016-03-11 22:34:51 +01:00
Jacob Schatz 3ed8a8e52c Merge branch 'search-results-filter-dropdown' into 'master' 
Improved search results filter dropdown

## Current

Currently filter dropdowns on search results page can be **very** long and off the page

![Screen_Shot_2016-03-11_at_15.25.24](/uploads/3418b0a6f4f8a0a8bd2441b53502c574/Screen_Shot_2016-03-11_at_15.25.24.png)

## New

Changed over to the new dropdown

![Screen_Shot_2016-03-11_at_15.29.06](/uploads/2d3a4a9b3e50f3e0fc1748a026cd5905/Screen_Shot_2016-03-11_at_15.29.06.png)

See merge request !3183
 2016-03-11 17:13:09 +00:00
Phil Hughes 9f8661987d Increased dropdown max height 2016-03-11 16:30:58 +00:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master' 
Updated UI of award emoji

Closes #13878 

See merge request !3028
 2016-03-11 16:06:18 +00:00
Phil Hughes c9b62662cc Used standard variable colours 2016-03-11 09:51:07 +00:00
Phil Hughes 4d4573268e Fixed heading weight issue 
Moved colours to variables
 2016-03-11 09:51:07 +00:00
Phil Hughes f48f51ac7e Account settings 
Closes #13854
 2016-03-11 09:51:07 +00:00