Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	f13c82a6a8  
						 
						
							
							
								
								
								trace in mac  
							
							
							
							
						 
						
							2017-01-09 11:09:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	6ea8b72ee3  
						 
						
							
							
								
								
								delete styles after changing base_design  
							
							
							
							
						 
						
							2017-01-06 13:55:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	746025d20b  
						 
						
							
							
								
								
								font-size + custom vars  
							
							
							
							
						 
						
							2017-01-06 13:55:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	16ba7ca94f  
						 
						
							
							
								
								
								__link__ added  
							
							
							
							
						 
						
							2017-01-06 12:53:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	3417b38564  
						 
						
							
							
								
								
								font-size in responsive  
							
							
							
							
						 
						
							2017-01-06 12:53:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	784809336d  
						 
						
							
							
								
								
								better padding and font for responsive  
							
							
							
							
						 
						
							2017-01-06 11:53:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	2c70b80910  
						 
						
							
							
								
								
								trace + better padding and font for responsive  
							
							
							
							
						 
						
							2017-01-06 11:53:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	80a8597571  
						 
						
							
							
								
								
								deleted margin-bottom for main-content (for optional bg-color without white space)  
							
							
							
							
						 
						
							2017-01-06 11:52:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	52b93d12e9  
						 
						
							
							
								
								
								hover: bg-color for hover  
							
							
							
							
						 
						
							2017-01-06 11:51:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	1b08ab7c47  
						 
						
							
							
								
								
								linked h6 + add css for trace  
							
							
							
							
						 
						
							2017-01-06 10:20:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	04289d080f  
						 
						
							
							
								
								
								sidebar: last LI without border-bottom  
							
							
							
							
						 
						
							2017-01-06 10:05:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	b965719e3c  
						 
						
							
							
								
								
								code cleaning + hover for logo only 2px border  
							
							
							
							
						 
						
							2017-01-06 10:05:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	742a706335  
						 
						
							
							
								
								
								magic matcher mobile  
							
							
							
							
						 
						
							2017-01-05 19:01:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	83efa0de01  
						 
						
							
							
								
								
								mobile view part 1  
							
							
							
							
						 
						
							2017-01-05 18:23:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	3d17036dd8  
						 
						
							
							
								
								
								Merge branch 'spis-master' into 'master'  
							
							... 
							
							
							
							
							spis master
See merge request !7  
							
						 
						
							2017-01-05 17:16:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	dedcbe546a  
						 
						
							
							
								
								
								Merge branch 'master' into 'spis-master'  
							
							... 
							
							
							
							
							# Conflicts:
#   css/area_sidetools.less 
							
						 
						
							2017-01-05 17:15:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	42f5d72185  
						 
						
							
							
								
								
								Format  
							
							
							
							
						 
						
							2017-01-05 17:12:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	d76e83a7bc  
						 
						
							
							
								
								
								Format  
							
							
							
							
						 
						
							2017-01-05 17:10:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	19265a3d2c  
						 
						
							
							
								
								
								sidebar toggle + scrolltobottom for trace on page load  
							
							
							
							
						 
						
							2017-01-05 17:04:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	56e5a149e0  
						 
						
							
							
								
								
								font-size in responsive  
							
							
							
							
						 
						
							2017-01-05 15:55:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	5939959969  
						 
						
							
							
								
								
								menu-toggle sidebar  
							
							
							
							
						 
						
							2017-01-05 15:48:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	ad89b29f39  
						 
						
							
							
								
								
								Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master  
							
							... 
							
							
							
							
							# Conflicts:
#	css/area_sidetools.less 
							
						 
						
							2017-01-05 15:39:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	fb0ec22f42  
						 
						
							
							
								
								
								additional sidebar menus  
							
							
							
							
						 
						
							2017-01-05 15:26:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	b6b228b16d  
						 
						
							
							
								
								
								em --> rem + font-size in responsive  
							
							
							
							
						 
						
							2017-01-05 15:26:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	990dda13aa  
						 
						
							
							
								
								
								Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master  
							
							
							
							
						 
						
							2017-01-05 14:01:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	1d7ed72f93  
						 
						
							
							
								
								
								css moved from main-content to base-design  
							
							
							
							
						 
						
							2017-01-05 14:01:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	0d1087af30  
						 
						
							
							
								
								
								Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template  
							
							
							
							
						 
						
							2017-01-05 13:38:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	646345133d  
						 
						
							
							
								
								
								side-tools, user links, admin panel  
							
							
							
							
						 
						
							2017-01-05 13:38:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	fa90fc6fce  
						 
						
							
							
								
								
								button-var reverted  
							
							
							
							
						 
						
							2017-01-05 13:38:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	fba5a49e49  
						 
						
							
							
								
								
								forms  
							
							
							
							
						 
						
							2017-01-05 13:37:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	98c19ec009  
						 
						
							
							
								
								
								color + hover + padding  
							
							
							
							
						 
						
							2017-01-05 11:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	7ee8c3ecb7  
						 
						
							
							
								
								
								Merge branch 'spis-master' into 'master'  
							
							... 
							
							
							
							
							spis master
See merge request !6  
							
						 
						
							2017-01-05 10:51:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	dba38052f8  
						 
						
							
							
								
								
								using button-color + button-background  
							
							
							
							
						 
						
							2017-01-05 10:47:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	ea4d64f5ed  
						 
						
							
							
								
								
								img as inline-block  
							
							
							
							
						 
						
							2017-01-05 10:46:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	14fc5f24f9  
						 
						
							
							
								
								
								added var  
							
							
							
							
						 
						
							2017-01-05 10:46:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	4a6674ad6f  
						 
						
							
							
								
								
								position + hover  
							
							
							
							
						 
						
							2017-01-05 09:39:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	a4152dcdb3  
						 
						
							
							
								
								
								Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master  
							
							
							
							
						 
						
							2017-01-05 08:15:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Silke Pisulla 
								
							 
						 
						
							
							
								
							
							
	158656e27e  
						 
						
							
							
								
								
								css content + struct-plugin prepared  
							
							
							
							
						 
						
							2017-01-05 08:14:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	4fca1d16bb  
						 
						
							
							
								
								
								language handling for js  
							
							
							
							
						 
						
							2017-01-04 18:09:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	c39e94e4e3  
						 
						
							
							
								
								
								main nav effects  
							
							
							
							
						 
						
							2017-01-04 17:37:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	5cbfd9f86e  
						 
						
							
							
								
								
								main nav counter fallback  
							
							
							
							
						 
						
							2017-01-04 16:37:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	605f78d818  
						 
						
							
							
								
								
								debug show or hide sidebar in edit mode  
							
							
							
							
						 
						
							2017-01-04 16:04:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	42f51ec5ba  
						 
						
							
							
								
								
								ignore unzipped fontello folder  
							
							
							
							
						 
						
							2017-01-04 15:28:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	3f78608ebd  
						 
						
							
							
								
								
								Merge branch 'patch-1' into 'master'  
							
							... 
							
							
							
							
							fix some smaller typos / variable names
See merge request !5  
							
						 
						
							2017-01-04 15:27:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	378cb41cd4  
						 
						
							
							
								
								
								metabox for hightlightparent  
							
							
							
							
						 
						
							2017-01-04 15:26:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Große 
								
							 
						 
						
							
							
								
							
							
	e44e33a6d7  
						 
						
							
							
								
								
								fix: fix some smaller typos / variable names  
							
							
							
							
						 
						
							2017-01-04 15:16:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	de9f7e8a3c  
						 
						
							
							
								
								
								tilde removed for font string (caused space in icon path)  
							
							
							
							
						 
						
							2017-01-04 14:51:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	fcff5aeafb  
						 
						
							
							
								
								
								Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template  
							
							
							
							
						 
						
							2017-01-04 13:40:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	f2ce71d425  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/spis-master'  
							
							... 
							
							
							
							
							# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit. 
							
						 
						
							2017-01-04 13:39:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jana Deutschländer 
								
							 
						 
						
							
							
								
							
							
	bdd5990e04  
						 
						
							
							
								
								
								Merge branch 'spis-master' into 'master'  
							
							... 
							
							
							
							
							spis master
See merge request !4  
							
						 
						
							2017-01-04 13:37:04 +01:00