infrastructure/blender-org
5
4
Fork 1
Code Issues 16 Pull Requests Projects Releases Wiki Activity

Blender-org web-assets v2 upgrade #104116

Merged
Márton Lente merged 56 commits from web-assets-v2-upgrade into main 2024-08-13 17:27:59 +02:00
Conversation 4 Commits 56 Files Changed 39 +20 -18
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7522fa6457 - Show all commits

29
themes/bthree/src/styles/_bwa.sass
View File

@ -1,24 +1,25 @@
/* Import variables. */ /* Import variables. */
@import ../../assets_shared/src/styles/_media_queries @import ../../assets_shared/src/styles/_media_queries
@import ../../assets_shared/src/styles/_variables_deprecated
@import ../../assets_shared/src/styles/_variables @import ../../assets_shared/src/styles/_variables
@import ../../assets_shared/src/styles/_mixins @import ../../assets_shared/src/styles/_mixins
/* Import Bootstrap. */ /* Import Bootstrap. */
@import ../../assets_shared/src/styles/bootstrap/functions @import ../../assets_shared/src/styles/bootstrap-deprecated/functions
@import ../../assets_shared/src/styles/bootstrap/variables @import ../../assets_shared/src/styles/bootstrap-deprecated/variables
@import ../../assets_shared/src/styles/bootstrap/mixins @import ../../assets_shared/src/styles/bootstrap-deprecated/mixins
@import ../../assets_shared/src/styles/bootstrap/root @import ../../assets_shared/src/styles/bootstrap-deprecated/root
@import ../../assets_shared/src/styles/bootstrap/reboot @import ../../assets_shared/src/styles/bootstrap-deprecated/reboot
@import ../../assets_shared/src/styles/bootstrap/images @import ../../assets_shared/src/styles/bootstrap-deprecated/images
@import ../../assets_shared/src/styles/bootstrap/grid @import ../../assets_shared/src/styles/bootstrap-deprecated/grid
@import ../../assets_shared/src/styles/bootstrap/forms @import ../../assets_shared/src/styles/bootstrap-deprecated/forms
@import ../../assets_shared/src/styles/bootstrap/transitions @import ../../assets_shared/src/styles/bootstrap-deprecated/transitions
@import ../../assets_shared/src/styles/bootstrap/nav @import ../../assets_shared/src/styles/bootstrap-deprecated/nav
@import ../../assets_shared/src/styles/bootstrap/navbar @import ../../assets_shared/src/styles/bootstrap-deprecated/navbar
@import ../../assets_shared/src/styles/bootstrap/progress @import ../../assets_shared/src/styles/bootstrap-deprecated/progress
@import ../../assets_shared/src/styles/bootstrap/media @import ../../assets_shared/src/styles/bootstrap-deprecated/media
@import ../../assets_shared/src/styles/bootstrap/utilities @import ../../assets_shared/src/styles/bootstrap-deprecated/utilities
/* Read inside for instructions. */ /* Read inside for instructions. */
@import ../../assets_shared/src/styles/_fonts @import ../../assets_shared/src/styles/_fonts

9
themes/bthree/src/styles/style-editor.sass
View File

@ -1,11 +1,12 @@
@import '../../assets_shared/src/styles/_media_queries' @import '../../assets_shared/src/styles/_media_queries'
@import '../../assets_shared/src/styles/_variables_deprecated'
@import '../../assets_shared/src/styles/_variables' @import '../../assets_shared/src/styles/_variables'
@import '../../assets_shared/src/styles/_mixins' @import '../../assets_shared/src/styles/_mixins'
@import '../../assets_shared/src/styles/bootstrap/functions' @import '../../assets_shared/src/styles/bootstrap-deprecated/functions'
@import '../../assets_shared/src/styles/bootstrap/variables' @import '../../assets_shared/src/styles/bootstrap-deprecated/variables'
@import '../../assets_shared/src/styles/bootstrap/mixins' @import '../../assets_shared/src/styles/bootstrap-deprecated/mixins'
@import '../../assets_shared/src/styles/bootstrap/utilities' @import '../../assets_shared/src/styles/bootstrap-deprecated/utilities'
$font-path: '../bthree/assets/fonts' $font-path: '../bthree/assets/fonts'
@import '../../assets_shared/src/styles/fonts' @import '../../assets_shared/src/styles/fonts'