diff -r 265a5f1cc7cf -r 43ac4bd80e71 integration/css/common.css --- a/integration/css/common.css Wed Oct 24 18:50:26 2012 +0200 +++ b/integration/css/common.css Thu Oct 25 16:41:19 2012 +0200 @@ -41,7 +41,7 @@ } @font-face { font-family: 'OpenSans'; - font-weight: 600px; + font-weight: 600; font-style: italic; src:url("fonts/OpenSans-SemiboldItalic.eot?") format("eot"), url("fonts/OpenSans-SemiboldItalic.woff") format("woff"), @@ -144,18 +144,18 @@ top: 0; z-index: 10; } -.popin img.pointer{ +.pointer{ position: absolute; top: 0; } -.popin .popin-content{ +.popin-content{ padding: 8px; border: 1px solid #867a97; background: url(../img/bg-jaune.png); } -.popin input[type=text], -.popin input[type=password], -.popin textarea{ +.popin-content input[type=text], +.popin-content input[type=password], +.popin-content textarea{ padding: 0 6px; height: 20px; line-height: 20px; @@ -167,14 +167,8 @@ } /* popin - user */ -.user.popin.signup { - display: none; -} -.user.popin.info { - display: none; -} -.user.popin.login { - display: none; +.popin { + display: none; } .user.popin{ @@ -184,112 +178,90 @@ .user.popin img.pointer{ right: 36px; } -.user.popin.signup input[type=submit], -.user.popin.login input[type=submit], -.user.popin.login a.signup-button , -.popin.segmentation input[type=submit], -.popin.segment-section a.reprendre-segment{ +.button { margin-top: 2px; display: block; font-size: 12px; - border: 0; + border: none; + padding: 0; width: 150px; - padding: 1px 0; background-color: #30036D; color: #FFF; text-align: center; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - float: right; cursor: pointer; + height: 22px; + line-height: 22px; } -.user.popin.signup form input[type=submit]:hover, -.user.popin.login form input[type=submit]:hover, -.user.popin.login a.signup-button:hover, -.popin.segmentation input[type=submit]:hover, -.popin.segment-section a.reprendre-segment:hover{ + +.button:hover{ background-color: #FF00FC } -.user.popin.signup .popin-content h2, -.user.popin.login .popin-content h2{ +.user.login h2, .user.signup h2 { color: #de2500; font-size: 14px; + font-weight: 600; margin-bottom: 12px; } -.user.popin.signup .popin-content label, -.user.popin.login .popin-content label{ + +.user.info h2 { + color: #7628df; + font-size: 18px; + font-weight: 600;margin-bottom: 2px; +} + +.user label{ width: 84px; font-size: 12px; display: inline-block; - float: left; - line-height: 12px; + line-height: 10px; } -.user.popin.signup .popin-content form p, -.user.popin.login .popin-content form p{ +.user p { display: block; line-height: 18px; margin-bottom: 8px; overflow: hidden; } -.user.popin.signup input[type=text], -.user.popin.signup input[type=password], -.user.popin.login input[type=text], -.user.popin.login input[type=password]{ - float: left; +.user input[type=text], +.user input[type=password] { position: relative; width: 110px; padding: 0 5px; height: 18px; display: inline-block; } +.user .button { + float: right; +} /* popin - user - info */ -.user.popin.info .popin-content{ - min-width: 150px; +.user.info { text-align: right; } -.user.popin.info .popin-content h2{ - color: #7628df; - font-size: 18px; - font-weight: 600; - margin-bottom: 2px; -} -.user.popin.info .popin-content h3{ +.user h3{ color: #30036d; font-size: 14px; margin-bottom: 10px; } -.user.popin.info .popin-content a.nb-hashcut{ +.user .nb-hashcut{ color: #de2500; font-size: 14px; text-decoration: underline; display: block; margin-bottom: 12px; } -.user.popin.info .popin-content a.nb-hashcut:hover{ +.user .nb-hashcut:hover{ text-decoration: none; } -.user.popin.info .popin-content a.change-account{ - text-align: center; - height: 20px; - width: 150px; - line-height: 20px; - color: #FFF; - font-size: 12px; - background-color: #30036d; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - display: block; -} .user.popin.info .popin-content a.change-account:hover{ background-color: #FF00FC; } /* popin - user - signup */ -.user.popin.login .popin-content a.signup-button{ +.signup-button{ background-color: #de2500; } -.user.popin.signup .popin-content{ +.user .popin-content{ min-width: 205px; } /* footer */