Skip to content

Commit

Permalink
Merge pull request #1338 from nextcloud/nc25
Browse files Browse the repository at this point in the history
Adjust styling for NC25 & Update `@nextcloud/vue`
  • Loading branch information
jotoeri authored Sep 20, 2022
2 parents 6e1ae89 + 5018a34 commit 1a48f47
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 27 deletions.
36 changes: 20 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@nextcloud/logger": "^2.3.0",
"@nextcloud/moment": "^1.2.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^6.0.0-beta.7",
"@nextcloud/vue": "^7.0.0-beta.3",
"core-js": "^3.25.1",
"crypto-js": "^4.1.1",
"debounce": "^1.2.1",
Expand All @@ -55,7 +55,7 @@
},
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.2.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^8.0.0",
"@nextcloud/stylelint-config": "^2.2.0",
"@nextcloud/webpack-vue-config": "^5.3.0"
Expand Down
10 changes: 3 additions & 7 deletions src/components/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,15 @@ export default {
</script>

<style lang="scss" scoped>
$top-bar-height: 60px;

.top-bar {
position: sticky;
top: 0;
z-index: 100;
top: var(--header-height);
display: flex;
position: sticky;
align-items: center;
align-self: flex-end;
justify-content: flex-end;
height: $top-bar-height;
margin-top: calc($top-bar-height * -1);
padding: 0 6px;
padding: calc(var(--default-grid-baseline, 4px) * 2);
}

.icon--flipped {
Expand Down
1 change: 0 additions & 1 deletion src/views/Create.vue
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ export default {
header {
display: flex;
flex-direction: column;
margin-top: 44px;
margin-bottom: 24px;

h2 {
Expand Down
1 change: 0 additions & 1 deletion src/views/Submit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ export default {

// Title & description header
header {
margin-top: 44px;
margin-bottom: 24px;

.form-title,
Expand Down

0 comments on commit 1a48f47

Please sign in to comment.