m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge remote-tracking branch 'origin/develop' into Version-v8.0.0

Browse Source 
* origin/develop:
  Fix manifest version bump script (#8715)
  Consistent rounded corners on tx details modal/popup (#8714)
This commit is contained in:
Mark Stacey 2020-06-01 18:07:39 -03:00
commit 2a4704a410
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/scripts/release-bump-manifest-version
View File

@ -19,8 +19,8 @@ fi
printf '%s\n' 'Updating the manifest version if needed' printf '%s\n' 'Updating the manifest version if needed'
version="${CIRCLE_BRANCH/Version-v/}" version="${CIRCLE_BRANCH/Version-v/}"
updated_manifest="$(jq ".version = \"$version\"" app/manifest.json)" updated_manifest="$(jq ".version = \"$version\"" app/manifest/_base.json)"
printf '%s\n' "$updated_manifest" > app/manifest.json printf '%s\n' "$updated_manifest" > app/manifest/_base.json
if [[ -z $(git status --porcelain) ]] if [[ -z $(git status --porcelain) ]]
then then
@ -32,7 +32,7 @@ git \
-c user.name='MetaMask Bot' \ -c user.name='MetaMask Bot' \
-c user.email='metamaskbot@users.noreply.github.com' \ -c user.email='metamaskbot@users.noreply.github.com' \
commit --message "${CIRCLE_BRANCH/-/ }" \ commit --message "${CIRCLE_BRANCH/-/ }" \
CHANGELOG.md app/manifest.json CHANGELOG.md app/manifest/_base.json
repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME" repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" "$CIRCLE_BRANCH" git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" "$CIRCLE_BRANCH"

1
ui/app/components/ui/popover/index.scss
View File

@ -85,6 +85,7 @@
justify-content: flex-start; justify-content: flex-start;
align-items: stretch; align-items: stretch;
align-content: stretch; align-content: stretch;
border-radius: 10px;
} }
&-container { &-container {