Changes for page Collaborate on reproducible science, anywhere
Summary
-
Page properties (3 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 1 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. hbpadmin1 +XWiki.bougault - Default language
-
... ... @@ -1,1 +1,0 @@ 1 -en - Content
-
... ... @@ -10,56 +10,237 @@ 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 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> 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> 16 16 </div> 17 17 </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> 18 18 </div> 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> 55 +<div class="container-fluid search__row"> 56 + <div class="container"> 57 + <div class="col-md-6 col-md-offset-3"> 58 + <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 59 + <div> 60 + <input type="text" class="form-control" name="text"> 61 + <i class="glyphicon glyphicon-search"></i> 62 + </div> 63 + <button class="btn clb-btn-default" type="submit">Search</button> 64 + </form> 35 35 </div> 36 -{{/html}} 37 37 38 -(% class="container highlighted"%)((( 67 + </div> 68 +</div> 39 39 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> 70 +<div class="container get-started"> 71 + <h4 class="get-started__title">GET STARTED</h4> 72 + <div class="row get-started__row"> 73 + <div class="col-xs-12 col-md-6"> 74 + <img 75 + class="img-responsive" 76 + src="https://via.placeholder.com/600x300" 77 + /> 78 + </div> 79 + <div class="col-xs-12 col-md-6"> 80 + <a href="#"> 81 + <h2 class="get-started__row__title">Create a collab</h2> 82 + <p class="get-started__row__text"> 83 + Discover how to create Collabs, a space which enables you to 84 + collaborate. 85 + </p> 86 + </a> 87 + </div> 88 + </div> 89 + <div class="row get-started__row"> 90 + <div class="col-md-6"> 91 + <img 92 + class="img-responsive" 93 + src="https://via.placeholder.com/600x300" 94 + /> 95 + </div> 96 + <div class="col-md-6"> 97 + <a href="#"> 98 + <h2 class="get-started__row__title">Team</h2> 99 + <p class="get-started__row__text"> 100 + Add members to your team in the collab. 101 + </p> 102 + </a> 103 + </div> 104 + </div> 105 + <div class="row get-started__row"> 106 + <div class="col-md-6"> 107 + <img 108 + class="img-responsive" 109 + src="https://via.placeholder.com/600x300" 110 + /> 111 + </div> 112 + <div class="col-md-6"> 113 + <a href="#"> 114 + <h2 class="get-started__row__title">Jupyter Notebook</h2> 115 + <p class="get-started__row__text"> 116 + Run your Jupyter notebook. Share it with colleagues. 117 + </p> 118 + </a> 119 + </div> 120 + </div> 45 45 </div> 46 -{{/html}} 47 -(% class="row highlighted_row" %) 48 -((( 122 +<div class="container"> 123 + <div class="row pre-footer"> 124 + <div class="col-md-12"> 125 + The Collaboratory is part of EBRAINS.<br /> 126 + Discover the other 127 + <a href="https://ebrains.eu" rel="noopener" target="_blank">EBRAINS services</a>. 128 + </div> 129 + </div> 130 +</div> 131 +<!--div class="container clb-content"> 49 49 50 -{{HighlightedCollabs featured="true" slider="true" /}} 133 +<div class="teasing"> 134 + <div class="row"> 135 + <div class="col-md-3"> 136 + <div class="card collaborate"> 137 + <div class="card-header"></div> 138 + <div class="card-content"> 139 + <h3 class="card-title">Collaborate</h3> 140 + <p> 141 + create projects and documents, invite collaborators, co-produce articles and release your team work for the community 142 + </p> 143 + </div> 144 + </div> 145 + </div> 146 + <div class="col-md-3"> 147 + <div class="card reproductible"> 148 + <div class="card-header"></div> 149 + <div class="card-content"> 150 + <h3 class="card-title">Reproducible</h3> 151 + <p> 152 + initiate environments, install libraries, find and access datasets to create the stable fertile ground for your experiments 153 + </p> 154 + </div> 155 + </div> 156 + </div> 157 + <div class="col-md-3"> 158 + <div class="card science"> 159 + <div class="card-header"></div> 160 + <div class="card-content"> 161 + <h3 class="card-title">Science</h3> 162 + <p> 163 + develop code, visualise results, generate data and collaborate on your research 164 + </p> 165 + </div> 166 + </div> 167 + </div> 168 + <div class="col-md-3"> 169 + <div class="card anywhere"> 170 + <div class="card-header"></div> 171 + <div class="card-content"> 172 + <h3 class="card-title">Anywhere</h3> 173 + <p> 174 + upload or generate your data and access it anywhere anytime, from your local machine to the most powerful high performance computers 175 + </p> 176 + </div> 177 + </div> 178 + </div> 179 + </div> 180 +</div> 181 + <div class="row"> 182 +<div class="col-md-12"> 51 51 52 -))) 53 -))) 184 +<p class="alert-info"> 185 +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> 186 + </div> 187 + </div> 54 54 55 -(% class="container" %) 56 -((( 57 -(% class="row explore-all" %) 58 -((( 59 - (% class="col-md-12" %) 60 -((( 61 -Explore all the [[Collabs]] 62 -))) 63 -))) 64 -))) 189 + <div class="row"> 190 + <div class="col-md-6 col-md-offset-3"> 191 + <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 192 + <div> 193 + <input type="text" class="form-control" name="text"> 194 + <i class="glyphicon glyphicon-search"></i> 195 + </div> 196 + <button class="btn clb-btn-default" type="submit">Search</button> 197 + </form> 198 + </div> 199 + </div> 200 +</div> 201 +<div class="container-fluid clb-actions"> 202 + <div class="container"> 203 + <div class="row"> 65 65 205 + <div class="col-md-4"> 206 + <div class="row"> 207 + <div class="col-md-10 text-center clb-box-container"> 208 + <a class="clb-box" href="/bin/view/Collabs/"> 209 + <h3 class="clb-box-title">Browse Collabs</h3> 210 + <p> 211 + Find a collab, or create yours. 212 + </p> 213 + </a> 214 + </div> 215 + </div> 216 + </div> 217 + 218 + <div class="col-md-4"> 219 + <div class="row"> 220 + <div class="col-md-10 col-md-offset-1 text-center clb-box-container"> 221 + <a class="clb-box" target="_blank" href="https://ebrains.eu/support/"> 222 + <h3 class="clb-box-title">Support</h3> 223 + <p> 224 + Open and track support tickets on our support site. 225 + </p> 226 + </a> 227 + </div> 228 + </div> 229 + </div> 230 + 231 + <div class="col-md-4"> 232 + <div class="row"> 233 + <div class="col-md-10 col-md-offset-2 text-center clb-box-container"> 234 + <a class="clb-box" href="/bin/view/Feedback/"> 235 + <h3 class="clb-box-title">Feedback</h3> 236 + <p> 237 + Please, give us a feedback about the new collaboratory. 238 + </p> 239 + </a> 240 + </div> 241 + </div> 242 + </div> 243 + </div> 244 + </div> 245 +</div --> 246 +{{/html}}
- XWiki.DocumentSheetBinding[0]
-
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,27 +1,220 @@ 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 +*/ 1 1 #mainContentArea{ 2 2 padding:0; 3 3 padding-top:1.25rem 4 4 } 5 - .document-header,11 +/* 6 6 #mainContentArea #hierarchy, 7 7 #mainContentArea .xcontent>hr, 8 8 #mainContentArea .xdocLastModification{ 9 9 display:none 10 10 } 11 - 17 +*/ 12 12 #mainContentArea .xcontent>.row{ 13 13 margin-left:0; 14 14 margin-right:0 15 15 } 16 16 23 +.document-header { 24 +display: none; 25 +} 17 17 #xwikicontent{ 18 18 padding-left:0; 19 19 padding-right:0; 20 20 min-height:300px; 21 - .search__row input[type="search"] { 22 - font-size: 16px; 30 +/* 31 + p.alert-info{ 32 + padding:2rem 23 23 } 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 + */ 24 24 } 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 + 25 25 #xwikicontent .get-started__row__title { 26 26 margin: 1rem 0; 27 27 font-weight: 400; ... ... @@ -28,39 +28,26 @@ 28 28 color: var(@color-brand-primary); 29 29 } 30 30 31 -.hero-text h3 { 32 - line-height:1.3em; 33 -} 34 - 35 35 .search__row { 36 - padding: 2rem;37 - margin: 2rem 0;225 + padding:1rem; 226 + margin: 2rem; 38 38 background: @color-xwiki-gray; 39 39 } 40 40 .get-started__row__text { 41 41 color: #4a5568; 42 42 } 43 -.get-started__title ,.highlighted__title{232 +.get-started__title { 44 44 text-align: center; 45 45 color: #aaa; 46 - padding: 2rem00.5rem 0;235 + padding: 10rem 0; 47 47 font-size: 2rem; 237 + border-top: 1px solid #ccc; 238 + margin-top: 10rem; 48 48 } 49 49 .get-started__row { 50 50 margin-top: 3rem; 51 51 } 52 52 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 - 64 64 @media screen and (min-width: 992px) { 65 65 .get-started__row { 66 66 display: flex; ... ... @@ -71,47 +71,51 @@ 71 71 margin-bottom: 1rem; 72 72 } 73 73 } 254 +.pre-footer { 255 + margin: 10rem 0; 256 + padding: 10rem 0; 257 + text-align: center; 258 + border-top: 1px solid #ccc; 259 + border-bottom: 1px solid #ccc; 260 +} 74 74 75 -. glider-contain{76 - min-height:502px;262 +.tags__title { 263 + text-align: center; 77 77 } 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 - } 265 + 266 +.tags__title--collaborate, 267 +.tags__title--science, 268 +.tags__title--reproducible, 269 +.tags__title--anywhere { 270 + padding-top: 8rem; 271 + position: relative; 91 91 } 92 -.highlighted-image{ 93 - /*height: 250px;*/ 94 - background-size: cover; 273 + 274 +.tags__title--collaborate::before, 275 +.tags__title--science::before, 276 +.tags__title--reproducible::before, 277 +.tags__title--anywhere::before { 278 + position: absolute; 279 + width: 50px; 280 + height: 50px; 281 + background-repeat: none; 282 + top: 0; 283 + margin-left: 50%; 284 + left: -25px; 285 + content: " "; 286 + display: table; 95 95 } 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 - } 110 -} 111 111 112 -.pre-footer { 113 - margin: 8rem 0 2rem; 114 - padding: 5rem 0; 115 - border-top: 1px solid #ccc; 116 - /*border-bottom: 1px solid #ccc;*/ 289 +.tags__title--collaborate::before { 290 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Collaborate.svg"); 117 117 } 292 +.tags__title--science::before { 293 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Science.svg"); 294 +} 295 +.tags__title--reproducible::before { 296 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Reproducible.svg"); 297 +} 298 +.tags__title--anywhere::before { 299 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Anywhere.svg"); 300 +} 301 +