mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-12 23:35:58 +00:00
merge event master + changes
This commit is contained in:
parent
69dd9dd9b0
commit
76eb8757cb
1
webapp/assets/_new/styles/mixins/buttonStates.css
Normal file
1
webapp/assets/_new/styles/mixins/buttonStates.css
Normal file
@ -0,0 +1 @@
|
||||
/*# sourceMappingURL=buttonStates.css.map */
|
||||
1
webapp/assets/_new/styles/mixins/buttonStates.css.map
Normal file
1
webapp/assets/_new/styles/mixins/buttonStates.css.map
Normal file
@ -0,0 +1 @@
|
||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"buttonStates.css"}
|
||||
29
webapp/assets/_new/styles/resets.css
Normal file
29
webapp/assets/_new/styles/resets.css
Normal file
@ -0,0 +1,29 @@
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 0;
|
||||
background: transparent;
|
||||
border: none;
|
||||
font-family: inherit;
|
||||
font-size: inherit;
|
||||
}
|
||||
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6,
|
||||
p,
|
||||
li {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
ol,
|
||||
ul {
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}/*# sourceMappingURL=resets.css.map */
|
||||
1
webapp/assets/_new/styles/resets.css.map
Normal file
1
webapp/assets/_new/styles/resets.css.map
Normal file
@ -0,0 +1 @@
|
||||
{"version":3,"sources":["resets.scss","resets.css"],"names":[],"mappings":"AAAA;EACE,sBAAA;ACCF;;ADEA;EACE,UAAA;EACA,uBAAA;EACA,YAAA;EACA,oBAAA;EACA,kBAAA;ACCF;;ADEA;;;;;;;;EAQE,SAAA;ACCF;;ADEA;;EAEE,qBAAA;EACA,SAAA;EACA,UAAA;ACCF","file":"resets.css"}
|
||||
122
webapp/assets/_new/styles/tokens.css
Normal file
122
webapp/assets/_new/styles/tokens.css
Normal file
@ -0,0 +1,122 @@
|
||||
/**
|
||||
* @tokens Color Brand
|
||||
* @presenter Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Color Neutral
|
||||
* @presenter Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Color Text
|
||||
* @presenter Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Color Background
|
||||
* @presenter Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Color Border
|
||||
* @presenter Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Border Size
|
||||
* @presenter Border
|
||||
*/
|
||||
/**
|
||||
* @tokens Border Radius
|
||||
* @presenter BorderRadius
|
||||
*/
|
||||
/**
|
||||
* @tokens Font Size
|
||||
* @presenter FontSize
|
||||
*/
|
||||
/**
|
||||
* @tokens Font Space
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Font Family
|
||||
* @presenter FontFamily
|
||||
*/
|
||||
/**
|
||||
* @tokens Font Weight
|
||||
* @presenter FontWeight
|
||||
*/
|
||||
/**
|
||||
* @tokens Line Height
|
||||
* @presenter LineHeight
|
||||
*/
|
||||
/**
|
||||
* @tokens Letter Spacing
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Opacity
|
||||
* @presenter Opacity
|
||||
*/
|
||||
/**
|
||||
* @tokens Space
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Height
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Width
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Avatar
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Buttons
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Images
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Size Icons
|
||||
* @presenter Spacing
|
||||
*/
|
||||
/**
|
||||
* @tokens Shadow
|
||||
* @presenter Shadow
|
||||
*/
|
||||
/**
|
||||
* @tokens Effects
|
||||
*/
|
||||
/**
|
||||
* @tokens Animation Duration
|
||||
*/
|
||||
/**
|
||||
* @tokens Animation Ease
|
||||
* @presenter Easing
|
||||
*/
|
||||
/**
|
||||
* @tokens Z-Index
|
||||
*/
|
||||
/**
|
||||
* @tokens Media Query
|
||||
*/
|
||||
/**
|
||||
* @tokens Background Images
|
||||
*/
|
||||
/**
|
||||
* @tokens Header Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Footer Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Locale Menu Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Donation Bar Color
|
||||
*/
|
||||
/**
|
||||
* @tokens Toast Color
|
||||
*//*# sourceMappingURL=tokens.css.map */
|
||||
1
webapp/assets/_new/styles/tokens.css.map
Normal file
1
webapp/assets/_new/styles/tokens.css.map
Normal file
@ -0,0 +1 @@
|
||||
{"version":3,"sources":["tokens.scss"],"names":[],"mappings":"AAAA;;;EAAA;AA4BA;;;EAAA;AAmBA;;;EAAA;AAuBA;;;EAAA;AAgCA;;;EAAA;AAeA;;;EAAA;AASA;;;EAAA;AAYA;;;EAAA;AAgBA;;;EAAA;AAgBA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAUA;;;EAAA;AAWA;;;EAAA;AASA;;;EAAA;AAgBA;;;EAAA;AAaA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAcA;;EAAA;AAMA;;EAAA;AAUA;;;EAAA;AAWA;;EAAA;AAaA;;EAAA;AAUA;;EAAA;AAIA;;EAAA;AAMA;;EAAA;AAOA;;EAAA;AAMA;;EAAA;AAOA;;EAAA","file":"tokens.css"}
|
||||
@ -273,10 +273,10 @@ export default {
|
||||
if (this.creatEvent) {
|
||||
return {
|
||||
eventStart: this.formData.eventStart,
|
||||
// TODO: eventEnd: this.formData.eventEnd,
|
||||
// TODO: eventLocationName: this.formData.eventLocationName,
|
||||
eventEnd: this.formData.eventEnd,
|
||||
eventLocationName: this.formData.eventLocationName,
|
||||
eventVenue: this.formData.eventVenue,
|
||||
// TODO: eventIsOnline: this.formData.eventIsOnline,
|
||||
eventIsOnline: this.formData.eventIsOnline,
|
||||
eventLocation: JSON.stringify(this.formData.eventLocation),
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user