Changes for page Collaborate on reproducible science, anywhere
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 1 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -10,240 +10,56 @@ 10 10 <div class="col-md-7 col-md-push-5"> 11 11 <img class="img-responsive" src="/bin/skin/Collaboratory/UX/HbpSkin/wiki_home_graphic.svg" /> 12 12 </div> 13 - <div class="col-md-5 col-md-pull-7"> 14 - <h2>Collaborate to create reproducible science. Anywhere.</h2> 15 - <a class="btn btn-primary btn-lg">Get started</a> 16 - <a class="btn btn-primary btn-lg">Learn more</a> 13 + <div class="col-md-5 col-md-pull-7 hero-text"> 14 + <h3>Collaborate.<br/>Create reproducible science.<br/>Discover EBRAINS services at work.<br/>From anywhere.</h3> 15 + <a class="btn btn-primary btn-lg" href="/bin/view/Collabs/the-collaboratory/Getting%20Started/">Getting started</a> 17 17 </div> 18 18 </div> 19 - <div class="row tags"> 20 - <div class="col-md-3"> 21 - <h3 class="tags__title tags__title--collaborate"> 22 - Collaborate 23 - </h3> 24 - <p> 25 - Create projects and documents, invite collaborators, co-produce 26 - articles and release your team work for the community 27 - </p> 28 - </div> 29 - <div class="col-md-3"> 30 - <h3 class="tags__title tags__title--reproducible"> 31 - Reproducible 32 - </h3> 33 - <p> 34 - Initiate environments, install libraries, find and access datasets 35 - to create the stable fertile ground for your experiments 36 - </p> 37 - </div> 38 - <div class="col-md-3"> 39 - <h3 class="tags__title tags__title--science">Science</h3> 40 - <p> 41 - Develop code, visualise results, generate data and collaborate on 42 - your re-search 43 - </p> 44 - </div> 45 - <div class="col-md-3"> 46 - <h3 class="tags__title tags__title--anywhere">Anywhere</h3> 47 - <p> 48 - Upload or generate your data and access it any-where anytime, from 49 - your local machine to the most powerful high perfor-mance 50 - computers 51 - </p> 52 - </div> 53 - </div> 54 54 </div> 55 -<div class="container-fluid clb-actions"> 56 - 57 - <div class="container"> 58 - 59 - 60 - <div class="col-md-6 col-md-offset-3"> 61 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 62 - <div> 63 - <input type="text" class="form-control" name="text"> 64 - <i class="glyphicon glyphicon-search"></i> 65 - </div> 66 - <button class="btn clb-btn-default" type="submit">Search</button> 67 - </form> 19 + <div class="container-fluid search__row"> 20 + <div class="container"> 21 + <div class="col-sm-12 col-md-6 col-md-offset-3"> 22 + <form role="search" action="/bin/view/Main/Search" method="GET"> 23 + <div class="input-group"> 24 + <input type="search" name="text" class="form-control input-lg" title="Search word in all wiki pages" placeholder="Search word in all wiki pages"> 25 + <span class="input-group-btn"> 26 + <button type="submit" class="btn btn-primary input-lg"> 27 + <span class="fa fa-search"></span> 28 + <span class="sr-only">Search</span> 29 + </button> 30 + </span> 31 + </div> 32 + </form> 33 + </div> 34 + </div> 68 68 </div> 36 +{{/html}} 69 69 70 - </div> 71 -</div> 38 +(% class="container highlighted"%)((( 72 72 73 -<div class="container get-started"> 74 - <h4 class="get-started__title">GET STARTED</h4> 75 - <div class="row get-started__row"> 76 - <div class="col-xs-12 col-md-6"> 77 - <img 78 - class="img-responsive" 79 - src="https://via.placeholder.com/600x300" 80 - /> 81 - </div> 82 - <div class="col-xs-12 col-md-6"> 83 - <a href="#"> 84 - <h2 class="get-started__row__title">Create a collab</h2> 85 - <p class="get-started__row__text"> 86 - Discover how to create Collabs, a space which enables you to 87 - collaborate. 88 - </p> 89 - </a> 90 - </div> 91 - </div> 92 - <div class="row get-started__row"> 93 - <div class="col-md-6"> 94 - <img 95 - class="img-responsive" 96 - src="https://via.placeholder.com/600x300" 97 - /> 98 - </div> 99 - <div class="col-md-6"> 100 - <a href="#"> 101 - <h2 class="get-started__row__title">Team</h2> 102 - <p class="get-started__row__text"> 103 - Add members to your team in the collab. 104 - </p> 105 - </a> 106 - </div> 107 - </div> 108 - <div class="row get-started__row"> 109 - <div class="col-md-6"> 110 - <img 111 - class="img-responsive" 112 - src="https://via.placeholder.com/600x300" 113 - /> 114 - </div> 115 - <div class="col-md-6"> 116 - <a href="#"> 117 - <h2 class="get-started__row__title">Jupyter Notebook</h2> 118 - <p class="get-started__row__text"> 119 - Run your Jupyter notebook. Share it with colleagues. 120 - </p> 121 - </a> 122 - </div> 123 - </div> 40 +(% class="highlighted__title" %) 41 +==== Highlighted collabs ==== 42 +{{html clean="false"}} 43 +<div class="container centered"> 44 +<a href="/bin/view/Collabs/the-collaboratory/Highlights" class="highlighted_view_all">View all</a> 124 124 </div> 125 -<div class="container"> 126 - <div class="row pre-footer"> 127 - <div class="col-md-12"> 128 - The Collaboratory is part of EBRAINS.<br /> 129 - Discover the other 130 - <a href="https://ebrains.eu" rel="noopener" target="_blank">EBRAINS services</a>. 131 - </div> 132 - </div> 133 -</div> 134 -<!--div class="container clb-content"> 46 +{{/html}} 47 +(% class="row highlighted_row" %) 48 +((( 135 135 136 -<div class="teasing"> 137 - <div class="row"> 138 - <div class="col-md-3"> 139 - <div class="card collaborate"> 140 - <div class="card-header"></div> 141 - <div class="card-content"> 142 - <h3 class="card-title">Collaborate</h3> 143 - <p> 144 - create projects and documents, invite collaborators, co-produce articles and release your team work for the community 145 - </p> 146 - </div> 147 - </div> 148 - </div> 149 - <div class="col-md-3"> 150 - <div class="card reproductible"> 151 - <div class="card-header"></div> 152 - <div class="card-content"> 153 - <h3 class="card-title">Reproducible</h3> 154 - <p> 155 - initiate environments, install libraries, find and access datasets to create the stable fertile ground for your experiments 156 - </p> 157 - </div> 158 - </div> 159 - </div> 160 - <div class="col-md-3"> 161 - <div class="card science"> 162 - <div class="card-header"></div> 163 - <div class="card-content"> 164 - <h3 class="card-title">Science</h3> 165 - <p> 166 - develop code, visualise results, generate data and collaborate on your research 167 - </p> 168 - </div> 169 - </div> 170 - </div> 171 - <div class="col-md-3"> 172 - <div class="card anywhere"> 173 - <div class="card-header"></div> 174 - <div class="card-content"> 175 - <h3 class="card-title">Anywhere</h3> 176 - <p> 177 - upload or generate your data and access it anywhere anytime, from your local machine to the most powerful high performance computers 178 - </p> 179 - </div> 180 - </div> 181 - </div> 182 - </div> 183 -</div> 184 - <div class="row"> 185 -<div class="col-md-12"> 50 +{{HighlightedCollabs featured="true" slider="true" /}} 186 186 187 -<p class="alert-info"> 188 -This is the first release of the revamped Collaboratory. It does not yet have feature parity with the previous version. Until we reach that point and give users time to migrate, both versions will coexist.</p> 189 - </div> 190 - </div> 52 +))) 53 +))) 191 191 192 - <div class="row"> 193 - <div class="col-md-6 col-md-offset-3"> 194 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 195 - <div> 196 - <input type="text" class="form-control" name="text"> 197 - <i class="glyphicon glyphicon-search"></i> 198 - </div> 199 - <button class="btn clb-btn-default" type="submit">Search</button> 200 - </form> 201 - </div> 202 - </div> 203 -</div> 204 -<div class="container-fluid clb-actions"> 205 - <div class="container"> 206 - <div class="row"> 55 +(% class="container" %) 56 +((( 57 +(% class="row explore-all" %) 58 +((( 59 + (% class="col-md-12" %) 60 +((( 61 +Explore all the [[Collabs]] 62 +))) 63 +))) 64 +))) 207 207 208 - <div class="col-md-4"> 209 - <div class="row"> 210 - <div class="col-md-10 text-center clb-box-container"> 211 - <a class="clb-box" href="/bin/view/Collabs/"> 212 - <h3 class="clb-box-title">Browse Collabs</h3> 213 - <p> 214 - Find a collab, or create yours. 215 - </p> 216 - </a> 217 - </div> 218 - </div> 219 - </div> 220 - 221 - <div class="col-md-4"> 222 - <div class="row"> 223 - <div class="col-md-10 col-md-offset-1 text-center clb-box-container"> 224 - <a class="clb-box" target="_blank" href="https://ebrains.eu/support/"> 225 - <h3 class="clb-box-title">Support</h3> 226 - <p> 227 - Open and track support tickets on our support site. 228 - </p> 229 - </a> 230 - </div> 231 - </div> 232 - </div> 233 - 234 - <div class="col-md-4"> 235 - <div class="row"> 236 - <div class="col-md-10 col-md-offset-2 text-center clb-box-container"> 237 - <a class="clb-box" href="/bin/view/Feedback/"> 238 - <h3 class="clb-box-title">Feedback</h3> 239 - <p> 240 - Please, give us a feedback about the new collaboratory. 241 - </p> 242 - </a> 243 - </div> 244 - </div> 245 - </div> 246 - </div> 247 - </div> 248 -</div --> 249 -{{/html}}
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,220 +7,27 @@ 1 -/* 2 -.teasing .collaborate {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/collaborate.jpg');} 3 -.teasing .reproductible {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/reproducible.jpg');} 4 -.teasing .science {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/science.jpg');} 5 -.teasing .anywhere {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/anywhere.jpg');} 6 -*/ 7 7 #mainContentArea{ 8 8 padding:0; 9 9 padding-top:1.25rem 10 10 } 5 +.document-header, 11 11 #mainContentArea #hierarchy, 12 12 #mainContentArea .xcontent>hr, 13 13 #mainContentArea .xdocLastModification{ 14 14 display:none 15 15 } 11 + 16 16 #mainContentArea .xcontent>.row{ 17 17 margin-left:0; 18 18 margin-right:0 19 19 } 20 20 21 -.document-header .document-info{ 22 - width:100%; 23 - text-align:center; 24 - margin-top:3rem 25 -} 26 26 #xwikicontent{ 27 27 padding-left:0; 28 28 padding-right:0; 29 29 min-height:300px; 30 -/* 31 - p.alert-info{ 32 - padding:2rem 21 + .search__row input[type="search"] { 22 + font-size: 16px; 33 33 } 34 - .teasing{ 35 - margin-bottom:50px 36 - } 37 - .teasing .card{ 38 - text-align:center; 39 - position:relative; 40 - height:100%; 41 - background-size:cover; 42 - background-repeat:no-repeat; 43 - background-position:50% 50%; 44 - padding-bottom:20px; 45 - margin-bottom:20px 46 - } 47 - .teasing .card::before{ 48 - position:absolute; 49 - top:0; 50 - right:0; 51 - bottom:0; 52 - left:0; 53 - display:block; 54 - background-image:linear-gradient(to top,rgba(0,0,0,.9),transparent 85%); 55 - content:'' 56 - } 57 - .teasing .card-header{ 58 - position:relative; 59 - height:150px 60 - } 61 - .teasing .coming-soon{ 62 - position:absolute; 63 - z-index:10; 64 - left:0; 65 - right:0; 66 - padding:.5rem; 67 - border-radius:.25rem; 68 - font-weight:700; 69 - top:50% 70 - } 71 - .teasing .coming-soon span{ 72 - font-size:1.25rem; 73 - line-height:2; 74 - padding:.5rem; 75 - border-radius:.25rem; 76 - font-weight:700; 77 - margin-top:-17px; 78 - background:rgba(255,255,255,.8); 79 - } 80 - .teasing .card-content { 81 - position:relative; 82 - overflow:hidden; 83 - margin-top:0; 84 - padding-top:0; 85 - padding-bottom:0; 86 - padding-left:.5rem; 87 - padding-right:.5rem; 88 - color: @color-white; 89 - font-size:1rem; 90 - .card-title { 91 - color:@color-white; 92 - } 93 - } 94 - .teasing .card-title{ 95 - margin-top:1.5rem; 96 - margin-right:0; 97 - margin-bottom:1rem; 98 - margin-left:0; 99 - font-weight:700 100 - } 101 - .clb-actions { 102 - background-color:#f0f3f1; 103 - padding-top:5rem; 104 - padding-left:0; 105 - padding-right:0; 106 - padding-bottom:0 107 - } 108 - .clb-actions .clb-box{ 109 - margin-bottom:5rem; 110 - font-size:1.125rem; 111 - display: block 112 - } 113 - .clb-actions>.row{ 114 - margin-left:0; 115 - margin-right:0 116 - } 117 - .clb-actions .clb-box:hover{ 118 - text-decoration:none 119 - } 120 - .clb-content>.row{ 121 - margin-bottom:5rem 122 - } 123 -*/ 124 - .clb-search-bar{ 125 - display:flex; 126 - align-items:stretch; 127 - position:relative 128 - } 129 - .clb-search-bar>div{ 130 - flex:1; 131 - margin:2px 10px 2px 0 132 - } 133 - .clb-search-bar input[type=text]{ 134 - width:100%; 135 - padding:1.5rem; 136 - padding-left:2.5rem; 137 - border-radius: @border-radius-default; 138 - background-color: @color-white; 139 - box-shadow:none 140 - } 141 - .clb-search-bar input[type=text]:focus{ 142 - border-color: @color-brand-primary; 143 - background-color:@color-white; 144 - box-shadow:none 145 - } 146 - .clb-search-bar i{ 147 - position:absolute; 148 - margin-top:-.5rem; 149 - color: @color-gray-200; 150 - top:50%; 151 - left:1em 152 - } 153 - .clb-search-bar input[type=text]:focus~i{ 154 - color: @color-brand-primary; 155 - } 156 - /* 157 - @media screen and (min-width:992px){ 158 - .teasing .row{ 159 - display:flex 160 - } 161 - .teasing .row>[class*=col-]{ 162 - display:flex; 163 - flex-direction:column 164 - } 165 - .clb-actions{ 166 - padding-bottom:5rem 167 - } 168 - .clb-actions .clb-box{ 169 - margin-bottom:0 170 - } 171 - .clb-actions .container, 172 - .clb-actions .container>.row{ 173 - display:flex 174 - } 175 - .clb-actions .clb-box-container, 176 - .clb-actions .clb-box-container a, 177 - .clb-actions .container>.row>[class*=col-]>.row{ 178 - height:100%; 179 - display:block 180 - } 181 - } 182 - */ 183 183 } 184 - 185 -.clb-box{ 186 - background-color:#fff; 187 - box-shadow:0 1px 2px 0 rgba(0,0,0,.1); 188 - padding:2rem; 189 - padding-bottom:5rem; 190 - color: @color-brand-primary; 191 - display:block 192 - .clb-box-title { 193 - color:#45b07c; 194 - font-weight:600; 195 - margin-bottom:5rem; 196 - } 197 -} 198 - 199 -.clb-btn-default,button { 200 - background-image:none; 201 - box-shadow:none; 202 - border:0; 203 - border-radius: @border-radius-default; 204 - padding-top:.5rem; 205 - padding-bottom:.5rem; 206 - padding-left:1rem; 207 - padding-right:1rem; 208 - background-color:@color-brand-primary; 209 - color: @color-white; 210 - &:hover { 211 - background-color: darken(@color-brand-primary, 10%); 212 - } 213 - &:active { 214 - background-color: darken(@color-brand-primary, 15%); 215 - } 216 -} 217 - 218 218 #xwikicontent .get-started__row__title { 219 219 margin: 1rem 0; 220 220 font-weight: 400; ... ... @@ -221,21 +221,39 @@ 221 221 color: var(@color-brand-primary); 222 222 } 223 223 31 +.hero-text h3 { 32 + line-height:1.3em; 33 +} 34 + 35 +.search__row { 36 + padding:2rem; 37 + margin: 2rem 0; 38 + background: @color-xwiki-gray; 39 +} 224 224 .get-started__row__text { 225 225 color: #4a5568; 226 226 } 227 -.get-started__title { 43 +.get-started__title, .highlighted__title{ 228 228 text-align: center; 229 229 color: #aaa; 230 - padding: 10rem 0; 231 - font-size: 4rem; 232 - border-top: 1px solid #ccc; 233 - margin-top: 10rem; 46 + padding:2rem 0 0.5rem 0; 47 + font-size: 2rem; 234 234 } 235 235 .get-started__row { 236 236 margin-top: 3rem; 237 237 } 238 238 53 +.pre-footer, .explore-all { 54 + font-size: 32px; 55 + line-height: 42px; 56 + text-align: center; 57 +} 58 + 59 +.explore-all{ 60 + padding-top: 5rem; 61 + padding-bottom: 5rem; 62 +} 63 + 239 239 @media screen and (min-width: 992px) { 240 240 .get-started__row { 241 241 display: flex; ... ... @@ -246,51 +246,47 @@ 246 246 margin-bottom: 1rem; 247 247 } 248 248 } 249 -.pre-footer { 250 - margin: 10rem 0; 251 - padding: 10rem 0; 252 - text-align: center; 253 - border-top: 1px solid #ccc; 254 - border-bottom: 1px solid #ccc; 255 -} 256 256 257 -. tags__title {258 - text-align:center;75 +.glider-contain { 76 + min-height: 502px; 259 259 } 260 - 261 -.tags__title--collaborate, 262 -.tags__title--science, 263 -.tags__title--reproducible, 264 -.tags__title--anywhere { 265 - padding-top: 8rem; 266 - position: relative; 78 +.glider { 79 + .highlighted-collab { 80 + position:relative; 81 + border: 1px solid #CCC; 82 + margin: 0 1rem; 83 + height: 100%; 84 + border-radius: @border-radius-default; 85 + > p, 86 + > h3 { 87 + padding-left: 1rem; 88 + padding-right: 1rem; 89 + } 90 + } 267 267 } 268 - 269 -.tags__title--collaborate::before, 270 -.tags__title--science::before, 271 -.tags__title--reproducible::before, 272 -.tags__title--anywhere::before { 273 - position: absolute; 274 - width: 50px; 275 - height: 50px; 276 - background-repeat: none; 277 - top: 0; 278 - margin-left: 50%; 279 - left: -25px; 280 - content: " "; 281 - display: table; 92 +.highlighted-image{ 93 + /*height: 250px;*/ 94 + background-size: cover; 282 282 } 283 - 284 -.tags__title--collaborate::before { 285 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Collaborate.svg"); 96 +.stretched-link { 97 + &::after { 98 + position: absolute; 99 + top: 0; 100 + right: 0; 101 + bottom: 0; 102 + left: 0; 103 + z-index: 1; 104 + // Just in case `pointer-events: none` is set on a parent 105 + pointer-events: auto; 106 + content: ""; 107 + // IE10 bugfix, see https://stackoverflow.com/questions/16947967/ie10-hover-pseudo-class-doesnt-work-without-background-color 108 + background-color: rgba(0, 0, 0, 0); 109 + } 286 286 } 287 -.tags__title--science::before { 288 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Science.svg"); 289 -} 290 -.tags__title--reproducible::before { 291 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Reproducible.svg"); 292 -} 293 -.tags__title--anywhere::before { 294 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Anywhere.svg"); 295 -} 296 296 112 +.pre-footer { 113 + margin: 8rem 0 2rem; 114 + padding: 5rem 0; 115 + border-top: 1px solid #ccc; 116 + /*border-bottom: 1px solid #ccc;*/ 117 +}
- XWiki.DocumentSheetBinding[0]
-