app/assets/stylesheets/pages · 24920bc52a5658dd1d16d38ba3dc46f92dfe7675 · Forest Godfrey / gitlab-ce

Merge branch 'merge-conflicts-icon-color' into 'master' · edba48c6

authored Jun 09, 2016

Use warning color merge conflicts icon in MR status widget.

Fixes #18174 

### Before
![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png)

### After
![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png)

See merge request !4487

edba48c6

Name	Last commit	Last update
..
profiles		Loading commit data...
admin.scss		Loading commit data...
appearances.scss		Loading commit data...
awards.scss		Loading commit data...
builds.scss		Loading commit data...
ci_projects.scss		Loading commit data...
commit.scss		Loading commit data...
commits.scss		Loading commit data...
confirmation.scss		Loading commit data...
dashboard.scss		Loading commit data...
detail_page.scss		Loading commit data...
diff.scss		Loading commit data...
editor.scss		Loading commit data...
emojis.scss		Loading commit data...
errors.scss		Loading commit data...
events.scss		Loading commit data...
explore.scss		Loading commit data...
graph.scss		Loading commit data...
groups.scss		Loading commit data...
help.scss		Loading commit data...
import.scss		Loading commit data...
issuable.scss		Loading commit data...
issues.scss		Loading commit data...
labels.scss		Loading commit data...
lint.scss		Loading commit data...
login.scss		Loading commit data...
merge_requests.scss		Loading commit data...
milestone.scss		Loading commit data...
note_form.scss		Loading commit data...
notes.scss		Loading commit data...
notifications.scss		Loading commit data...
pipelines.scss		Loading commit data...
profile.scss		Loading commit data...
projects.scss		Loading commit data...
runners.scss		Loading commit data...
search.scss		Loading commit data...
settings.scss		Loading commit data...
sherlock.scss		Loading commit data...
snippets.scss		Loading commit data...
stat_graph.scss		Loading commit data...
status.scss		Loading commit data...
todos.scss		Loading commit data...
tree.scss		Loading commit data...
ui_dev_kit.scss		Loading commit data...
votes.scss		Loading commit data...
wiki.scss		Loading commit data...
xterm.scss		Loading commit data...