Changeset 5645
- Timestamp:
- 09/17/14 08:30:57 (10 years ago)
- Location:
- VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0
- Property svn:mergeinfo changed
/VirtualCollectionRegistry/trunk/VirtualCollectionRegistry merged: 5639-5644
- Property svn:mergeinfo changed
-
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html
r5621 r5645 28 28 <a title="IDS" href="https://www.ids-mannheim.de/"><img src="images/ids-logo.png" alt="IDS logo"/></a> 29 29 </p> 30 <p> 31 Persistent identifiers for the VCR are issued by 32 <a href="http://www.gwdg.de/">GWDG</a> using the 33 <a href="http://www.pidconsortium.eu/">EPIC API version 2</a>. 34 </p> 30 35 <h2>Licenses</h2> 31 36 <p> -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AuthenticationStatePanel.html
r5577 r5645 19 19 <wicket:fragment wicket:id="logoutFragment"> 20 20 <li class="authenticated"> 21 <span class="glyphicon glyphicon-user"></span> 21 22 <span wicket:id="username">username</span> 22 23 <!--<a wicket:id="logoutLink" id="logout" class="glyphicon glyphicon-log-out" href="#"><span>LOGOUT</span></a>--> -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html
r5621 r5645 7 7 <title>CLARIN Virtual Collection Registry</title> 8 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 9 9 <meta name="viewport" content="width=device-width, initial-scale=1.0" /> 10 10 <!-- Bootstrap styles required for CLARIN style to work properly --> 11 11 <link rel="stylesheet" type="text/css" href="//infra.clarin.eu/content/libs/bootstrap-3.2.0-dist/css/bootstrap.min.css" /> … … 60 60 <div class="container"> 61 61 <div id="CLARIN_footer_left"> 62 <a title="about" wicket:id="aboutlink"><span>VERSION ${pom.version} </span><span class="glyphicon glyphicon-info-sign"></span></a> 62 <a title="about" wicket:id="aboutlink"> 63 <span class="glyphicon glyphicon-info-sign"></span> 64 <span>VERSION ${pom.version} </span> 65 </a> 63 66 </div> 64 67 <div id="CLARIN_footer_middle"> … … 66 69 </div> 67 70 <div id="CLARIN_footer_right"> 68 <a title="contact" class="glyphicon glyphicon-envelope" href="mailto:vcr@clarin.eu"><span> CONTACT</span></a> 71 <a title="contact" href="mailto:vcr@clarin.eu"> 72 <span class="glyphicon glyphicon-envelope"></span> 73 <span> CONTACT</span> 74 </a> 69 75 </div> 70 76 </div> -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard$GeneralStep.html
r5596 r5645 30 30 </label> 31 31 <input wicket:id="name" 32 id="gen_vc_name" type="text" size="64"maxlength="255"/>32 id="gen_vc_name" type="text" maxlength="255"/> 33 33 </div> 34 34 <div class="required"> … … 50 50 </label> 51 51 <textarea wicket:id="description" 52 id="gen_vc_desc" cols="80"rows="8"></textarea>52 id="gen_vc_desc" rows="8"></textarea> 53 53 </div> 54 54 <div class="optional"> -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/CLARIN.scss
- Property svn:mergeinfo changed
/VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/CLARIN.scss (added) merged: 5643-5644
r5596 r5645 17 17 $text_deemphasized: #666; 18 18 //$hyperlink_color: #03683f; 19 20 $hyperlink_text_color: $clarin_blue; 21 $hyperlink_text_emphasized_color: $red; 22 $hyperlink_text_deemphasized_color: $text_deemphasized; 23 24 $hyperlink_text_periphery_color: #6b5741; 25 $hyperlink_text_emphasized_periphery_color: $red; 26 $hyperlink_text_deemphasized_periphery_color: #8c765a; 27 19 28 $text_emphasized_periphery: #806a52; 20 29 $text_deemphasized_periphery: #c0a37c; 21 $hyperlink: $text_emphasized_periphery; 22 $hyperlink_visited: $text_deemphasized_periphery; 30 $hyperlink: $hyperlink_text_color; 31 $hyperlink_visited: $hyperlink_text_deemphasized_color; 32 23 33 $background_color: #f9f9f9; 24 34 … … 52 62 } 53 63 64 54 65 a { 55 color: $hyperlink; 56 text-decoration: dotted !important; 57 58 &:hover, &:focus { 59 // color: inherit; 66 //color: $text_emphasized_periphery; 60 67 text-decoration: none !important; 61 } 62 63 &:visited { 64 color: $hyperlink_visited; 65 } 68 //, font-weight 1s linear; 69 //font-weight: 700; 70 71 &:link { 72 color: $hyperlink_text_color; 73 } 74 75 &:hover, 76 &:focus { 77 color: $hyperlink_text_emphasized_color; 78 //transform: scale(2, 2) !important; 79 //transform: scale(1.1, 1.1) !important; 80 } 81 82 &:active { 83 color: $hyperlink_text_emphasized_color; 84 } 85 86 &:visited { 87 color: $hyperlink_text_deemphasized_color; 88 } 66 89 } 67 90 … … 307 330 tr th a { 308 331 color: #fff !important; 309 text-decoration: underline !important;310 332 } 311 333 … … 426 448 align-content: space-around; 427 449 450 div#CLARIN_footer_left, div#CLARIN_footer_right { 451 a span.glyphicon { 452 margin-right: .2em; 453 } 454 } 455 428 456 div#CLARIN_footer_left { 429 order: 1;457 order: 1; 430 458 //float: left; 431 459 //display: inline-block; 432 display: flex !important; 433 text-align: left; 434 vertical-align: middle; 435 margin: auto; 436 align-content: space-around; 460 display: flex !important; 461 text-align: left; 462 vertical-align: middle; 463 margin: auto; 464 width: 33%; 465 align-content: space-around; 466 padding-left: 1em; 437 467 //width: 25%; 438 468 //max-height: 100%; … … 440 470 441 471 div#CLARIN_footer_middle { 442 order: 2;472 order: 2; 443 473 //float: left; 444 474 //display: inline-block; 445 display: flex !important; 446 text-align: center; 447 margin: auto; 448 align-content: space-around; 475 display: flex !important; 476 text-align: center; 477 margin: auto; 478 width: 33%; 479 align-content: space-around; 449 480 //width: 50%; 450 481 //max-height: 100%; 451 482 452 img { 453 display: inline-block; 454 max-width: 100%; 455 max-height: 100%; 456 overflow: hidden; 483 a { 484 display: block; 485 width: 100%; 486 487 img { 488 margin: 0 auto; 489 display: block; 490 max-width: 100%; 491 max-height: 100%; 492 overflow: hidden; 493 } 457 494 } 458 495 } 459 496 460 497 div#CLARIN_footer_right { 461 order: 3;498 order: 3; 462 499 //float: left; 463 text-align: right; 464 vertical-align: middle; 465 display: flex !important; 466 margin: auto; 467 align-content: space-around; 500 text-align: right; 501 vertical-align: middle; 502 display: flex !important; 503 /* margin: auto; */ 504 width: 33%; 505 align-content: space-around; 506 padding-right: 1em; 468 507 //width: 25%; 469 508 //max-height: 100%; 509 510 a { 511 width: 100%; 512 } 470 513 } 471 514 } - Property svn:mergeinfo changed
-
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/_filterform.scss
r5572 r5645 20 20 margin: 0; 21 21 padding: 0; 22 23 fieldset { 24 padding: 0; 25 margin: 0; 26 border: none; 27 } 28 29 div.optional { 30 margin-bottom: 4px; 31 } 32 33 select { 34 width: 20%; 35 min-width: 8em; 36 } 37 38 input[type=text] { 39 width: 40%; 40 } 41 22 42 } 23 24 form.filterForm fieldset {25 padding: 0;26 margin: 0;27 border: none;28 }29 30 form.filterForm div.optional {31 margin-bottom: 4px;32 } -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/_table.scss
r5596 r5645 114 114 cursor: pointer; 115 115 116 117 118 116 &:hover { 119 color: #AE0000;117 color: $hyperlink_text_emphasized_color; 120 118 background-color: inherit; 121 119 } … … 177 175 background-image: url('../icons/glyphicons_136_cogwheel.png'); 178 176 } 177 178 a:visited { 179 color: $hyperlink; 180 } 181 182 a:hover, a:active { 183 color: $hyperlink_text_emphasized_color; 184 } 185 179 186 } //table.collectionsTable 180 187 -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/_wizard.scss
r5578 r5645 42 42 } 43 43 44 form.wizard div.wizardView { 45 46 label { 47 width: 15%; 48 min-width: 10em; 49 } 50 51 input[type=text], textarea { 52 width: 50%; 53 } 54 55 56 57 } 58 44 59 form.wizard { 45 60 margin: 5px 4px; 46 61 padding: 0; 47 62 font-size: 100%; 48 width: 978px; 49 min-width: 978px; 63 width: 100%; 50 64 } 51 65 … … 138 152 display: block; 139 153 float: left; 140 width: 140px; 154 width: 15%; 155 min-width: 7em; 141 156 padding: 3px 10px; 142 157 margin: 0 0 5px 0; 143 158 text-align: right; 144 159 font-weight: normal; 160 } 161 162 div input { 163 box-sizing:border-box; 164 -moz-box-sizing:border-box; 145 165 } 146 166 -
VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/vcr.scss
r5621 r5645 14 14 15 15 body { 16 font-size: 1 20%;16 font-size: 130%; 17 17 } 18 18
Note: See TracChangeset
for help on using the changeset viewer.