wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13500 from nextcloud/enh/updatenotifications/include-scss

Browse source 
Updatenotifications: Include the scss in the vue component
This commit is contained in:
Roeland Jago Douma 2019-01-11 11:17:25 +01:00 committed by GitHub
commit 861275d10b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 1412 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
apps/updatenotification/css/admin.scss
View file

@ -1,53 +0,0 @@
#updatenotification {
margin-top: -25px;
div.update,
p:not(.inlineblock) {
margin-bottom: 25px;
}
h2.inlineblock {
margin-top: 25px;
}
h3 {
cursor: pointer;
.icon {
cursor: pointer;
}
&:first-of-type {
margin-top: 0;
}
}
.icon {
display: inline-block;
margin-bottom: -3px;
}
.icon-triangle-s, .icon-triangle-n {
opacity: 0.5;
}
.channel-description span {
color: var(--color-text-lighter);
strong {
color: var(--color-main-text);
font-weight: normal;
}
}
.warning {
color: var(--color-error);
}
.whatsNew {
display: inline-block;
}
.toggleWhatsNew {
position: relative;
}
.popovermenu {
p {
margin-bottom: 0;
width: 100%;
}
margin-top: 5px;
width: 300px;
}
.applist {
margin-bottom: 25px;
}
}

BIN
apps/updatenotification/js/updatenotification.js
View file

Binary file not shown.

BIN
apps/updatenotification/js/updatenotification.js.map
View file

Binary file not shown.

1701
apps/updatenotification/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
apps/updatenotification/package.json
View file

@ -23,7 +23,7 @@
},
"homepage": "https://github.com/nextcloud/notifications#readme",
"dependencies": {
"nextcloud-vue": "^0.4.5",
"nextcloud-vue": "^0.4.6",
"v-tooltip": "^2.0.0-rc.33",
"vue": "^2.5.21",
"vue-click-outside": "^1.0.7"
@ -34,10 +34,13 @@
"babel-loader": "^8.0.5",
"css-loader": "^2.1.0",
"file-loader": "^3.0.1",
"vue-loader": "^15.5.0",
"node-sass": "^4.11.0",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
"vue-loader": "^15.5.1",
"vue-template-compiler": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.2.0",
"webpack": "^4.28.4",
"webpack-cli": "^3.2.1",
"webpack-merge": "^4.2.1"
}
}

56
apps/updatenotification/src/components/root.vue
View file

@ -346,3 +346,59 @@
}
}
</script>
<style lang="sass" scoped>
#updatenotification {
margin-top: -25px;
div.update,
p:not(.inlineblock) {
margin-bottom: 25px;
}
h2.inlineblock {
margin-top: 25px;
}
h3 {
cursor: pointer;
.icon {
cursor: pointer;
}
&:first-of-type {
margin-top: 0;
}
}
.icon {
display: inline-block;
margin-bottom: -3px;
}
.icon-triangle-s, .icon-triangle-n {
opacity: 0.5;
}
.channel-description span {
color: var(--color-text-lighter);
strong {
color: var(--color-main-text);
font-weight: normal;
}
}
.warning {
color: var(--color-error);
}
.whatsNew {
display: inline-block;
}
.toggleWhatsNew {
position: relative;
}
.popovermenu {
p {
margin-bottom: 0;
width: 100%;
}
margin-top: 5px;
width: 300px;
}
.applist {
margin-bottom: 25px;
}
}
</style>

1
apps/updatenotification/templates/admin.php
View file

@ -9,7 +9,6 @@ declare(strict_types=1);
* later. See the COPYING file.
*/
script('updatenotification', 'updatenotification');
style('updatenotification', 'admin');
/** @var array $_ */
?>
<div id="updatenotification" data-json="<?php p($_['json']); ?>"></div>

4
apps/updatenotification/webpack.common.js
View file

@ -18,6 +18,10 @@ module.exports = {
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/
},
{
test: /\.s[a|c]ss$/,
loader: 'style-loader!css-loader!sass-loader'
}
]
},