Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations
This commit is contained in:
		
						commit
						295aa5799e
					
				
					 6 changed files with 96 additions and 73 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 15 KiB | 
							
								
								
									
										35
									
								
								galerie/static/galerie/prvky/dalsi.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								galerie/static/galerie/prvky/dalsi.svg
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,35 @@ | |||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||||
| <svg | ||||
|    xmlns:dc="http://purl.org/dc/elements/1.1/" | ||||
|    xmlns:cc="http://creativecommons.org/ns#" | ||||
|    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||||
|    xmlns:svg="http://www.w3.org/2000/svg" | ||||
|    xmlns="http://www.w3.org/2000/svg" | ||||
|    width="25.135418mm" | ||||
|    height="42.333332mm" | ||||
|    viewBox="0 0 25.135418 42.333331" | ||||
|    version="1.1" | ||||
|    id="svg851"> | ||||
|   <defs | ||||
|      id="defs845" /> | ||||
|   <metadata | ||||
|      id="metadata848"> | ||||
|     <rdf:RDF> | ||||
|       <cc:Work | ||||
|          rdf:about=""> | ||||
|         <dc:format>image/svg+xml</dc:format> | ||||
|         <dc:type | ||||
|            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||||
|         <dc:title></dc:title> | ||||
|       </cc:Work> | ||||
|     </rdf:RDF> | ||||
|   </metadata> | ||||
|   <g | ||||
|      id="layer1" | ||||
|      transform="matrix(-1.0282842,0,0,1,111.4545,-88.415317)"> | ||||
|     <path | ||||
|        d="m 108.38881,88.415317 -6.43264,21.166663 6.43264,21.16667 -18.011397,-21.16667 z" | ||||
|        style="fill:#e84e10;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.23177969" | ||||
|        id="path44-3" /> | ||||
|   </g> | ||||
| </svg> | ||||
| After Width: | Height: | Size: 1 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 18 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 15 KiB | 
							
								
								
									
										35
									
								
								galerie/static/galerie/prvky/predchozi.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								galerie/static/galerie/prvky/predchozi.svg
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,35 @@ | |||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||||
| <svg | ||||
|    xmlns:dc="http://purl.org/dc/elements/1.1/" | ||||
|    xmlns:cc="http://creativecommons.org/ns#" | ||||
|    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||||
|    xmlns:svg="http://www.w3.org/2000/svg" | ||||
|    xmlns="http://www.w3.org/2000/svg" | ||||
|    width="25.135418mm" | ||||
|    height="42.333332mm" | ||||
|    viewBox="0 0 25.135418 42.333331" | ||||
|    version="1.1" | ||||
|    id="svg851"> | ||||
|   <defs | ||||
|      id="defs845" /> | ||||
|   <metadata | ||||
|      id="metadata848"> | ||||
|     <rdf:RDF> | ||||
|       <cc:Work | ||||
|          rdf:about=""> | ||||
|         <dc:format>image/svg+xml</dc:format> | ||||
|         <dc:type | ||||
|            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||||
|         <dc:title></dc:title> | ||||
|       </cc:Work> | ||||
|     </rdf:RDF> | ||||
|   </metadata> | ||||
|   <g | ||||
|      id="layer1" | ||||
|      transform="matrix(-1.0282842,0,0,1,111.4545,-88.415317)"> | ||||
|     <path | ||||
|        d="m 83.944774,88.415319 6.43264,21.166661 -6.43264,21.16667 18.011396,-21.16667 z" | ||||
|        style="fill:#e84e10;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.23177969" | ||||
|        id="path44-3" /> | ||||
|   </g> | ||||
| </svg> | ||||
| After Width: | Height: | Size: 1 KiB | 
|  | @ -712,19 +712,6 @@ div.cislo_odkazy ul { | |||
| 		padding: 0px; | ||||
| } | ||||
| 
 | ||||
| /* archiv ročník | ||||
| div.cisla-v-rocniku { | ||||
| 		font-weight: bold; | ||||
| 		color:  #6f2509; | ||||
| } | ||||
| 
 | ||||
| div.cislo-v-rocniku-blok { | ||||
| 	display: inline-block; | ||||
| 	width: 150px; | ||||
| 	height: 220px; | ||||
| 		text-align: center; | ||||
| }*/ | ||||
| 
 | ||||
| 
 | ||||
| /* galerie */ | ||||
| 
 | ||||
|  | @ -745,7 +732,8 @@ div.cislo-v-rocniku-blok { | |||
|   top: 0; | ||||
| } | ||||
| .predchozi_obrazek:hover{ | ||||
|   background-image: url("/static/galerie/prvky/predchozi.png"); | ||||
|   background-image: url("/static/galerie/prvky/predchozi.svg"); | ||||
| 	filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); | ||||
|   background-position: left center; | ||||
|   background-repeat: no-repeat; | ||||
| } | ||||
|  | @ -758,7 +746,8 @@ div.cislo-v-rocniku-blok { | |||
|   top: 0; | ||||
| } | ||||
| .dalsi_obrazek:hover{ | ||||
|   background-image: url("/static/galerie/prvky/dalsi.png"); | ||||
|   background-image: url("/static/galerie/prvky/dalsi.svg"); | ||||
| 	filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); | ||||
|   background-position: right center; | ||||
|   background-repeat: no-repeat; | ||||
| } | ||||
|  | @ -788,31 +777,25 @@ div.cislo-v-rocniku-blok { | |||
| 
 | ||||
| /* titulní obrázek hlavní galerie soustředění */ | ||||
| .titulni_obrazek { | ||||
|     border: 1px solid black; | ||||
| } | ||||
| 
 | ||||
| .galerie_nahledy{ | ||||
|   /*margin: 1em 0;*/ | ||||
|   margin: 0 auto 30px auto; | ||||
|   margin: auto; | ||||
| 	padding: 10px; | ||||
|   text-align: center; | ||||
|   overflow: auto; | ||||
| } | ||||
| 
 | ||||
| .galerie_nahledy div.navigace { | ||||
|     display: inline-block; | ||||
|     width: 150px; | ||||
| .galerie_nahledy img { | ||||
|   margin: 10px; | ||||
| } | ||||
| 
 | ||||
| /*.galerie_nahledy img{*/ | ||||
| /*margin: 0 10px 0 10px;*/ | ||||
| /*}*/ | ||||
| .galerie_nahledy div.navigace { | ||||
|     display: inline-block; | ||||
| } | ||||
| 
 | ||||
| /*.galerie_nahledy a{*/ | ||||
| /*height: 100%;*/ | ||||
| /*width: 100%;*/ | ||||
| /*}*/ | ||||
| 
 | ||||
| .galerie_nahled { /* frame */ | ||||
| .galerie_nahled, .podgalerie_nahled { /* frame */ | ||||
|   display: block; | ||||
|   position: relative; | ||||
|   float: left; | ||||
|  | @ -820,19 +803,19 @@ div.cislo-v-rocniku-blok { | |||
|   height: 200px; | ||||
|   text-align: center; | ||||
|   border: solid; | ||||
|   border-width: 2px; | ||||
|   border-radius: 5px; | ||||
|   /*border-color: #ffa500;*/ | ||||
|   border-color: #ffd546; | ||||
|   /*background-color: #ffb52d;*/ | ||||
|   background-color: white; | ||||
|   border-width: 1px; | ||||
|   border-radius: 4px; | ||||
|   border-color: #f9d59e; | ||||
|   background-color: #fffbf6; | ||||
|   white-space: nowrap; | ||||
|   margin: 10px 20px 10px 0px; | ||||
|   margin: 10px; | ||||
| 	font-weight: bold; | ||||
| } | ||||
| 
 | ||||
| .galerie_nahled:hover { | ||||
|     background-color: #ffd546; | ||||
|     border-color: #ffa500; | ||||
| .galerie_nahled:hover, .podgalerie_nahled:hover { | ||||
|    background-color: #f9d59e; | ||||
| 	 filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); | ||||
| 	 color: #6f2509; | ||||
| } | ||||
| 
 | ||||
| .vystredeno{ /* helper */ | ||||
|  | @ -845,12 +828,6 @@ div.cislo-v-rocniku-blok { | |||
|   vertical-align: middle; | ||||
|   max-height: 180px; | ||||
|   max-width: 180px; | ||||
|   /*border: 1px solid white;*/ | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| .galerie_nahled img, .podgalerie_nahled img { | ||||
|     border-radius: 2px; | ||||
| } | ||||
| 
 | ||||
| .galerie_nahled div { | ||||
|  | @ -860,30 +837,6 @@ div.cislo-v-rocniku-blok { | |||
|     text-align: center; | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| .podgalerie_nahled { | ||||
|   display: block; | ||||
|   position: relative; | ||||
|   float: left; | ||||
|   width: 200px; | ||||
|   height: 200px; | ||||
|   text-align: center; | ||||
|   border: solid; | ||||
|   border-width: 2px; | ||||
|   border-radius: 5px; | ||||
|   border-color: #ffa500; | ||||
|   /*border-color: #ffd546;*/ | ||||
|   background-color: #ffd546; | ||||
|   /*background-color: white;*/ | ||||
|   white-space: nowrap; | ||||
|   margin: 10px 20px 10px 0px; | ||||
|   font-weight: bold; | ||||
| } | ||||
| 
 | ||||
| .podgalerie_nahled:hover { | ||||
|     background-color: #ffa500; | ||||
| } | ||||
| 
 | ||||
| .podgalerie_nahled img { | ||||
|     margin-top: 20px; | ||||
|     margin-bottom: 15px; | ||||
|  | @ -899,10 +852,10 @@ div.cislo-v-rocniku-blok { | |||
| 
 | ||||
| /* plus a minus tlacitka */ | ||||
| .mam-org-only-galerie { | ||||
|   background: #fff0d7; | ||||
|   background: #eee4ec; | ||||
|   padding: 10px; | ||||
|   margin: 10px 10px 10px -20px; | ||||
|   border: orange 2px dashed; | ||||
|   border: #333 2px dashed; | ||||
|   float: left; | ||||
| } | ||||
| 
 | ||||
|  | @ -910,8 +863,8 @@ div.cislo-v-rocniku-blok { | |||
|   padding: 3px 5px; | ||||
|   margin: 5px; | ||||
|   border-radius: 20px; | ||||
|   background-color: lightblue; | ||||
|   color: black; | ||||
|   background-color: #6f2509;; | ||||
|   color: #fffbf6; | ||||
|   float: left; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Anet
						Anet