annotate docs/tutorial/style.css @ 4311:8aa28e68ac44 stable

evolve: detect unresolved conflict during evolve --continue (issue5966)

Evolve --continue was ignoring unresolved conflict, proceeding with its
operation without any check. This is now fixed.

This test case was built and formalized by Matt Harbison and Anton Shestakov.

/*
.uk-overflow-container {    
    overflow-y: scroll;
    top: 0;
    bottom: 0;


}*/
table {
    min-width: 100%
}

.video-js {
    min-width:100%; 
    max-width:100%;
    max-height: 100%;
}

.vjs-fullscreen {
    padding-top: 0px
}

::-webkit-scrollbar {
  width: 12px;  /* for vertical scrollbars */
  height: 12px; /* for horizontal scrollbars */
}

::-webkit-scrollbar-track {
  background: rgba(0, 0, 0, 0.1);
}

::-webkit-scrollbar-thumb {
  background: rgba(0, 0, 0, 0.5);
}


.uk-overflow-container  {
    overflow-y: scroll;
    top: 0;
    bottom: 0;
}

em {
    color:#666;
}