diff -r 9d2a4916ee7a -r dabde7eb8d1f integration/v2/css/style.css --- a/integration/v2/css/style.css Tue Jun 18 13:29:25 2013 +0200 +++ b/integration/v2/css/style.css Tue Jun 18 17:37:24 2013 +0200 @@ -13,7 +13,7 @@ h1{text-transform: uppercase; display:inline-block;padding: 64px 0 0 16px; font-family : 'josefin_sans'; font-weight : 600; font-size:34px;} .head-login{padding-top: 10px; margin-bottom: 40px; display: inline-block;} .head-login, .head-login a{font-size: 12px; font-family: 'Lato'; color: #626364;} -.head-login input{width:140px;background: url(../img/icon-search.png) 150px center no-repeat;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 12px; border: 1px solid #D0D0D0; height: 25px; line-height: 25px; padding: 0 26px 0 4px;} +.head-login input, .search-form{width:140px;background: url(../img/icon-search.png) 150px center no-repeat;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 12px; border: 1px solid #D0D0D0; height: 25px; line-height: 25px; padding: 0 26px 0 4px;} .hello-user{margin-left: 12px;} .head-login select{ vertical-align: middle;} .head-login li{float: left; line-height: 27px;} @@ -25,7 +25,7 @@ .sub-nav{float: right; display: block;} .sub-nav a{font-size: 14px; font-family: 'Lato'; font-weight: 300; display:inline-block;} .sub-nav a:first-letter {text-transform: uppercase;} -.sub-nav a.active, .sub-nav a:hover{font-family: 'Lato';} +.sub-nav a.active, .sub-nav a:hover{font-family: 'Lato'; font-weight: bold;} .nav a{font-family: 'josefin_sans'; font-size: 18px; text-transform : uppercase;} .title-page{margin: 30px 0; position: relative; min-height: 30px;} @@ -37,10 +37,16 @@ .bar-tools{margin-bottom: 26px; line-height: 26px; font-family: 'Lato'; font-weight: 300; display:block;padding: 10px 0; background-image: url(../img/border-dot-bar.png), url(../img/border-dot-bar.png); background-position: top center, bottom center; background-repeat: no-repeat, no-repeat;} .bar-tools h3{ font-size: 18px; display: inline-block; text-transform: uppercase;} .bar-tools ul{float: right;} +.bar-tools ul.left{float: left;} .bar-tools li{float: left; margin-left: 10px;} .bar-tools li a{display: inline-block; font-size: 12px; height: 24px; line-height: 24px; padding: 0 7px; background-color: #DDD;} +.bar-tools li a:hover{background-color: #eee;} .bar-tools li a:first-letter {text-transform: uppercase;} -.bar-tools a.save{padding-left: 30px;background-image: url(../img/icon-save-15.png); background-repeat: no-repeat; background-position: 9px center;} +.bar-tools a.icon{padding-left: 30px;background-repeat: no-repeat; background-position: 8px center;} +a.icon.save{background-image: url(../img/icon-save-15.png);} +a.icon.cut{background-image: url(../img/icon-cut-15.png) ;} +a.icon.plus{background-image: url(../img/icon-plus-15.png);} + /* Home */ .w650{width: 650px;} .our-images{margin-bottom: 38px; text-align: center; font-size: 12px; font-family: 'Lato'; font-weight : bold; font-style : italic; color: #58595A;} @@ -80,7 +86,7 @@ li .toggle{display: none;} li:hover .toggle{ display:block; } -.tools{ text-align:right; width:100%; position:absolute; bottom:0; left:0; background: rgba(255, 255, 255, .8);} +.tools{ text-align:right; width:100%; position:absolute; bottom:0; left:0; background: rgba(255, 255, 255, .9);} .tools ul{ display: inline-block;padding: 6px 10px 6px 0;} .tools a{display: inline-block; width: 25px; height: 25px; line-height: 25px; text-align: center;} .tools li{float: left; margin-left: 6px;} @@ -112,15 +118,19 @@ .tools-2 a img{vertical-align: middle;} .tools-2 li{ float: left; margin-right: 6px;} -.tools-sprite{display:inline-block; width:25px; height: 25px; background-image: url(../img/tools-sprite.png); background-repeat: no-repeat;} -.tools-sprite.twitter:hover{background-position: 0 0;} -.tools-sprite.twitter{background-position: 0 -25px;} -.tools-sprite.facebook{background-position: -30px -25px;} -.tools-sprite.facebook:hover{background-position: -30px 0;} -.tools-sprite.plus{background-position: -60px -25px;} -.tools-sprite.plus:hover{background-position: -60px 0;} -.tools-sprite.cut{background-position: -90px -25px;} -.tools-sprite.cut:hover{background-position: -90px 0;} +.tool{display:inline-block; width:25px; height: 25px; background-image: url(../img/tools-sprite.png); background-repeat: no-repeat; vertical-align: middle;} +.tool.twitter:hover{background-position: 0 0;} +.tool.twitter{background-position: 0 -25px;} +.tool.facebook{background-position: -30px -25px;} +.tool.facebook:hover{background-position: -30px 0;} +.tool.plus{background-position: -60px -25px;} +.tool.plus:hover{background-position: -60px 0;} +.tool.cut{background-position: -90px -25px;} +.tool.cut:hover{background-position: -90px 0;} +.tool.save{background-position: -115px -25px;} +.tool.save:hover{background-position: -115px 0;} +.tool.trash{background-position: -140px -25px;} +.tool.trash:hover{background-position: -140px 0;} .box-shadow{ -webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);} .popin-wrap{width: 100%; height: 100%; position: fixed; z-index: 100; background-color:rgba(255,255,255,.7);} @@ -138,3 +148,5 @@ .btn{cursor:pointer; border: none; vertical-align:middle; display: inline-block; color: #FFF; font-size: 12px; font-family: 'Lato'; height: 25px; line-height: 25px; padding: 0 12px; background-color: #666;} .block{display: block;} .popin-wrap, .popin{display: none;} + +