# HG changeset patch # User cavaliet # Date 1372426307 -7200 # Node ID 1d22c4e915a9af7bedea16b53a53f79d1fe8572b # Parent df9a887eae92dc3eb51ca4612093ce4b17e58777 enhance collection in list with square images and fragments. Fullscreen on slideshow diff -r df9a887eae92 -r 1d22c4e915a9 integration/v2/css/style.css --- a/integration/v2/css/style.css Fri Jun 28 12:46:42 2013 +0200 +++ b/integration/v2/css/style.css Fri Jun 28 15:31:47 2013 +0200 @@ -267,6 +267,10 @@ height: 110px; width: 110px; } +.square-fragment-113 { + height: 113px; + width: 109px; +} .square-fragment-177 { height: 177px; width: 177px; diff -r df9a887eae92 -r 1d22c4e915a9 src/egonomy/static/egonomy/css/slideshow.css --- a/src/egonomy/static/egonomy/css/slideshow.css Fri Jun 28 12:46:42 2013 +0200 +++ b/src/egonomy/static/egonomy/css/slideshow.css Fri Jun 28 15:31:47 2013 +0200 @@ -1,9 +1,9 @@ body { - overflow: hidden; + overflow: hidden; background: #ffffff; } .slideshow-wrap { - position: absolute; left: 0; top: 0; width: 100%; height: 100%; + position: absolute; left: 0; top: 0; width: 100%; height: 100%; background: #ffffff; } .backdrop { @@ -72,4 +72,28 @@ .right-arrow .arrow { transform: rotate(-90deg); -webkit-transform: rotate(-90deg); -} \ No newline at end of file +} + +.top-controls { + position: absolute; left: 20px; top: 20px; display: none; +} + +.top-controls a { + display: block; float: left; background-image: url(../img/slideshow-controls.png); height: 57px; opacity: 0.5; +} + +.top-controls a:hover { + opacity: 1; +} + +.full-screen { + width: 55px; margin-right: 20px; +} + +.play-pause { + background-position: -55px 0; width: 48px; +} + +.play-pause.pause { + background-position: -103px 0; +} diff -r df9a887eae92 -r 1d22c4e915a9 src/egonomy/static/egonomy/css/style.css --- a/src/egonomy/static/egonomy/css/style.css Fri Jun 28 12:46:42 2013 +0200 +++ b/src/egonomy/static/egonomy/css/style.css Fri Jun 28 15:31:47 2013 +0200 @@ -1,9 +1,33 @@ -body{border-top: 1px solid #000;} -a{text-decoration: none; color: #000;} -.wrap{width: 950px; margin: 0 auto; } +/* Helpers */ .uppercase{text-transform: uppercase;} .fragment{width: 225px; height: 225px;} .va-top{vertical-align: top;padding-top: 4px;} +.fs-15{font-size: 15px !important;} +.dot-6{vertical-align:middle; width: 6px; height: 6px; -webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;background-color: #616364; display: inline-block; margin: 0 7px;} +.dot-10{ vertical-align:middle; width: 10px; height: 10px; -webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;background-color: #A1A1A1; display: inline-block; margin: 0 12px;} +li .toggle{display: none;} +li:hover .toggle{ display:block;} +.no-border-bot{background: none; margin-bottom: 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);} +.box-shadow-2{-webkit-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);} +.w-192{width: 192px; margin: 0 !important;} +.no-margin{margin: 0 !important;} +.f-right{float: right;} +.fs-normal{font-style: normal;} +.pt-6{padding-top: 6px;} +.float-left{float: left;} + +/* Custom select box */ +@media screen and (-webkit-min-device-pixel-ratio:0) {select {padding-right:18px !important;}} +select{outline:none; display: inline-block;border:0;font-size: 16px;font-family: 'Lato'; color: #7F7F7F;font-size: 12px;padding: 0 3px 0 4px;-webkit-border-radius: 0;-moz-border-radius: 0;border-radius: 0;-webkit-appearance:none;-moz-appearance:none;appearance:none;} +.styled-select{line-height: 25px;vertical-align: middle;border: 1px solid #CACACA;height: 25px;display: inline-block;position: relative;} +.styled-select:after{content: '';background: url(../img/arrow-select.png) no-repeat right 4px center #FFF;width: 20px; height: 25px;right: 0; top: 0;position: absolute;pointer-events:none;} + +/* Commons */ +.item-masonry{margin-bottom: 20px;} +.wrap{width: 950px; margin: 0 auto; } +a{text-decoration: none; color: #000;} +body{border-top: 1px solid #000;overflow: auto !important;} header, footer{width:100%;background: url(../img/border-bottom-header.png) center bottom no-repeat;} footer{margin-bottom: 60px;background-position: top center; padding-top: 20px;font-size: 15px; font-family: 'Lato'; font-weight: 300;} footer h6{float: left;} @@ -15,15 +39,9 @@ .head-login, .head-login a{font-size: 12px; font-family: 'Lato'; color: #626364;} .head-login input, .search-form{ vertical-align: middle; 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;} -@media screen and (-webkit-min-device-pixel-ratio:0) {select {padding-right:18px !important;}} .head-login li{float: left; line-height: 27px;} .head-login input, .head-login .styled-select{float: left;} .head-login input{margin-right: 10px;} -select{outline:none; display: inline-block;border:0;font-size: 16px;font-family: 'Lato'; color: #7F7F7F;font-size: 12px;padding: 0 3px 0 4px;-webkit-border-radius: 0;-moz-border-radius: 0;border-radius: 0;-webkit-appearance:none;-moz-appearance:none;appearance:none;} -.styled-select{line-height: 25px;vertical-align: middle;border: 1px solid #CACACA;height: 25px;display: inline-block;position: relative;} -.styled-select:after{content: '';background: url(../img/arrow-select.png) no-repeat right 4px center #FFF;width: 20px; height: 25px;right: 0; top: 0;position: absolute;pointer-events:none;} -.dot-6{vertical-align:middle; width: 6px; height: 6px; -webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;background-color: #616364; display: inline-block; margin: 0 7px;} -.dot-10{ vertical-align:middle; width: 10px; height: 10px; -webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;background-color: #A1A1A1; display: inline-block; margin: 0 12px;} nav{height: 70px;} nav a:hover{ border-bottom: 1px solid #000;} nav li{height:100%; float:left; } @@ -33,23 +51,13 @@ .sub-nav a:first-letter {text-transform: uppercase;} .sub-nav a.active, .sub-nav a:hover{border-bottom: 1px solid #000;} .nav a{font-family: 'josefin_sans'; font-size: 18px; text-transform : uppercase;} - .title-page{margin: 30px 0; position: relative; min-height: 30px;} h2{text-transform: uppercase; display:inline-block; font-size: 30px; font-family: 'Lato'; font-weight: 300; } h2 span{text-transform: capitalize; font-size: 24px; font-family: 'Lato'; font-weight: 300; font-style: italic;} .title-menu{ position: absolute; bottom: 0; right: 0;} .title-menu li{float: left;} - -.fs-15{font-size: 15px !important;} -.edition-table-left{ - width: 700px !important; - float: left; -} -.edition-table-right{ - text-align: right; - width: 180px !important; - float: right; -} +.edition-table-left{width: 700px !important;float: left;} +.edition-table-right{text-align: right;width: 180px !important;float: right;} .bar-tools{margin-bottom: 12px; line-height: 35px; padding-bottom: 1px; font-family: 'Lato'; font-weight: 300; display:block;background-image: url(../img/border-bar-tools.png), url(../img/border-bar-tools.png); background-position: top center, bottom center; background-repeat: repeat-x;} .bar-tools h3{ font-size: 18px; display: inline-block; text-transform: uppercase;} .bar-tools ul{float: right;} @@ -63,6 +71,7 @@ .bar-tools li a{display: inline-block; font-size: 12px; height: 25px; line-height: 25px; padding: 0 7px; background-color: #DDD;} .bar-tools li a:hover{background-color: #eee;} .bar-tools li a:first-letter {text-transform: uppercase;} +/* Icon 15 */ .bar-tools a.icon{padding-left: 30px;background-repeat: no-repeat; background-image: url(../img/icons-15.png);} a.icon.save{background-position: 8px -80px;} a.icon.cut{background-position: 8px 5px;} @@ -70,6 +79,7 @@ a.icon.edit{background-position: 8px -26px;} a.icon.trash{background-position: 8px -148px;} a.icon.copy{background-position: 8px -112px;} + /* 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;} @@ -88,63 +98,64 @@ .box-2 .bold:first-child{margin-bottom: 14px;} .box-2 .number{font-size: 46px; font-family: 'josefin_sans'; margin-bottom: 6px;} .box-1{padding: 15px 50px 26px 15px; background-color: #000; color: #fff; font-size: 18px;font-family: 'josefin_sans'; font-weight: bold; font-style: italic; left: 80px; top: 94px; z-index: 11;} - -.list-projets li{float: left; width: 226px; background-color: #EEE; margin-right: 15px;} -.list-projets li:last-child{margin-right: 0;} -.list-projets li h3{font-size: 18px; font-family: 'Lato'; font-weight : bold; line-height: 20px; padding: 14px 14px 0 14px; margin-bottom: 4px;} -.list-projets li p{font-size: 18px; font-family: 'Lato'; font-weight: 300; line-height: 20px; padding: 0 14px; margin-bottom: 12px;} -.list-projets li a{border-top: 1px solid #CCC; font-size: 12px; font-family: 'Lato'; font-weight: 300; display: block; height: 30px; line-height: 30px; padding-left: 20px;} -.list-projets li{margin-bottom: 58px;} - -.list-projets-2{display: block; margin-bottom: 20px;background: url(../img/border-dot.png) repeat-x bottom left; padding-bottom: 1px;} -.list-projets-2>li{position:relative; background-color: #eee; width: 226px; float: left; margin-right: 15px; margin-bottom: 30px;} -.list-projets-2>li:nth-child(4n){margin-right: 0;} -.list-projets-2 .mid{ font-size: 18px; height: 66px; padding-left: 12px;} -.list-projets-2 .mid h3{ font-family: 'Lato'; font-weight : bold; padding-top: 16px;} -.list-projets-2 .mid p{ font-family: 'Lato'; font-weight: 300; font-style: italic;} -.list-projets-2 .bot img, .list-projets-2 .top img{ float: left;} -.list-projets-2 .bot p{color: #333; background-color: #fff; font-family: 'Lato'; font-weight: 300; font-style: italic; padding: 8px 14px 0 14px; font-size: 14px; height: 104px; border-bottom: 1px solid #000; border-left: 1px solid #BBB; border-right: 1px solid #BBB;} -.list-projets-2 .bot{height: 113px; overflow: hidden;} - -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, .85);} +.tools{ text-align:right; width:100%; position:absolute; bottom:0; left:0; background: rgba(255, 255, 255, .85);} .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;} .tools a img{vertical-align: middle;} +.horizontal .col-left, .horizontal .col-right{float: left;} -.horizontal .col-left, .horizontal .col-right{float: left;} -.list-projets-3{margin-bottom: 50px;} -.list-projets-3>li{width: 465px; background-color: #eee; margin-bottom: 20px;} -.list-projets-3 .col-left{position: relative;} -.list-projets-3 li img{max-width: 465px; display: block; margin: 0 auto;} -.list-projets-3 li.horizontal .col-left{ width: 225px;} -.list-projets-3 li.horizontal .col-right{height:100%; width: 240px; } -.list-projets-3 .project-title{position:relative; padding-left: 14px; font-size: 18px;min-height: 60px; border-bottom: 1px solid #CCC;} +/* List-style */ +.list-style li{float: left; width: 226px; background-color: #EEE; margin-right: 15px;} +.list-style li:last-child{margin-right: 0;} +.list-style li h3{font-size: 18px; font-family: 'Lato'; font-weight : bold; line-height: 20px; padding: 14px 14px 0 14px; margin-bottom: 4px;} +.list-style li p{font-size: 18px; font-family: 'Lato'; font-weight: 300; line-height: 20px; padding: 0 14px; margin-bottom: 12px;} +.list-style li a{border-top: 1px solid #CCC; font-size: 12px; font-family: 'Lato'; font-weight: 300; display: block; height: 30px; line-height: 30px; padding-left: 20px;} +.list-style li{margin-bottom: 58px;} + +/* List-style-2 */ +.list-style-2{display: block; margin-bottom: 20px;background: url(../img/border-dot.png) repeat-x bottom left; padding-bottom: 1px;} +.list-style-2>li{position:relative; background-color: #eee; width: 226px; float: left; margin-right: 15px; margin-bottom: 30px;} +.list-style-2>li:nth-child(4n){margin-right: 0;} +.list-style-2 .mid{ font-size: 18px; height: 66px; padding-left: 12px;} +.list-style-2 .mid h3{ font-family: 'Lato'; font-weight : bold; padding-top: 16px;} +.list-style-2 .mid p{ font-family: 'Lato'; font-weight: 300; font-style: italic;} +.list-style-2 .bot img, .list-style-2 .top img{ float: left;} +.list-style-2 .bot p{color: #333; background-color: #fff; font-family: 'Lato'; font-weight: 300; font-style: italic; padding: 8px 14px 0 14px; font-size: 14px; height: 104px; border-bottom: 1px solid #000; border-left: 1px solid #BBB; border-right: 1px solid #BBB;} +.list-style-2 .bot{height: 113px; overflow: hidden;} + +/* List-style-3 */ +.list-style-3{margin-bottom: 50px;} +.list-style-3>li{width: 465px; background-color: #eee; margin-bottom: 20px;} +.list-style-3 .col-left{position: relative;} +.list-style-3 li img{max-width: 465px; display: block; margin: 0 auto;} +.list-style-3 li.horizontal .col-left{ width: 225px;} +.list-style-3 li.horizontal .col-right{height:100%; width: 240px; } +.list-style-3 .project-title{position:relative; padding-left: 14px; font-size: 18px;min-height: 60px; border-bottom: 1px solid #CCC;} .project-title h3{ font-family: 'Lato'; font-weight : bold; padding-top: 12px; margin-bottom: 4px; } .project-title h4{ font-family: 'Lato'; font-weight: 300; font-style: italic;} .project-title a.edit{ position: absolute; top: 10px; right: 10px; opacity: 0.7;} .project-title a.edit:hover{opacity: 1;} -.list-projets-3 .col-right p{max-height:200px; overflow: auto; padding: 10px 12px;font-size: 14px; font-family: 'Lato'; line-height: 18px;} -.list-projets-3>li:hover{-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);} +.list-style-3 .col-right p{max-height:200px; overflow: auto; padding: 10px 12px;font-size: 14px; font-family: 'Lato'; line-height: 18px;} +.list-style-3>li:hover{-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);} -.no-border-bot{background: none; margin-bottom: 0;} -.list-projets-4{margin-bottom: 44px;} -.list-projets-4>li:nth-child(4n){margin-right: 0;} -.list-projets-4>li{float: left; font-size: 18px; width: 225px; background-color: #ECEBEB; margin-right: 16px;} -.list-projets-4 h3{ font-family: 'Lato'; font-weight : bold; padding: 18px 0 0 12px; margin-bottom: 8px;} -.list-projets-4 p{ font-family: 'Lato'; font-weight: 300; font-style: italic; padding-left: 12px; line-height: 20px; padding-bottom: 10px;} +/* List-style-4 */ +.list-style-4{margin-bottom: 44px;} +.list-style-4>li:nth-child(4n){margin-right: 0;} +.list-style-4>li{float: left; font-size: 18px; width: 225px; background-color: #ECEBEB; margin-right: 16px;} +.list-style-4 h3{ font-family: 'Lato'; font-weight : bold; padding: 18px 0 0 12px; margin-bottom: 8px;} +.list-style-4 p{ font-family: 'Lato'; font-weight: 300; font-style: italic; padding-left: 12px; line-height: 20px; padding-bottom: 10px;} .tools-2{ height: 25px; border-top: 1px solid #C5C5C5; padding: 6px 0; text-align: right;} .tools-2 ul{display: inline-block;} .tools-2 a{width: 25px; height: 25px; line-height: 25px; text-align: center;} .tools-2 a img{vertical-align: middle;} .tools-2 li{ float: left; margin-right: 6px;} +/* Pagination */ .pagination{ margin-bottom: 12px;} .pagination li{float: left; font-size: 14px;font-family: 'Lato'; margin-right: 14px;} .pagination li.curent, .pagination li:hover{font-weight: bold;} +/* Icon 25 */ .tool{opacity: 0.5; display:inline-block; width:25px; height: 25px; background-image: url(../img/tools-sprite.png); background-repeat: no-repeat; vertical-align: middle;} .tool:hover{opacity: 1;} .tool.twitter{background-position: 2px 0;} @@ -155,8 +166,8 @@ .tool.trash{background-position: -117px 0;} .tool.edit{background-position:-174px 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);} -.box-shadow-2{ -webkit-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);} +/* Popin */ +.popin-wrap, .popin{display: none;} .popin-wrap{width: 100%; height: 100%; position: fixed; z-index: 100; background-color:rgba(255,255,255,.7);} .popin{width: 460px; background-color: #fff; top: 10%; position: absolute; left: 50%; margin-left: -230px;} .popin h2{ font-size: 14px; font-family: 'Lato'; padding: 14px 0 10px 12px;} @@ -171,17 +182,14 @@ .popin .buttons{text-align: right;} .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;} - .big-popin{width: 572px; margin-left: -286px;} .popin th{ vertical-align:middle;font-family: 'Lato'; font-size: 12px; font-weight: 300; width: 110px; text-align: left;} .popin .col-left{width: 316px; float: left; padding-left: 12px;} -.w-192{width: 192px; margin: 0 !important;} .popin .col-left input[type=text]{width: 172px;} -.no-margin{margin: 0 !important;} .big-popin table{border-spacing:0 5px;border-collapse:separate;} .big-popin textarea{width: 304px; max-width: 304px; height: 170px;} -.list-projets-2.in-popin{float: right; display: inline-block; padding-right: 12px;} -.list-projets-2.in-popin li{margin: 0;} +.list-style-2.in-popin{float: right; display: inline-block; padding-right: 12px;} +.list-style-2.in-popin li{margin: 0;} .big-popin .buttons{clear: both; border-top: 1px solid #DDD; padding-top: 10px; padding-right: 12px;} .edition{background-color: #eee; padding: 0 28px; margin-bottom: 64px;} .edition .slideshow{ min-height: 80px; position:relative; padding: 24px 0; text-align: center;} @@ -194,65 +202,26 @@ .edition{font-family: 'Lato'; font-size: 14px; text-align: left;} .big-popin form{padding: 8px 0 20px 0;} - -.popin-wrap, .popin{display: none;} - - - -.edition th{color: #777; min-width: 140px; } -.edition td{width:100%;color: #000; line-height: 16px;} -.edition table{width: 100%; border-collapse:separate;border-spacing:0 5px;} -.box-edition{padding: 16px 0; border-bottom: 1px solid #CCC;} -.box-edition h3{color: #777;font-family: 'Lato'; font-size: 14px; margin-bottom: 6px;} - +/* Mosaïc */ .list-key-search a{ background-image: url(../img/icon-search.png);} .list-key-add a{background-image: url(../img/icons-15.png); background-position: right 6px top -53px !important; } - .list-keywords li{display: inline-block; float: left; margin: 0 8px 8px 0;} -.list-keywords a{color: #7F7F7F; font-family: 'Lato'; font-size: 12px; display: inline-block; height: 28px; line-height: 28px; padding: 0 30px 0 6px; -background-position: right 4px center; background-repeat: no-repeat; background-color: #fff;} +.list-keywords a{color: #7F7F7F; font-family: 'Lato'; font-size: 12px; display: inline-block; height: 28px; line-height: 28px; padding: 0 30px 0 6px;background-position: right 4px center; background-repeat: no-repeat; background-color: #fff;} .list-keywords a:hover{-webkit-box-shadow: none;-moz-box-shadow: none;box-shadow: none;} - -.f-right{float: right;} -.fs-normal{font-style: normal;} -.pt-6{padding-top: 6px;} -.null{font-weight: bold;font-style: italic; font-family: 'Lato'; color: #CCC; font-style: 18px; line-height: 50px; text-align: center;} -.box-edition:last-child{border-bottom: none;} -.edition input[type=text], .edition textarea{border: 1px solid #CACACA;} -.edition textarea{width:100%; max-width: 754px;} -.edition input[type=text]{width: 742px; height: 23px; line-height: 23px; padding: 0 6px;} -.no-before:before{content:"" ; display: block;} -.tagit{font-family: 'Lato' !important;} -.ui-corner-all{-webkit-border-radius : 0 !important;-moz-border-radius : 0 !important;border-radius : 0 !important;} -.list-simple li{float: left; margin: 0 10px 10px 0;} - -.empty-block{width: 100%; height: 360px; background-color: #eee; margin-bottom: 24px;} -.search-form-big{ text-align: center; line-height: 360px;} -.search-form-big input[type=text]{background: url(../img/icon-search-big.png) right 10px center no-repeat #FFF;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 24px; border: 1px solid #D0D0D0; height: 52px; line-height: 52px; padding: 0 50px 0 10px;} -.search-form-big select{height: 24px; vertical-align: middle;} - -.item-masonry{margin-bottom: 20px;} .filters{padding: 10px 0; text-align: center;} .filters li{background-color: #FFFFFF;display: inline-block;font-family: 'Lato';font-size: 12px;height: 20px;line-height: 20px;margin-bottom: 2px;position: relative;text-align: left;width: 200px;} - .filters a.display-keyword:first-child{ overflow: hidden; color: #7F7F7F; padding-left: 6px; display: block; } .filters a.display-keyword{padding-left: 6px;} .filters li:hover{-webkit-box-shadow : none; -moz-box-shadow : none; box-shadow : none;} - .filters .icon-action{position: absolute; top: 5px; right: 6px;width: 10px; height: 10px; display: inline-block;} - .filters li.disabled .icon-action{width: 10px; height: 10px; -webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px; background-color: #7F7F7F;} .filters li.disabled a{opacity: 0.5;} - - .filters li .icon-action{background: url(../img/icon-cross-10.png) 0 0 no-repeat;} - -.float-left{float: left;} +.disabled .curtain{display: block;} .filters-wrap{width: 225px; background-color: #EEE; margin-right: 17px;} -.list-projets-5{width: 708px;} +.list-style-5{width: 708px;} .curtain{display:none;z-index:10;position: absolute; width: 100%; height: 100%; background-color:rgba(0,0,0,.7);} -.disabled .curtain{display: block;} -.list-projets-5 .item-masonry{margin-bottom: 0;} +.list-style-5 .item-masonry{margin-bottom: 0;} .mosaic .content-project{display: none;} .mosaic .visuel-project .title-project{display: block;} .mosaic-comment .content-project{display: block;} @@ -264,11 +233,32 @@ .title-project h4{ font-weight: 300;font-style: italic; font-size: 18px;} .visuel-project{position: relative; } .visuel-project img{display: inherit;} -.list-projets-5>li{width: 177px; float: left; position: relative;} +.list-style-5>li{width: 177px; float: left; position: relative;} .content-project{background-color: #eee;} .content-project p{font-family: 'Lato'; font-size: 13px; font-weight: 300; line-height: 15px; padding: 10px;} -body{overflow: auto !important;} +/* Creation */ +.edition th{color: #777; min-width: 140px; } +.edition td{width:100%;color: #000; line-height: 16px;} +.edition table{width: 100%; border-collapse:separate;border-spacing:0 5px;} +.box-edition{padding: 16px 0; border-bottom: 1px solid #CCC;} +.box-edition h3{color: #777;font-family: 'Lato'; font-size: 14px; margin-bottom: 6px;} +.null{font-weight: bold;font-style: italic; font-family: 'Lato'; color: #CCC; font-style: 18px; line-height: 50px; text-align: center;} +.box-edition:last-child{border-bottom: none;} +.edition input[type=text], .edition textarea{border: 1px solid #CACACA;} +.edition textarea{width:100%; max-width: 754px;} +.edition input[type=text]{width: 742px; height: 23px; line-height: 23px; padding: 0 6px;} +.no-before:before{content:"" ; display: block;} +.tagit{font-family: 'Lato' !important;} +.ui-corner-all{-webkit-border-radius : 0 !important;-moz-border-radius : 0 !important;border-radius : 0 !important;} +.list-simple li{float: left; margin: 0 10px 10px 0;} + +/* Search */ +.empty-block{width: 100%; height: 360px; background-color: #eee; margin-bottom: 24px;} +.search-form-big{ text-align: center; line-height: 360px;} +.search-form-big input[type=text]{background: url(../img/icon-search-big.png) right 10px center no-repeat #FFF;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 24px; border: 1px solid #D0D0D0; height: 52px; line-height: 52px; padding: 0 50px 0 10px;} +.search-form-big select{height: 24px; vertical-align: middle;} + #map{width: 100%; height: 360px; margin-bottom: 20px;} @@ -277,6 +267,10 @@ height: 110px; width: 110px; } +.square-fragment-113 { + height: 113px; + width: 111px; +} .square-fragment-177 { height: 177px; width: 177px; diff -r df9a887eae92 -r 1d22c4e915a9 src/egonomy/static/egonomy/img/slideshow-controls.png Binary file src/egonomy/static/egonomy/img/slideshow-controls.png has changed diff -r df9a887eae92 -r 1d22c4e915a9 src/egonomy/static/egonomy/js/slideshow.js --- a/src/egonomy/static/egonomy/js/slideshow.js Fri Jun 28 12:46:42 2013 +0200 +++ b/src/egonomy/static/egonomy/js/slideshow.js Fri Jun 28 15:31:47 2013 +0200 @@ -83,21 +83,21 @@ return false; } - var hideTO, isInArrow = false, jqArrows = $(".arrow-wrap"); + var hideTO, isInArrow = false, jqControls = $(".arrow-wrap,.top-controls"); function resetTO() { clearTimeout(hideTO); if (!isInArrow) { hideTO = setTimeout(function() { - jqArrows.hide(); + jqControls.hide(); }, 1000); } } $("body").mousemove(function() { - jqArrows.show(); + jqControls.show(); resetTO(); return false; }); - jqArrows.hover(function() { + jqControls.hover(function() { isInArrow = true; resetTO(); }, function() { @@ -108,6 +108,39 @@ $(".left-arrow").click(prevSlide); $(".right-arrow").click(nextSlide); + function fullScreen() { + var isFull = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen || false; + if (isFull) { + (document.cancelFullScreen || document.mozCancelFullScreen || document.webkitCancelFullScreen || function(){}).call(document); + } else { + (document.body.requestFullScreen || document.body.mozRequestFullScreen || document.body.webkitRequestFullScreen || function(){}).call(document.body); + } + showSlide(); + return false; + } + + $(".full-screen").click(fullScreen); + + if ( typeof document.fullScreen === "undefined" + && typeof document.mozFullScreen === "undefined" + && typeof document.webkitIsFullScreen === "undefined") { + $(".full-screen").remove(); + } + + var playInterval, playing = false; + + $(".play-pause").click(function() { + clearInterval(playInterval); + playing = !playing; + if (playing) { + $(this).addClass("pause"); + playInterval = setInterval(nextSlide,4000); + } else { + $(this).removeClass("pause"); + } + return false; + }); + slides.forEach(function(slide, k) { if (!slide.path) { slide.path = "M0 0L1 0L1 1L0 1Z" diff -r df9a887eae92 -r 1d22c4e915a9 src/egonomy/templates/egonomy_all_collections.html --- a/src/egonomy/templates/egonomy_all_collections.html Fri Jun 28 12:46:42 2013 +0200 +++ b/src/egonomy/templates/egonomy_all_collections.html Fri Jun 28 15:31:47 2013 +0200 @@ -51,7 +51,7 @@ {% if nb_pages > 1 %}{% build_pagination nb_pages cur_page_nb url_pagination "clickable" %}{% endif %} -