<<<<<<< HEAD:ui-server/public/stylesheets/builder.css ======= body { background-color: #ddd; } #page { /* background-color: #e5e5e5; */ background-color: #fff; max-width: 80em; margin: 0 auto; /* Make sure floats don't escape the page */ overflow: hidden; } >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css #header { font-size: 90%; position: relative; z-index: 1; color: white; line-height: 1; overflow: hidden; padding-bottom: 24px; } #watermark { position: absolute; width: 780px; left: 0; top: 0; bottom: 0; /* background: url(../images/watermark.png) no-repeat top left; */ background: url(../images/confidential.png) no-repeat 50% 50%; } #mainavigation { position: relative; float: left; margin-top: 18px; margin-left: 192px; font-weight: bold; text-align: center; } #userbar { <<<<<<< HEAD:ui-server/public/stylesheets/builder.css font-size: 90%; ======= >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css padding: 12px 32px 0; color: #999; z-index: 2; position: absolute; top: 0; right: 0; overflow: hidden; } <<<<<<< HEAD:ui-server/public/stylesheets/builder.css #userbar .actions, #userbar .user { float: left; } #userbar .user { position: relative; padding-left: 38px; margin-left: 6px; } ======= #userbar .actions, #userbar .user { float: left; } #userbar .actions { } #userbar .actions a { padding-left: 14px; } >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css <<<<<<< HEAD:ui-server/public/stylesheets/builder.css #userbar .actions a { padding-left: 14px; ======= #userbar div div { padding: 3px 3px 0; >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css } <<<<<<< HEAD:ui-server/public/stylesheets/builder.css #userbar div div { padding: 3px 3px 0; } #userbar em { font-weight: bold; font-style: normal; color: #444; } #userbar a { font-weight: bold; } ======= #userbar em { font-weight: bold; font-style: normal; color: #444; } #userbar a { font-weight: bold; } >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css #userbar a#reportbug { background: url(../images/bug.png) no-repeat center left; padding: 0 3px 0 14px; color: red; } #userbar #reportbug:hover { opacity: .6; } #userbar .user-pic { <<<<<<< HEAD:ui-server/public/stylesheets/builder.css position: absolute; top: 0; left: 0; ======= >>>>>>> 2666cdffcdd4295c45482d4c79161d6e40e2e27f:ui-server/public/stylesheets/builder.css