forked from MapComplete/MapComplete
		
	Move border custom css to Tailwind Class
- migrate custom css to Tailwind class - introduce class-parameter for `AsImageElement` - migrate width of login button to Tailwind class
This commit is contained in:
		
							parent
							
								
									d3b39fbe54
								
							
						
					
					
						commit
						871f512c0d
					
				
					 8 changed files with 12 additions and 25 deletions
				
			
		|  | @ -260,6 +260,7 @@ export class InitUiElements { | ||||||
| 
 | 
 | ||||||
|         const fullOptions = new FullWelcomePaneWithTabs(); |         const fullOptions = new FullWelcomePaneWithTabs(); | ||||||
| 
 | 
 | ||||||
|  |         // ?-Button on Desktop, opens panel with close-X.
 | ||||||
|         const help = Svg.help_svg().SetClass("open-welcome-button block"); |         const help = Svg.help_svg().SetClass("open-welcome-button block"); | ||||||
|         const close = Svg.close_svg().SetClass("close-welcome-button"); |         const close = Svg.close_svg().SetClass("close-welcome-button"); | ||||||
|         const checkbox = new CheckBox( |         const checkbox = new CheckBox( | ||||||
|  | @ -294,8 +295,9 @@ export class InitUiElements { | ||||||
| 
 | 
 | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         // ?-Button on Mobile, opens full screen layer with close-button at the bottom
 | ||||||
|         Svg.help_svg() |         Svg.help_svg() | ||||||
|             .SetClass("open-welcome-button block shadow") |             .SetClass("open-welcome-button block rounded-3xl overflow-hidden shadow" ) | ||||||
|             .onClick(() => { |             .onClick(() => { | ||||||
|                 State.state.fullScreenMessage.setData({content: fullOptions2, hashText: "welcome"}) |                 State.state.fullScreenMessage.setData({content: fullOptions2, hashText: "welcome"}) | ||||||
|             }).AttachTo("help-button-mobile"); |             }).AttachTo("help-button-mobile"); | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								Svg.ts
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Svg.ts
									
										
									
									
									
								
							|  | @ -255,7 +255,7 @@ export default class Svg { | ||||||
|     public static ring_ui() { return new FixedUiElement(Svg.ring_img);} |     public static ring_ui() { return new FixedUiElement(Svg.ring_img);} | ||||||
| 
 | 
 | ||||||
|     public static search = " <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"12\" height=\"12\" viewBox=\"0 0 12 12\"> <g id=\"search\"> <path id=\"magnifying-glass\" d=\"M1.63 9.474L4.006 7.1l.17-.1a3.45 3.45 0 0 1-.644-2.01A3.478 3.478 0 1 1 7.01 8.47 3.43 3.43 0 0 1 5 7.822l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27A2.21 2.21 0 1 0 4.8 4.994 2.21 2.21 0 0 0 7.01 7.21z\"/> </g> </svg>" |     public static search = " <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"12\" height=\"12\" viewBox=\"0 0 12 12\"> <g id=\"search\"> <path id=\"magnifying-glass\" d=\"M1.63 9.474L4.006 7.1l.17-.1a3.45 3.45 0 0 1-.644-2.01A3.478 3.478 0 1 1 7.01 8.47 3.43 3.43 0 0 1 5 7.822l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27A2.21 2.21 0 1 0 4.8 4.994 2.21 2.21 0 0 0 7.01 7.21z\"/> </g> </svg>" | ||||||
|     public static search_img = Img.AsImageElement(Svg.search) |     public static search_img = Img.AsImageElement(Svg.search, 'rounded-3xl') | ||||||
|     public static search_svg() { return new FixedUiElement(Svg.search);} |     public static search_svg() { return new FixedUiElement(Svg.search);} | ||||||
|     public static search_ui() { return new FixedUiElement(Svg.search_img);} |     public static search_ui() { return new FixedUiElement(Svg.search_img);} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -4,16 +4,16 @@ import {Utils} from "../../Utils"; | ||||||
| export default class Img { | export default class Img { | ||||||
| 
 | 
 | ||||||
|     public static runningFromConsole = false; |     public static runningFromConsole = false; | ||||||
|      | 
 | ||||||
|    static AsData(source:string){ |    static AsData(source:string){ | ||||||
|        if(Utils.runningFromConsole){ |        if(Utils.runningFromConsole){ | ||||||
|            return source; |            return source; | ||||||
|        } |        } | ||||||
|        return `data:image/svg+xml;base64,${(btoa(source))}`; |        return `data:image/svg+xml;base64,${(btoa(source))}`; | ||||||
|    } |    } | ||||||
|      | 
 | ||||||
|     static AsImageElement(source: string): string{ |     static AsImageElement(source: string, css_class: string): string{ | ||||||
|         return `<img src="${Img.AsData(source)}">`; |         return `<img class="${css_class}" alt="" src="${Img.AsData(source)}">`; | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ export default class UserBadge extends UIElement { | ||||||
| 
 | 
 | ||||||
|         this._loginButton = Translations.t.general.loginWithOpenStreetMap |         this._loginButton = Translations.t.general.loginWithOpenStreetMap | ||||||
|             .Clone() |             .Clone() | ||||||
|             .SetClass("userbadge-login") |             .SetClass("userbadge-login pt-3 w-full") | ||||||
|             .onClick(() => State.state.osmConnection.AttemptLogin()); |             .onClick(() => State.state.osmConnection.AttemptLogin()); | ||||||
|         this._logout = |         this._logout = | ||||||
|             Svg.logout_svg() |             Svg.logout_svg() | ||||||
|  |  | ||||||
|  | @ -92,7 +92,6 @@ Contains tweaks for small screens | ||||||
| 
 | 
 | ||||||
|     .userbadge-login { |     .userbadge-login { | ||||||
|         min-width: unset; |         min-width: unset; | ||||||
|         width: calc(100vw - 5px); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     #userbadge { |     #userbadge { | ||||||
|  |  | ||||||
|  | @ -2,11 +2,6 @@ | ||||||
|     display: inline-block; |     display: inline-block; | ||||||
|     background-color: var(--background-color); |     background-color: var(--background-color); | ||||||
|     color: var(--foreground-color); |     color: var(--foreground-color); | ||||||
|     -webkit-border-radius: 2em; |  | ||||||
|     -moz-border-radius: 2em; |  | ||||||
|     border-radius: 2em; |  | ||||||
|     border-bottom-right-radius: 1.5em; |  | ||||||
|     border-top-right-radius: 1.5em; |  | ||||||
|     margin: 0; |     margin: 0; | ||||||
|     margin-bottom: 0.5em; |     margin-bottom: 0.5em; | ||||||
|     width: 100%; |     width: 100%; | ||||||
|  | @ -101,11 +96,6 @@ | ||||||
| 
 | 
 | ||||||
|     display: inline-block; |     display: inline-block; | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     -webkit-border-radius: 2em; |  | ||||||
|     -moz-border-radius: 2em; |  | ||||||
|     border-radius: 2em; |  | ||||||
|     border-bottom-right-radius: 1.5em; |  | ||||||
|     border-top-right-radius: 1.5em; |  | ||||||
|     margin: 0; |     margin: 0; | ||||||
| 
 | 
 | ||||||
|     min-width: 20em; |     min-width: 20em; | ||||||
|  |  | ||||||
|  | @ -244,7 +244,6 @@ a { | ||||||
| 
 | 
 | ||||||
|     transition: all 500ms linear; |     transition: all 500ms linear; | ||||||
|     pointer-events: all; |     pointer-events: all; | ||||||
|     border-radius: 1.3em; |  | ||||||
|     margin: 0 0 0.5em; |     margin: 0 0 0.5em; | ||||||
|     width: 100%; |     width: 100%; | ||||||
| } | } | ||||||
|  | @ -282,7 +281,6 @@ a { | ||||||
|     float: right; |     float: right; | ||||||
|     height: 1.2em; |     height: 1.2em; | ||||||
|     border: 2px solid black; |     border: 2px solid black; | ||||||
|     border-radius: 2em; |  | ||||||
|     padding: 0.4em; |     padding: 0.4em; | ||||||
|     margin-left: 0.5em; |     margin-left: 0.5em; | ||||||
|     margin-right: 0; |     margin-right: 0; | ||||||
|  | @ -349,7 +347,6 @@ a { | ||||||
|     height: 3.5em; |     height: 3.5em; | ||||||
|     width: 3.5em; |     width: 3.5em; | ||||||
|     padding: 0.75em; |     padding: 0.75em; | ||||||
|     border-radius: 1em; |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .open-welcome-button svg { | .open-welcome-button svg { | ||||||
|  | @ -363,7 +360,6 @@ a { | ||||||
|     padding: 0; |     padding: 0; | ||||||
|     pointer-events: all; |     pointer-events: all; | ||||||
|     box-shadow: 0 0 10px var(--shadow-color); |     box-shadow: 0 0 10px var(--shadow-color); | ||||||
|     border-radius: 1em; |  | ||||||
|     width: min-content; |     width: min-content; | ||||||
|     background-color: var(--background-color); |     background-color: var(--background-color); | ||||||
|     color: var(--foreground-color); |     color: var(--foreground-color); | ||||||
|  |  | ||||||
|  | @ -50,10 +50,10 @@ | ||||||
| 
 | 
 | ||||||
| <div id="topleft-tools"> | <div id="topleft-tools"> | ||||||
|     <div id="userbadge-and-search"> |     <div id="userbadge-and-search"> | ||||||
|         <div id="userbadge" class="shadow"></div> |         <div id="userbadge" class="shadow rounded-3xl overflow-hidden"></div> | ||||||
|         <div id="searchbox" class="shadow"></div> |         <div id="searchbox" class="shadow rounded-3xl overflow-hidden"></div> | ||||||
|     </div> |     </div> | ||||||
|     <div id="messagesbox"></div> |     <div id="messagesbox" class="rounded-3xl overflow-hidden"></div> | ||||||
|     <div id="help-button-mobile"></div> |     <div id="help-button-mobile"></div> | ||||||
| </div> | </div> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue