►
Description
In this video we move some the merge conflict specific styles out of the main CSS to a page specific CSS.
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44168
B
A
Yeah,
that's
that
sounds
awesome.
I
know
projects
is
going
to
be
really
tough,
because
I
would
imagine
that
there's
a
lot
of
style,
a
lot
of
styles
there.
The
reason
it's
so
big
is
because
there's
probably
not
a
lot
of
page
specific
styles
as
much
as
it's
like
anything
inside
a
project
and
kind
of
everything's
inside
of
projects.
A
C
B
B
B
The
project
graph
page
and
it
had
about
20
lines
of
css
that
I
could
just
rip
out
and
use
utility
classes.
So
I
would,
I
would
imagine
that
we
probably
find
a
lot
of
those
scenarios
in
the
in
the
non-page
specific
css
files
we
have
here,
because
I
imagine,
there's
there's
quite
a
lot
of
generic
type
styling,
that's
probably
just
going
in
there
and
that's
probably
where
we
get
where
we
also
have
the
biggest
risk
of
styles
that
have
been
leading
through
to
other
areas.
C
B
And
styling
that
might
be
dependent
on
something
in
a
specific
file
that
isn't
necessarily
specific
to
a
page,
and
so
that's
the
the
tricky
part
of
of
some
of
these
they're
not
really
actually
paid
they're,
not
scoped.
Well,
they
know
the
ones
I
have
tackled.
I've
made
sure
that
they're
they
were
minor
and
scoped
that
rocks.
A
Yeah
now
it's
yeah
there
is
it's
a
you
have
to
be
really
careful,
especially
because
there's
no
automated
testing
here,
so
it
really
does
require
a
qa
process
that
everyone
can
check.
If,
if
we
care
about
preserving
user
experience,
which
we
do
so
yeah,
I
personally
would
put
these
in
two
different
buckets
moving
styles
that
are
truly
page
specific
and
then
removing
styles
all
together
with
utility
classes.
A
I
personally,
if
I
was
reviewing
something
I
would
like
to
see
that
in
two
different
mr's,
because
I
think
I
think
that
that
is
to
me.
Those
are
two
different
efforts
and
it's
nice
to
put
it's
very
possible
to
put
that
in
two
different
boxes
but
yeah.
Let's,
let's
pick
one
of
those
and
just
start
whacking
at
it.
Is
there
were
you
already
in
the
middle
of
whacking
one
or
were?
Did
you
want
to
just
not?
I
don't
have.
B
A
A
A
Yeah,
there's
marriage
requests
kind
of
thing
would
be
interesting.
I
don't
know
if
there's
I'm
technically
in
the
editor
group,
ours
is,
you
know
we
probably
had
everybody
beat
because
we
hadn't,
we
have
our
ide
specific
page,
and
I
think
we
had
our
ide
specific
style
that
isn't
loaded
everywhere
else.
That's
right.
E
E
A
Matter
I
know
I
know,
and
at
the
end
of
the
day
it's
all
gitlab,
so
there
you
go
commits,
might
be
interesting.
That
might
be
one
that
I
have
a
little
bit
of
experience,
knowing
where
this
one
might
show
up
so
commits
might
be
interesting.
Let's
pick
another
one
just
so
we
can
have
something
to
choose
from.
A
B
A
Yeah,
that's
that
one's
gonna
be.
I
think
that
would
be
tough
another
one
I
was
thinking
that
might
be
fairly
doable
would
be
labels,
because
that
sounds
like
that.
We
shouldn't
have
a
lot
of
styles
here,
because
that's
I
imagine
this
is
just
supposed
to
be
the
page
for
labels,
but
I
think
in
reality,
there's
probably
a
lot
of
styles
here
for
how
we
do
labels
everywhere
and
we
we
might
need
to
find
a
better
place
for
that
to
live.
So
I
would
suggest
you
know
doing
commits
would
be
interesting.
B
A
A
G
E
A
A
So
this
might
not
be
a
page
specific
thing
this
might
have
to
do
with
it.
Might
I
don't
know
this
might
actually
have
to
do
with
like
how
we
do
diffs
and
like
anyways?
Let's,
let's
see
that
would
be
interesting,
but
yeah,
because
you
see
some
fancy
things
here,
like
diff
line,
numb
and
header
line
content,
but
all
that
is
coming
from
this
mix
and
color
scheme.
A
Is
it
reusing
this
mix?
Oh,
we
have
okay
and
we
use
this
if
we
do
anywhere.
We
have
this
conflicts
yeah
and
it's
all
scoped
in
here.
So
this
is
a
great
example
yeah.
So
let
me
I
would
things
I
want
to
double
check
is:
can
is
conflicts
this
id
used
anywhere
else,
and
I
want
to
see
if
this
mixin's
used
anywhere
else
can
mix
are
mixins
kind
of
just
oh
yeah.
It
looks
like
it's
not
used
anywhere
else.
Oh
brilliance,
okay,
beautiful!
A
A
And
I'm
gonna
get
a
number
of
false
positives
here,
but
I'm
not
super
concerned
about
it.
I
could
I'm
looking
at
these
false
positives
and
I'm
like
okay.
I
know
I'm
not
gonna
start
with
a
with
a
with
a
word,
so
I'm
gonna
start
with
something:
that's
not
a
weird
character
and
yeah.
So
I
don't.
I
think
I
think
that's
the
only
place
this
was.
This
is
going
to
be
the
we're
going
to
get
this
resolved
so
fast.
A
B
A
B
A
B
A
A
A
Okay,
I'm
going
to
share
my
screen
again
because
I
have
logged
in.
I
did
foolishly
type
in
my
1password
password
into
my
gitlab
password
box,
so
I
might
have
to
do
some
password
resetting
later
anyways
figure
out.
Oh
here's,
the
one
great
okay,
we've
assigned
it
to
everybody,
we're
all
taking
we're
all
taking
this
on.
Oh
yeah,
even
mark
because
he's
in
lurking
mode,
okay
figure
out
move
the
file
from
app
assets
pages
to
page
bundles.
A
So
here's
the
path,
I'm
gonna,
move
this
from
pages
and
we're
gonna
go
to
page
bundles,
page
bundles.
Have
you
seen
the
syntax
before
I?
I
learned
this
a
couple
of
months
ago,
so
it
like
expands
out
to
two
different
arguments,
one
using
pages,
one
using
page
bundle.
So
I'm
moving
from
pages
to
page
bundles.
A
A
B
C
A
I
think
you're
right,
you
might
be
right.
I
think
I
think
you
are
right.
I
also
wonder
like
is
this
and
maybe
we've
identified
something
to
help
us
like
clarify
this?
Is
this
for
like
new
css,
I'm
introducing,
or
is
this
identified
as
this
is
important
as
part
of
this
migration?
I
need
to
also
migrate
things
to
css
variables,
or
is
this
only
for
like
if
I'm
doing
new
stuff.
G
A
Let's,
let's
test
it
out
in
dark
mode
and
see
what
it
looks
like
and
yeah
we
might
need.
I
see
what
we're
saying
now
is
because
previously
because
it
was
part
of
the
whole
application
bundle,
we
would
load
application
or
application
dark
and
that
resets
the
css
variables.
But
now
this
is
in
its
own
thing.
It
doesn't
know
if
it's
dark
or
light
so
we're
using
css
variables.
For
that
I
get
it
and
I
see.
A
A
A
This
is
interesting
because
some
browsers
automatically
see
that
localhost
as
oh,
you
mean
127.0.0.1
and
we're
not
going
to
listen
to
your
ip
address
at
all,
we're
not
going
to
try
to,
for
whatever
reason
I
don't
know,
and
I
needed
to
actually
mount
to
the
specific
ip
address,
because
I
have
like
other
containers
and
stuff
listening
to
it.
So
anyways,
I'm
I'm
ranting
about
my
own
problems.
Do
you
know
if
there's
a
merge
request
that
already
has
like
merge
conflicts
or
something?
A
D
F
A
B
I
I
just
wanna:
it
feels
like
there's
a
there's,
a
step
missing
with
regards
to,
unless
this
has
not
become
needed
anymore,
but
we
used
to
include
the
mixings
and
variables
in
the
actual
page
bundle
file.
I
don't
know
if,
if
the
recent
changes
to
that
or
two
that
I've
made
makes
that
not
needed
anymore,
just
double
checking
quickly,.
A
B
A
A
E
B
A
B
G
E
A
C
A
A
A
A
A
A
A
A
A
E
A
Oh,
you
see
how
this
change
now
this
is
interesting.
Did
you
see
what
what
happened
here?
I
I
did
have
like
one
of
these
other
colors
selected
and
once
I
select
this,
it
saved
it,
but
because
I
don't
have
that
dark,
css
loaded,
it's
it
doesn't
look
like
it's
there
yet,
but
anyways.
This
is
an
interesting
thing.
A
B
A
A
F
A
G
A
A
F
A
A
A
A
A
A
A
D
A
A
A
A
It
looks
like
we're
not
really
clear
on
some
of
if
we
do
this
or
if
we
automatically
do
a
resolve
or
whatever.
Sometimes
it
ends
up
merging
master
into
your
work
branch
and
that
can
actually
cause
issues
for
some
good
workflows,
and
that
was
not
obvious
and
that's
why
some
issues
were
like
some
users
were
like.
I
don't
want
my
developers
being
able
to
do
this
because
it
was
causing
issues
whatever,
but
that's
a
totally
different
conversation.
A
I
don't
happen
to
have
the
issue
number
because
it
was
a
while
ago,
but
I'm
glad
we're
we're
tackling
this
view,
because
it's
gonna
bring
it
up
and
we'll
have
to
reconsider
and
look
at
data,
and
I
was
like
hey
is
this:
is
this
being
used?
It's
worth
asking
that
question
okay,
but
but
we're
actually
good.
A
A
B
B
A
I
I
think
that
would
be
really
nice.
I've
thought
about
side
note
since
we're
talking
about
things,
and
I
feel,
like
I've
done
a
lot
of
talking.
I'm
sorry
about
that.
How
cool
would
this
be?
So
you
know
like
we've
done,
git
pod
integrations
and
like
source
graph
integrations
and
stuff.
We
have
to
maintain
this
integration
code.
A
What,
if
in
our
console
here
or
something
like
what,
if
we
expose
like
an
integration
api,
so
that
when
someone,
someone
wants
to
create
a
browser
extension
rather
than
have
to
be
like,
coupled
to
like
certain
elements
on
the
page
or
whatever
we
had
something
like?
Oh,
I
want
to
add
an
editor
but,
and
I'm
just
going
to
run
like
we
had
an
actual
just
extension
api
that
we
maintained
and
we
didn't
have
to
maintain
all
the
specific
integrations
someone
just.
Oh
I'm
just
going
to
install
this
extension
and
here's
how
we
add
editor
buttons.
B
A
Anyways
roman
was
looking
into.
I
think
he's
created
an
issue
about
that.
I
could
I'll
share
that
on
our
front
end
thread.
That's
that
was
that'd,
be
something
interesting
to
do.
Anyways,
here's
the
changes,
we've
tested
it
all
the
way
up.
Oh,
I
was
curious
about
none,
but
I'm
looks
like
all
these
other
ones
are
gonna
kind
of
work
the
same
so
I
think
we're
we're
done
yeah.
It
looks
good
in
dark
mode,
it's
pretty
good,
so
cool
does
anyone.
Did
I
miss
anything.
G
C
A
F
B
D
B
A
B
B
G
A
A
G
A
A
A
A
A
You
know
I
I
love
when
we
all
get
together
and
we
pair
on
something
and
just
because
we
work
in
these.
You
know
it's
kind
of
like
a
physical
silo
and
you
know
we're
doing
that.
Dibs
training
and
I
think
that,
if
we
have,
even
though
I
can
have
a
diverse
and
inclusive
attitude,
unless
we
actually
take
the
effort
to
like
have
this,
I
think
sync
up
conversations
interactions
like
it's
easy
for
someone
not
to
feel
this
belonging
bed,
and
that
really,
I
think,
contributes
to.