conflict.diff

24d23
< <<<<<<< HEAD
26,76d24
< =======
< body { background-color: #F1F1F1 }
< 
< #footer { text-align: center }
< 
< #results {
< 
< 	.label { margin-left: 4px;
< 
< 		&:first-child { margin-left: 0 } } }
< 
< #refine { 
< 
< 	legend { font-size: 1em; line-height: 1.786em; font-weight: bold; text-transform: uppercase;
< 
< 	    a { display: block } }
< 
< 	label { /*font-size: 0.857em;*/ }
< 
< 	.nav-header { padding-left: 0 } 
< 
< 	&.form-horizontal .control-group, &.form-horizontal legend { margin-bottom: 10px } }
< 
< #logo { width: 50px; height: 50px;
< 
<     img { width: 50px; height: 50px; } }
< 
< .navbar-brand { padding: 0px; margin-left: 15px; }
< 
< #button-area { position: fixed; right: 25px; top: 25px; display: block; }
< 
< #appbar { position: absolute; top: 0px; left: 0px; background-color: #333333; width: 100%; font-size: 13px;
< 
<     a { padding: 5px; color: #fff; }
< 
<     a:hover { text-decoration: none } }
< 
< .pagination a { cursor: pointer }
< 
< .autocomplete.dropdown { position: absolute; background-color: #fff; border: 1px solid #CCCCCC; border-top: 0; z-index: 1000;
< 
<     .entry.selected { background-color: #4A88CE; color: #fff; }
< 
<     .entry { cursor: pointer;
< 
<         .glyphicon { margin-right: 5px } } }
< 
< #nprogress .bar { z-index: 1000 }
< 
< .progress-overlay { display: none; position: absolute; width: 100%; height: 100%; top: 0; left: 0; z-index: 999; background-color: rgba(50, 50, 50, 0.5); }
< >>>>>>> master
179c127,132
< nav.navbar ul li:not(:first-child){ border-left: 1px solid #F1F1F1; } 
---
> nav.navbar{
> 	ul li:not(:first-child){
> 		border-left: 1px solid #F1F1F1;
> 	}
> }
> 
259c212
< 	.save-button-container { opacity: 0.8; position: fixed; right: 50px; top: 10px; width: 100px; z-index: 1000; } }
---
> 	.save-button-container { opacity: 0.8; position: fixed; right: 50px; top: 10px; width: 100px; z-index: 1000; } }
\ No newline at end of file