Skip to content

Commit

Permalink
Frontend build upgrade (#237)
Browse files Browse the repository at this point in the history
* Refactored start docs

* Changed source of go-bindata #197

* Updated go dep trackers

* Updated yarn dependencies

* Added update step to Makefile

* New auto-generated bindata tests

* Added doc note about make update

* yarn upgrade

* Doc: rename Infura key as "project ID" for clarity

* Set resource class to medium for CircleCI builds

* Use Debian 'stable' release in Docker

* Add .env configuration loader to make #204

* Copy env during bootstrap

* Documentation related to license finder

* go-bindata install path

* Docker documentation link

* README revised

* Added logging instruction

* Dependency updates, tidy and fix #213

* Documentation tips added

* Yarn update

* Added versioned ssri & is-svg to ui/core

* File type to sync Map #215

* echo-contrib locked to echo v3 #216

* Fix make circular dependency on bindata.go warning

* Switch to CircleCI next gen image #202

* Skip compilation in cloud deploy

* Update to Go 1.16 #217

* Fixed go-bindata install

* Better test for window.web3 #199

* Reverted to legacy CircleCI image

* Revert to new image and new go-bindata load strategy #202

* Fix use of mongo.IndexModel #218

* Update to Node.js LTS 14.x #217

* Improve test for window.web3 #199

* Use same image for build-ui #217

* Updated ui library web3 1.3.4 #199

* Go mod tidy

* Minor ui linting fix

* Go library upgrade: mongo-driver, goja

* Upgrade @vue/cli-service from 3.12.1 to 4.5.12

* Auto-conversion to ES6 syntax #220

* Switch cli to dev dependencies

* Remove eth-lightwallet #220

* Remove vue-append #220

* Update to web3 1.3.5 and sass-loader 10.1.1 #220

* Use go-ethereum v1.9.25 #214

* Revert go-ethereum v1.9.25

* Detect window.ethereum (#203)

* Update docker readme

* Fix settings API keys encryption overwrite

* Ran make all

* Replaced node-sass by sass #236

* Fix SASS division warnings

* vue-cli updated to 4.5.15 & minor delinting

* Added vue-append, core-js; enabled errors shown in ui build

* Vue deep selector syntax

* Added gitpod config, added .env to gitignore, minor mod update

* Updated vue-pdf

* Delinted Document vues

* Ignore all static libs from eslint

* Vue entrypoints delinted

* Views delinted

* Vue entrypoints delinted

* Refactor language list in preview

* Template and PDF Modal views

* Views delinted

* ImexResults delinted/ignored

* Fixed ui issues in testing

Co-authored-by: Mehdy javany <[email protected]>
  • Loading branch information
loleg and m-javani authored Dec 10, 2021
1 parent 5540696 commit 5f6dfd2
Show file tree
Hide file tree
Showing 90 changed files with 3,593 additions and 3,125 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.env
.idea
.vscode
.DS_Store
Expand Down
3 changes: 3 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tasks:
- init: make init all
command: make run
3 changes: 3 additions & 0 deletions docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ used to deploy the platform in different context:
This is the simplest method to experiment with Proxeus. This will start a local Proxeus platform
using images from Docker Hub.

Please note that with SELinux enabled: a `:z` should be added to the end of volume declarations in docker-compose.yml.

### docker-compose.yml file

```
Expand Down Expand Up @@ -94,6 +96,7 @@ Environment:
|PROXEUS_ALLOW_HTTP:|`false`|Allow the use of HTTP instead of HTTPS =NOT FOR PRODUCTION=|

## Development Docker Compose

This file will start the document service available from Docker Hub but will start
the local Platform built from your local files. This method is preferred during development.
This is the default configuration when using `docker-compose up` from the project root directory.
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ require (
go.etcd.io/bbolt v1.3.5 // indirect
go.mongodb.org/mongo-driver v1.7.3
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
golang.org/x/net v0.0.0-20211101193420-4a448f8816b3
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63
golang.org/x/sys v0.0.0-20211209171907-798191bca915 // indirect
gopkg.in/gavv/httpexpect.v2 v2.2.0
gopkg.in/sourcemap.v1 v1.0.5 // indirect
)
Expand Down Expand Up @@ -75,14 +75,14 @@ require (
github.com/valyala/fasttemplate v1.2.1 // indirect
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/yuin/goldmark v1.4.2 // indirect
github.com/yuin/goldmark v1.4.4 // indirect
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/tools v0.1.7 // indirect
golang.org/x/tools v0.1.8 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/urfave/cli.v1 v1.22.5 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
Expand Down
19 changes: 19 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,13 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.2 h1:5qVKCqCRBaGz8EepBTi7pbIw8gGCFnB1Mi6kXU4dYv8=
github.com/yuin/goldmark v1.4.2/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
github.com/yuin/goldmark v1.4.3 h1:eTEYYWtQLjK7+WK45Tk81OTkp/0UvAyqUj8flU0nTO4=
github.com/yuin/goldmark v1.4.3/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
github.com/yuin/goldmark v1.4.4 h1:zNWRjYUW32G9KirMXYHQHVNFkXvMI7LpgNW2AgYAoIs=
github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
go.etcd.io/bbolt v1.3.0/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
Expand Down Expand Up @@ -703,8 +708,13 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 h1:VrJZAjbekhoRn7n5FBujY31gboH+iB3pdLxn3gE9FjU=
golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -756,8 +766,15 @@ golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4=
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 h1:7NCfEGl0sfUojmX78nK9pBJuUlSZWEJA/TwASvfiPLo=
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c h1:DHcbWVXeY+0Y8HHKR+rbLwnoh2F4tNCY7rTiHJ30RmA=
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211209171907-798191bca915 h1:P+8mCzuEpyszAT6T42q0sxU+eveBAF/cJ2Kp0x6/8+0=
golang.org/x/sys v0.0.0-20211209171907-798191bca915/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand Down Expand Up @@ -798,6 +815,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
7 changes: 4 additions & 3 deletions storage/database/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,18 @@ func (se *SettingsDB) Put(s *model.Settings) error {
if err != nil {
return err
}
st := *s
secret := os.Getenv("PROXEUS_ENCRYPTION_SECRET_KEY")
s.InfuraApiKey, err = EncryptWithAES(secret, s.InfuraApiKey)
st.InfuraApiKey, err = EncryptWithAES(secret, s.InfuraApiKey)
if err != nil {
return err
}
s.SparkpostApiKey, err = EncryptWithAES(secret, s.SparkpostApiKey)
st.SparkpostApiKey, err = EncryptWithAES(secret, s.SparkpostApiKey)
if err != nil {
return err
}

return se.jf.Put(s)
return se.jf.Put(st)
}

// Get retrieves all settings from the database / file
Expand Down
1 change: 1 addition & 0 deletions ui/core/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/config/
/dist/
/src/libs/legacy/
/src/libs/
2 changes: 1 addition & 1 deletion ui/core/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/app'
'@vue/cli-plugin-babel/preset'
]
}
55 changes: 29 additions & 26 deletions ui/core/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@proxeus/core",
"version": "1.0.0",
"private": true,
"description": "Proxeus UI",
"author": "[email protected]",
"private": true,
"scripts": {
"check-node-version": "check-node-version --package",
"serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit",
"test:e2e": "vue-cli-service test:e2e"
"test:e2e": "vue-cli-service test:e2e",
"lint": "vue-cli-service lint",
"check-node-version": "check-node-version --package"
},
"dependencies": {
"@johmun/vue-tags-input": "^2.0.1",
Expand All @@ -24,7 +24,7 @@
"bootstrap-vue": "2.0.0-rc.12",
"brace": "^0.11.1",
"codemirror": "^5.39.2",
"eth-lightwallet": "^3.0.1",
"core-js": "^3.19.3",
"ethereumjs-util": "^5.2.0",
"flatpickr": "^4.5.1",
"font-awesome": "^4.7.0",
Expand All @@ -33,22 +33,21 @@
"html-svg-connect": "^2.0.0",
"human-standard-token-abi": "^1.0.2",
"interactjs": "1.2.9",
"is-svg": "^4.2.2",
"jquery": "^3.5.0",
"jquery-ui": "^1.13.0",
"js-sha3": "^0.7.0",
"moment": "^2.20.1",
"popper.js": "^1.14.4",
"sass": "^1.44.0",
"sortablejs": "^1.7.0",
"ssri": "^8.0.1",
"tippy.js": "^2.5.4",
"underscore": "^1.8.3",
"v-tooltip": "^2.0.0-rc.33",
"velocity-animate": "^1.5.1",
"vis": "^4.21.0",
"vreme": "^3.0.2",
"vue": "^2.5.17",
"vue-append": "^1.1.2",
"vue-append": "^2.2.0",
"vue-class-component": "^6.0.0",
"vue-clipboard2": "^0.2.1",
"vue-codemirror": "^4.0.5",
Expand All @@ -63,7 +62,7 @@
"vue-multiselect": "^2.1.0",
"vue-notification": "^1.3.12",
"vue-password-strength-meter": "^1.3.2",
"vue-pdf": "github:davematter/vue-pdf#master",
"vue-pdf": "^4.3.0",
"vue-property-decorator": "^7.0.0",
"vue-range-slider": "^0.6.0",
"vue-router": "^3.0.1",
Expand All @@ -75,37 +74,41 @@
"vuex": "^3.0.1",
"vuex-i18n": "^1.10.5",
"vuex-persist": "^1.2.2",
"web3": "^1.3.4",
"web3": "^1.3.5",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^3.0.0",
"@vue/cli-plugin-babel": "^3.1.1",
"@vue/cli-plugin-e2e-cypress": "^3.1.1",
"@vue/cli-plugin-eslint": "^3.1.1",
"@vue/cli-service": "^3.1.1",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/cli-plugin-babel": "^4.5.15",
"@vue/cli-plugin-e2e-cypress": "^4.5.15",
"@vue/cli-plugin-eslint": "^4.5.15",
"@vue/cli-service": "^4.5.15",
"@vue/eslint-config-standard": "^5.1.2",
"autoprefixer": "^9.0.1",
"babel-eslint": "^10.0.1",
"babel-eslint": "^10.1.0",
"check-node-version": "^3.2.0",
"eslint": "^5.8.0",
"eslint-plugin-vue": "^5.0.0-0",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"file-loader": "^3.0.1",
"less": "^3.8.1",
"less-loader": "^4.1.0",
"node-sass": "^4.9.0",
"postcss-loader": "^3.0.0",
"sass-loader": "^7.0.1",
"sass-loader": "^10.1.1",
"vue-template-compiler": "^2.5.17",
"webpack": "^4.25.1"
},
"engines": {
"node": ">= 14.15.0",
"yarn": ">= 1.22.0"
"webpack": "^4",
"worker-loader": "^3"
},
"browserslist": [
"last 2 Chrome versions",
"last 2 Safari versions",
"last 2 Firefox versions"
]
],
"engines": {
"node": ">= 14.15.0",
"yarn": ">= 1.22.0"
}
}
8 changes: 4 additions & 4 deletions ui/core/src/DocumentApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
</template>

<script>
import SidebarUser from '@/views/appDependentComponents/SidebarUser'
// import SidebarUser from '@/views/appDependentComponents/SidebarUser'
import baseApp from './baseApp'
import Blocker from './components/Blocker'
export default {
mixins: [baseApp],
name: 'document-app',
components: {
Blocker,
SidebarUser
Blocker
// SidebarUser
},
created () {
this.$root.$on('service-on', this.onServiceOn)
Expand All @@ -39,7 +39,7 @@ export default {
}
},
watch: {
'$route': function (route) {
$route: function (route) {
this.toggleSidebar()
}
},
Expand Down
4 changes: 2 additions & 2 deletions ui/core/src/assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ body {

.sub-title {
border-bottom: 2px solid $gray-300;
margin-bottom: $spacer / 4;
margin-bottom: $spacer * 0.25;
}

.mlist-group {
Expand All @@ -229,7 +229,7 @@ body {
}

.mlist-item > td {
padding: $spacer / 2 $spacer;
padding: $spacer * 0.5 $spacer;
}

.mlist-item > td:first-child {
Expand Down
6 changes: 3 additions & 3 deletions ui/core/src/assets/styles/nav-tabs.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.mod-nav-tabs {
margin-top: $spacer / 2;
margin-top: $spacer * 0.5;

.nav {
border-bottom: 2px solid $gray-300;
Expand All @@ -12,7 +12,7 @@
font-weight: 500;
border: none;
border-bottom: 2px transparent;
padding: $spacer / 2;
padding: $spacer * 0.5;
margin-right: 0;
margin-bottom: -3px;
color: $text-muted;
Expand Down Expand Up @@ -45,7 +45,7 @@
}

.tabs-content {
padding: $spacer $spacer $spacer / 2 $spacer;
padding: $spacer $spacer $spacer * 0.5 $spacer;
border: 1px solid $gray-300;
}
}
6 changes: 4 additions & 2 deletions ui/core/src/assets/styles/sidebar.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:math";

$nav-max-width: 265px;

@mixin toggle {
Expand Down Expand Up @@ -49,8 +51,8 @@ $nav-max-width: 265px;
.navbar-brand {
overflow: hidden;
padding-left: 1.7rem;
padding-top: $spacer / 1.5;
padding-bottom: $spacer / 3;
padding-top: math.div($spacer, 1.5);
padding-bottom: math.div($spacer, 3);
text-align:center;
img {
height: 3.75rem;
Expand Down
8 changes: 4 additions & 4 deletions ui/core/src/assets/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ $h4-font-size: $font-size-base * 1.5 !default;
$h5-font-size: $font-size-base * 1 !default;
$h6-font-size: $font-size-base !default;

$headings-margin-bottom: ($spacer / 2) !default;
$headings-margin-bottom: ($spacer * 0.5) !default;
$headings-font-family: inherit !default;
$headings-font-weight: 400 !default;
$headings-line-height: 1.2 !default;
Expand Down Expand Up @@ -581,7 +581,7 @@ $nav-pills-link-active-bg: $component-active-bg !default;

// Navbar

$navbar-padding-y: ($spacer / 2) !default;
$navbar-padding-y: ($spacer * 0.5) !default;
$navbar-padding-x: $spacer !default;

$navbar-nav-link-padding-x: 1rem !default;
Expand All @@ -590,7 +590,7 @@ $navbar-brand-font-size: $font-size-lg !default;
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
$nav-link-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;
$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) * 0.5 !default;

$navbar-toggler-padding-y: .25rem !default;
$navbar-toggler-padding-x: .75rem !default;
Expand Down Expand Up @@ -658,7 +658,7 @@ $card-bg: $white !default;

$card-img-overlay-padding: 1.25rem !default;

$card-group-margin: ($grid-gutter-width / 2) !default;
$card-group-margin: ($grid-gutter-width * 0.5) !default;
$card-deck-margin: $card-group-margin !default;

$card-columns-count: 3 !default;
Expand Down
Loading

0 comments on commit 5f6dfd2

Please sign in to comment.